foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-04 01:44:26 -05:00
Code Issues Packages 1 Wiki Activity

perf(ext/ffi): Optimize FFI Rust side type checks (#14923)

Browse source
This commit is contained in:
Aapo Alasuutari 2022-06-21 06:46:59 +03:00 • committed by GitHub
parent a38a1f91cf
commit 82655b9285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
ext/ffi/lib.rs
View file

@ -627,47 +627,47 @@ where
ffi_args.push(NativeValue { i32_value: value }); ffi_args.push(NativeValue { i32_value: value });
} }
NativeType::U64 => { NativeType::U64 => {
let value: u64 = if value.is_big_int() { let value: u64 =
let value = v8::Local::<v8::BigInt>::try_from(value)?; if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
value.u64_value().0 value.u64_value().0
} else { } else {
value.integer_value(scope).ok_or_else(|| { value.integer_value(scope).ok_or_else(|| {
type_error("Invalid FFI u64 type, expected number") type_error("Invalid FFI u64 type, expected number")
})? as u64 })? as u64
}; };
ffi_args.push(NativeValue { u64_value: value }); ffi_args.push(NativeValue { u64_value: value });
} }
NativeType::I64 => { NativeType::I64 => {
let value: i64 = if value.is_big_int() { let value: i64 =
let value = v8::Local::<v8::BigInt>::try_from(value)?; if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
value.i64_value().0 value.i64_value().0
} else { } else {
value.integer_value(scope).ok_or_else(|| { value.integer_value(scope).ok_or_else(|| {
type_error("Invalid FFI i64 type, expected number") type_error("Invalid FFI i64 type, expected number")
})? as i64 })? as i64
}; };
ffi_args.push(NativeValue { i64_value: value }); ffi_args.push(NativeValue { i64_value: value });
} }
NativeType::USize => { NativeType::USize => {
let value: usize = if value.is_big_int() { let value: usize =
let value = v8::Local::<v8::BigInt>::try_from(value)?; if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
value.u64_value().0 as usize value.u64_value().0 as usize
} else { } else {
value.integer_value(scope).ok_or_else(|| { value.integer_value(scope).ok_or_else(|| {
type_error("Invalid FFI usize type, expected number") type_error("Invalid FFI usize type, expected number")
})? as usize })? as usize
}; };
ffi_args.push(NativeValue { usize_value: value }); ffi_args.push(NativeValue { usize_value: value });
} }
NativeType::ISize => { NativeType::ISize => {
let value: isize = if value.is_big_int() { let value: isize =
let value = v8::Local::<v8::BigInt>::try_from(value)?; if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
value.i64_value().0 as isize value.i64_value().0 as isize
} else { } else {
value.integer_value(scope).ok_or_else(|| { value.integer_value(scope).ok_or_else(|| {
type_error("Invalid FFI isize type, expected number") type_error("Invalid FFI isize type, expected number")
})? as isize })? as isize
}; };
ffi_args.push(NativeValue { isize_value: value }); ffi_args.push(NativeValue { isize_value: value });
} }
NativeType::F32 => { NativeType::F32 => {
@ -688,16 +688,28 @@ where
if value.is_null() { if value.is_null() {
let value: *const u8 = ptr::null(); let value: *const u8 = ptr::null();
ffi_args.push(NativeValue { pointer: value }) ffi_args.push(NativeValue { pointer: value })
} else if value.is_big_int() { } else if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
let value = v8::Local::<v8::BigInt>::try_from(value).unwrap();
let value = value.u64_value().0 as *const u8; let value = value.u64_value().0 as *const u8;
ffi_args.push(NativeValue { pointer: value }); ffi_args.push(NativeValue { pointer: value });
} else if value.is_array_buffer() || value.is_array_buffer_view() { } else if let Ok(value) =
let value: ZeroCopyBuf = serde_v8::from_v8(scope, value)?; v8::Local::<v8::ArrayBufferView>::try_from(value)
let value: &[u8] = &value[..]; {
ffi_args.push(NativeValue { let byte_offset = value.byte_offset();
pointer: value.as_ptr(), let backing_store = value
}); .buffer(scope)
.ok_or_else(|| {
type_error(
"Invalid FFI ArrayBufferView, expected data in the buffer",
)
})?
.get_backing_store();
let pointer = &backing_store[byte_offset] as *const _ as *const u8;
ffi_args.push(NativeValue { pointer });
} else if let Ok(value) = v8::Local::<v8::ArrayBuffer>::try_from(value)
{
let backing_store = value.get_backing_store();
let pointer = &backing_store as *const _ as *const u8;
ffi_args.push(NativeValue { pointer });
} else { } else {
return Err(type_error("Invalid FFI pointer type, expected null, BigInt, ArrayBuffer, or ArrayBufferView")); return Err(type_error("Invalid FFI pointer type, expected null, BigInt, ArrayBuffer, or ArrayBufferView"));
} }
@ -706,8 +718,7 @@ where
if value.is_null() { if value.is_null() {
let value: *const u8 = ptr::null(); let value: *const u8 = ptr::null();
ffi_args.push(NativeValue { pointer: value }) ffi_args.push(NativeValue { pointer: value })
} else if value.is_big_int() { } else if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
let value = v8::Local::<v8::BigInt>::try_from(value).unwrap();
let value = value.u64_value().0 as *const u8; let value = value.u64_value().0 as *const u8;
ffi_args.push(NativeValue { pointer: value }); ffi_args.push(NativeValue { pointer: value });
} else { } else {
@ -969,13 +980,19 @@ unsafe extern "C" fn deno_ffi_callback(
.expect("Unable to deserialize result parameter."); .expect("Unable to deserialize result parameter.");
} }
FFI_TYPE_POINTER | FFI_TYPE_STRUCT => { FFI_TYPE_POINTER | FFI_TYPE_STRUCT => {
if value.is_array_buffer() | value.is_array_buffer_view() { if let Ok(value) = v8::Local::<v8::ArrayBufferView>::try_from(value) {
let value: ZeroCopyBuf = serde_v8::from_v8(&mut scope, value) let byte_offset = value.byte_offset();
.expect("Unable to deserialize result parameter."); let backing_store = value
let value: &[u8] = &value[..]; .buffer(&mut scope)
*(result as *mut *const u8) = value.as_ptr(); .expect("Unable to deserialize result parameter.")
} else if value.is_big_int() { .get_backing_store();
let value = v8::Local::<v8::BigInt>::try_from(value).unwrap(); let pointer = &backing_store[byte_offset] as *const _ as *const u8;
*(result as *mut *const u8) = pointer;
} else if let Ok(value) = v8::Local::<v8::ArrayBuffer>::try_from(value) {
let backing_store = value.get_backing_store();
let pointer = &backing_store as *const _ as *const u8;
*(result as *mut *const u8) = pointer;
} else if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
*(result as *mut u64) = value.u64_value().0; *(result as *mut u64) = value.u64_value().0;
} else if value.is_null() { } else if value.is_null() {
*(result as *mut *const c_void) = ptr::null(); *(result as *mut *const c_void) = ptr::null();
@ -1018,8 +1035,7 @@ unsafe extern "C" fn deno_ffi_callback(
.expect("Unable to deserialize result parameter."); .expect("Unable to deserialize result parameter.");
} }
FFI_TYPE_SINT64 => { FFI_TYPE_SINT64 => {
if value.is_big_int() { if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
let value = v8::Local::<v8::BigInt>::try_from(value).unwrap();
*(result as *mut i64) = value.i64_value().0; *(result as *mut i64) = value.i64_value().0;
} else { } else {
*(result as *mut i64) = value *(result as *mut i64) = value
@ -1029,8 +1045,7 @@ unsafe extern "C" fn deno_ffi_callback(
} }
} }
FFI_TYPE_UINT64 => { FFI_TYPE_UINT64 => {
if value.is_big_int() { if let Ok(value) = v8::Local::<v8::BigInt>::try_from(value) {
let value = v8::Local::<v8::BigInt>::try_from(value).unwrap();
*(result as *mut u64) = value.u64_value().0; *(result as *mut u64) = value.u64_value().0;
} else { } else {
*(result as *mut u64) = value *(result as *mut u64) = value

1
test_ffi/tests/integration_tests.rs
View file

@ -45,6 +45,7 @@ fn basic() {
let expected = "\ let expected = "\
something\n\ something\n\
[1, 2, 3, 4, 5, 6, 7, 8]\n\ [1, 2, 3, 4, 5, 6, 7, 8]\n\
[4, 5, 6]\n\
[1, 2, 3, 4, 5, 6, 7, 8] [9, 10]\n\ [1, 2, 3, 4, 5, 6, 7, 8] [9, 10]\n\
[1, 2, 3, 4, 5, 6, 7, 8]\n\ [1, 2, 3, 4, 5, 6, 7, 8]\n\
[ 1, 2, 3, 4, 5, 6 ]\n\ [ 1, 2, 3, 4, 5, 6 ]\n\

3
test_ffi/tests/test.js
View file

@ -174,6 +174,9 @@ dylib.symbols.printSomething();
const buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]); const buffer = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
const buffer2 = new Uint8Array([9, 10]); const buffer2 = new Uint8Array([9, 10]);
dylib.symbols.print_buffer(buffer, buffer.length); dylib.symbols.print_buffer(buffer, buffer.length);
// Test subarrays
const subarray = buffer.subarray(3);
dylib.symbols.print_buffer(subarray, subarray.length - 2);
dylib.symbols.print_buffer2(buffer, buffer.length, buffer2, buffer2.length); dylib.symbols.print_buffer2(buffer, buffer.length, buffer2, buffer2.length);
const ptr0 = dylib.symbols.return_buffer(); const ptr0 = dylib.symbols.return_buffer();
dylib.symbols.print_buffer(ptr0, 8); dylib.symbols.print_buffer(ptr0, 8);