Skip to content
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

Jump to bottom

Add MemoryView.export and MemoryView#release #80

Merged
merged 2 commits into from
Jun 17, 2021
Merged

Add MemoryView.export and MemoryView#release #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6019c8e
Add MemoryView.get and MemoryView#release
kou Jun 16, 2021
d8362e8
get -> export
kou Jun 17, 2021
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
42 changes: 39 additions & 3 deletions ext/fiddle/memory_view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,25 @@ fiddle_memview_mark(void *ptr)
}

static void
fiddle_memview_free(void *ptr)
fiddle_memview_release(struct memview_data *data)
{
struct memview_data *data = ptr;
if (NIL_P(data->view.obj)) return;

rb_memory_view_release(&data->view);
if (data->members)
data->view.obj = Qnil;
data->view.byte_size = 0;
if (data->members) {
xfree(data->members);
data->members = NULL;
data->n_members = 0;
}
}

static void
fiddle_memview_free(void *ptr)
{
struct memview_data *data = ptr;
fiddle_memview_release(data);
xfree(ptr);
}

Expand All @@ -63,11 +76,32 @@ rb_fiddle_memview_s_allocate(VALUE klass)
struct memview_data *data;
VALUE obj = TypedData_Make_Struct(klass, struct memview_data, &fiddle_memview_data_type, data);
data->view.obj = Qnil;
data->view.byte_size = 0;
data->members = NULL;
data->n_members = 0;
return obj;
}

static VALUE
rb_fiddle_memview_release(VALUE obj)
{
struct memview_data *data;
TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);

if (NIL_P(data->view.obj)) return Qnil;
fiddle_memview_release(data);
return Qnil;
}

static VALUE
rb_fiddle_memview_s_export(VALUE klass, VALUE target)
{
ID id_new;
CONST_ID(id_new, "new");
VALUE memview = rb_funcall(klass, id_new, 1, target);
return rb_ensure(rb_yield, memview, rb_fiddle_memview_release, memview);
}

static VALUE
rb_fiddle_memview_initialize(VALUE obj, VALUE target)
{
Expand Down Expand Up @@ -269,7 +303,9 @@ Init_fiddle_memory_view(void)
{
rb_cMemoryView = rb_define_class_under(mFiddle, "MemoryView", rb_cObject);
rb_define_alloc_func(rb_cMemoryView, rb_fiddle_memview_s_allocate);
rb_define_singleton_method(rb_cMemoryView, "export", rb_fiddle_memview_s_export, 1);
rb_define_method(rb_cMemoryView, "initialize", rb_fiddle_memview_initialize, 1);
rb_define_method(rb_cMemoryView, "release", rb_fiddle_memview_release, 0);
rb_define_method(rb_cMemoryView, "obj", rb_fiddle_memview_get_obj, 0);
rb_define_method(rb_cMemoryView, "byte_size", rb_fiddle_memview_get_byte_size, 0);
rb_define_method(rb_cMemoryView, "readonly?", rb_fiddle_memview_get_readonly, 0);
Expand Down
16 changes: 16 additions & 0 deletions test/fiddle/test_memory_view.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@ def test_memory_view_multi_dimensional_with_multiple_members
assert_equal([-7, -8], mview[1, 3])
end

def test_export
str = "hello world"
mview_str = MemoryView.export(Pointer[str]) do |mview|
mview.to_s
end
assert_equal(str, mview_str)
end

def test_release
ptr = Pointer["hello world"]
mview = MemoryView.new(ptr)
assert_same(ptr, mview.obj)
mview.release
assert_nil(mview.obj)
end

def test_to_s
# U+3042 HIRAGANA LETTER A
data = "\u{3042}"
Expand Down