diff options
author | Sutou Kouhei <kou@cozmixng.org> | 2021-06-17 13:36:18 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-07-13 19:37:45 +0900 |
commit | 10e26cfa76468dea6f828dbe8031b5ffcff543cb (patch) | |
tree | 2fbf89fe75da8f40c96af505c20e5e5f6b4e1dd3 /ext | |
parent | 9988f6ac4e887437b5a76f0a1c27fa6f5c17c039 (diff) |
[ruby/fiddle] Add MemoryView.export and MemoryView#release (https://github.com/ruby/fiddle/pull/80)
fix https://github.com/ruby/fiddle/pull/79
Users can release memory views explicitly before process exit.
Reported by xtkoba. Thanks!!!
https://github.com/ruby/fiddle/commit/1de64b7e76
Diffstat (limited to 'ext')
-rw-r--r-- | ext/fiddle/memory_view.c | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c index 2a9f45feea..fb3ab086bd 100644 --- a/ext/fiddle/memory_view.c +++ b/ext/fiddle/memory_view.c @@ -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); } @@ -63,12 +76,33 @@ 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) { struct memview_data *data; @@ -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); |