summaryrefslogtreecommitdiff
path: root/ext/ffi/lib.rs
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2021-10-05 18:20:00 +0530
committerGitHub <noreply@github.com>2021-10-05 14:50:00 +0200
commit80aee99c9e2eba879a0981235bee740088c6fbad (patch)
tree68fd3a256b1900f141c105b1ab051eded2e95a6c /ext/ffi/lib.rs
parentf1d3a170430501b4fab1a2d2abb5d77528251c77 (diff)
feat(ext/ffi): Non-blocking FFI (#12274)
Diffstat (limited to 'ext/ffi/lib.rs')
-rw-r--r--ext/ffi/lib.rs60
1 files changed, 46 insertions, 14 deletions
diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs
index e0430366c..e1acd097a 100644
--- a/ext/ffi/lib.rs
+++ b/ext/ffi/lib.rs
@@ -3,6 +3,7 @@
use deno_core::error::bad_resource_id;
use deno_core::error::AnyError;
use deno_core::include_js_files;
+use deno_core::op_async;
use deno_core::op_sync;
use deno_core::serde_json::json;
use deno_core::serde_json::Value;
@@ -14,6 +15,7 @@ use dlopen::raw::Library;
use libffi::middle::Arg;
use serde::Deserialize;
use std::borrow::Cow;
+use std::cell::RefCell;
use std::collections::HashMap;
use std::convert::TryFrom;
use std::ffi::c_void;
@@ -37,6 +39,7 @@ pub trait FfiPermissions {
fn check(&mut self, path: &str) -> Result<(), AnyError>;
}
+#[derive(Clone)]
struct Symbol {
cif: libffi::middle::Cif,
ptr: libffi::middle::CodePtr,
@@ -44,6 +47,9 @@ struct Symbol {
result_type: NativeType,
}
+unsafe impl Send for Symbol {}
+unsafe impl Sync for Symbol {}
+
struct DynamicLibraryResource {
lib: Library,
symbols: HashMap<String, Symbol>,
@@ -99,6 +105,7 @@ pub fn init<P: FfiPermissions + 'static>(unstable: bool) -> Extension {
.ops(vec![
("op_ffi_load", op_sync(op_ffi_load::<P>)),
("op_ffi_call", op_sync(op_ffi_call)),
+ ("op_ffi_call_nonblocking", op_async(op_ffi_call_nonblocking)),
])
.state(move |state| {
// Stolen from deno_webgpu, is there a better option?
@@ -294,20 +301,7 @@ struct FfiCallArgs {
parameters: Vec<Value>,
}
-fn op_ffi_call(
- state: &mut deno_core::OpState,
- args: FfiCallArgs,
- _: (),
-) -> Result<Value, AnyError> {
- let resource = state
- .resource_table
- .get::<DynamicLibraryResource>(args.rid)?;
-
- let symbol = resource
- .symbols
- .get(&args.symbol)
- .ok_or_else(bad_resource_id)?;
-
+fn ffi_call(args: FfiCallArgs, symbol: &Symbol) -> Result<Value, AnyError> {
let native_values = symbol
.parameter_types
.iter()
@@ -366,3 +360,41 @@ fn op_ffi_call(
}
})
}
+
+fn op_ffi_call(
+ state: &mut deno_core::OpState,
+ args: FfiCallArgs,
+ _: (),
+) -> Result<Value, AnyError> {
+ let resource = state
+ .resource_table
+ .get::<DynamicLibraryResource>(args.rid)?;
+
+ let symbol = resource
+ .symbols
+ .get(&args.symbol)
+ .ok_or_else(bad_resource_id)?;
+
+ ffi_call(args, symbol)
+}
+
+/// A non-blocking FFI call.
+async fn op_ffi_call_nonblocking(
+ state: Rc<RefCell<deno_core::OpState>>,
+ args: FfiCallArgs,
+ _: (),
+) -> Result<Value, AnyError> {
+ let resource = state
+ .borrow()
+ .resource_table
+ .get::<DynamicLibraryResource>(args.rid)?;
+ let symbols = &resource.symbols;
+ let symbol = symbols
+ .get(&args.symbol)
+ .ok_or_else(bad_resource_id)?
+ .clone();
+
+ tokio::task::spawn_blocking(move || ffi_call(args, &symbol))
+ .await
+ .unwrap()
+}