Skip to content

function: keep resolved ffi_type for arguments and return value #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

function: keep resolved ffi_type for arguments and return value #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions ext/fiddle/function.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ typedef struct fiddle_function {
ffi_cif cif;
void (*fn)(void);
int *argument_types;
ffi_type **argument_ffi_types;
int n_argument_types;
int return_type;
ffi_type *return_ffi_type;
ffi_abi abi;
bool is_variadic;
bool need_gvl;
Expand All @@ -56,6 +58,7 @@ deallocate(void *p)
fiddle_function_t *func = p;
if (func->cif.arg_types) xfree(func->cif.arg_types);
if (func->argument_types) xfree(func->argument_types);
if (func->argument_ffi_types) xfree(func->argument_ffi_types);
xfree(func);
}

Expand All @@ -67,6 +70,7 @@ function_memsize(const void *p)

size += sizeof(*func);
size += func->n_argument_types * sizeof(int);
size += func->n_argument_types * sizeof(ffi_type *);
#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
size += ffi_raw_size((ffi_cif *)&func->cif);
#endif
Expand Down Expand Up @@ -153,6 +157,7 @@ initialize(int argc, VALUE argv[], VALUE self)
VALUE name = Qnil;
VALUE need_gvl = Qfalse;
int c_ret_type;
ffi_type *ret_ffi_type;
bool is_variadic = false;
ffi_abi c_ffi_abi;
void *cfunc;
Expand Down Expand Up @@ -196,7 +201,7 @@ initialize(int argc, VALUE argv[], VALUE self)
abi = INT2FIX(c_ffi_abi);
ret_type = rb_fiddle_type_ensure(ret_type);
c_ret_type = NUM2INT(ret_type);
(void)INT2FFI_TYPE(c_ret_type); /* raise */
ret_ffi_type = INT2FFI_TYPE(c_ret_type); /* raise */
ret_type = INT2FIX(c_ret_type);

arg_types = normalize_argument_types("argument types",
Expand All @@ -220,6 +225,7 @@ initialize(int argc, VALUE argv[], VALUE self)
func->fn = (void (*)(void))(VALUE)cfunc;
func->abi = c_ffi_abi;
func->return_type = c_ret_type;
func->return_ffi_type = ret_ffi_type;
func->is_variadic = is_variadic;
func->need_gvl = RTEST(need_gvl);

Expand All @@ -228,10 +234,16 @@ initialize(int argc, VALUE argv[], VALUE self)
xfree(func->argument_types);
func->argument_types = NULL;
}
if (func->argument_ffi_types) {
xfree(func->argument_ffi_types);
func->argument_ffi_types = NULL;
}
func->n_argument_types = RARRAY_LENINT(arg_types);
func->argument_types = ALLOC_N(int, func->n_argument_types);
func->argument_ffi_types = ALLOC_N(ffi_type *, func->n_argument_types);
for (i = 0; i < func->n_argument_types; i++) {
func->argument_types[i] = FIX2INT(RARRAY_AREF(arg_types, i));
func->argument_ffi_types[i] = INT2FFI_TYPE(func->argument_types[i]);
}
if (func->cif.arg_types) {
xfree(func->cif.arg_types);
Expand Down Expand Up @@ -348,7 +360,8 @@ function_call(int argc, VALUE argv[], VALUE self)
ffi_status result;

ffi_arg_types = xcalloc(n_call_args + 1, sizeof(ffi_type *));
for (i_call = 0; i_call < n_call_args; i_call++) {
MEMCPY(ffi_arg_types, func->argument_ffi_types, ffi_type *, n_fixed_args);
for (i_call = n_fixed_args; i_call < n_call_args; i_call++) {
ffi_arg_types[i_call] = INT2FFI_TYPE(call_arg_types[i_call]);
}
ffi_arg_types[i_call] = NULL;
Expand All @@ -359,7 +372,7 @@ function_call(int argc, VALUE argv[], VALUE self)
func->abi,
n_fixed_args,
n_call_args,
INT2FFI_TYPE(func->return_type),
func->return_ffi_type,
ffi_arg_types);
#else
/* This code is never used because ffi_prep_cif_var()
Expand All @@ -371,7 +384,7 @@ function_call(int argc, VALUE argv[], VALUE self)
result = ffi_prep_cif(&func->cif,
func->abi,
n_call_args,
INT2FFI_TYPE(func->return_type),
func->return_ffi_type,
ffi_arg_types);
}
if (result != FFI_OK) {
Expand Down
Loading