Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Convert FFI::Struct::InlineArray to TypedData #997

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

Merged
larskanis merged 1 commit into from
Mar 3, 2023
Merged

Convert FFI::Struct::InlineArray to TypedData #997

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
33 changes: 22 additions & 11 deletions ext/ffi_c/Struct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void struct_mark(Struct *);
static void struct_free(Struct *);
static VALUE struct_class_layout(VALUE klass);
static void struct_malloc(Struct* s);
static void inline_array_mark(InlineArray *);
static void inline_array_mark(void *);
static void store_reference_value(StructField* f, Struct* s, VALUE value);

VALUE rbffi_StructClass = Qnil;
Expand Down Expand Up @@ -489,22 +489,33 @@ struct_order(int argc, VALUE* argv, VALUE self)
}
}

static const rb_data_type_t inline_array_data_type = {
.wrap_struct_name = "FFI::Struct::InlineArray",
.function = {
.dmark = inline_array_mark,
.dfree = RUBY_TYPED_DEFAULT_FREE,
.dsize = NULL,
},
.flags = RUBY_TYPED_FREE_IMMEDIATELY
};

static VALUE
inline_array_allocate(VALUE klass)
{
InlineArray* array;
VALUE obj;

obj = Data_Make_Struct(klass, InlineArray, inline_array_mark, -1, array);
obj = TypedData_Make_Struct(klass, InlineArray, &inline_array_data_type, array);
array->rbField = Qnil;
array->rbMemory = Qnil;

return obj;
}

static void
inline_array_mark(InlineArray* array)
inline_array_mark(void *data)
{
InlineArray *array = (InlineArray *)data;
rb_gc_mark(array->rbField);
rb_gc_mark(array->rbMemory);
}
Expand All @@ -521,7 +532,7 @@ inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
{
InlineArray* array;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);
array->rbMemory = rbMemory;
array->rbField = rbField;

Expand Down Expand Up @@ -550,7 +561,7 @@ inline_array_size(VALUE self)
{
InlineArray* array;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

return UINT2NUM(((ArrayType *) array->field->type)->length);
}
Expand All @@ -575,7 +586,7 @@ inline_array_aref(VALUE self, VALUE rbIndex)
{
InlineArray* array;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

if (array->op != NULL) {
VALUE rbNativeValue = array->op->get(array->memory,
Expand Down Expand Up @@ -611,7 +622,7 @@ inline_array_aset(VALUE self, VALUE rbIndex, VALUE rbValue)
{
InlineArray* array;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

if (array->op != NULL) {
if (unlikely(array->componentType->nativeType == NATIVE_MAPPED)) {
Expand Down Expand Up @@ -661,7 +672,7 @@ inline_array_each(VALUE self)

int i;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

for (i = 0; i < array->length; ++i) {
rb_yield(inline_array_aref(self, INT2FIX(i)));
Expand All @@ -682,7 +693,7 @@ inline_array_to_a(VALUE self)
VALUE obj;
int i;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);
obj = rb_ary_new2(array->length);


Expand All @@ -705,7 +716,7 @@ inline_array_to_s(VALUE self)
InlineArray* array;
VALUE argv[2];

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

if (array->componentType->nativeType != NATIVE_INT8 && array->componentType->nativeType != NATIVE_UINT8) {
VALUE dummy = Qnil;
Expand All @@ -728,7 +739,7 @@ inline_array_to_ptr(VALUE self)
{
InlineArray* array;

Data_Get_Struct(self, InlineArray, array);
TypedData_Get_Struct(self, InlineArray, &inline_array_data_type, array);

return rb_funcall(array->rbMemory, rb_intern("slice"), 2,
UINT2NUM(array->field->offset), UINT2NUM(array->arrayType->base.ffiType->size));
Expand Down