diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-29 09:42:45 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-29 09:42:45 +0000 |
| commit | 52811ab159e7a9927eba9aa30bc14684ff0852fe (patch) | |
| tree | c64356b1bb1edbffaa1e63999d908565bd27b77f | |
| parent | 5aa527fadee91ef03e4a3acb173b8da5f56a43ac (diff) | |
* include/ruby/ruby.h: introduce new flags for T_TYPEDDATA.
* RUBY_TYPED_FREE_IMMEDIATELY: free the data given by DATA_PTR()
with dfree function immediately. Otherwise (default), the data
freed at finalizaton point.
* RUBY_TYPED_WB_PROTECTED: make this object with FL_WB_PROTECT
(not shady).
* gc.c (obj_free): support RUBY_TYPED_FREE_IMMEDIATELY.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gc.c | 16 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 4 |
3 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,14 @@ +Tue Oct 29 18:37:33 2013 Koichi Sasada <ko1@atdot.net> + + * include/ruby/ruby.h: introduce new flags for T_TYPEDDATA. + * RUBY_TYPED_FREE_IMMEDIATELY: free the data given by DATA_PTR() + with dfree function immediately. Otherwise (default), the data + freed at finalizaton point. + * RUBY_TYPED_WB_PROTECTED: make this object with FL_WB_PROTECT + (not shady). + + * gc.c (obj_free): support RUBY_TYPED_FREE_IMMEDIATELY. + Tue Oct 29 16:49:03 2013 Koichi Sasada <ko1@atdot.net> * gc.c (vm_malloc_increase): decrease it more carefully. @@ -1196,7 +1196,7 @@ VALUE rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) { if (klass) Check_Type(klass, T_CLASS); - return newobj_of(klass, T_DATA | type->flags, (VALUE)type, (VALUE)1, (VALUE)datap); + return newobj_of(klass, T_DATA | (type->flags & ~T_MASK), (VALUE)type, (VALUE)1, (VALUE)datap); } size_t @@ -1373,15 +1373,23 @@ obj_free(rb_objspace_t *objspace, VALUE obj) break; case T_DATA: if (DATA_PTR(obj)) { + int free_immediately = 0; + if (RTYPEDDATA_P(obj)) { + free_immediately = RANY(obj)->as.typeddata.type->flags & RUBY_TYPED_FREE_IMMEDIATELY; RDATA(obj)->dfree = RANY(obj)->as.typeddata.type->function.dfree; } - if (RANY(obj)->as.data.dfree == (RUBY_DATA_FUNC)-1) { + if (RANY(obj)->as.data.dfree == RUBY_DEFAULT_FREE) { xfree(DATA_PTR(obj)); } else if (RANY(obj)->as.data.dfree) { - make_deferred(RANY(obj)); - return 1; + if (free_immediately) { + (RDATA(obj)->dfree)(DATA_PTR(obj)); + } + else { + make_deferred(RANY(obj)); + return 1; + } } } break; diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2a33b84dd7..4bac7d3031 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1008,6 +1008,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); #define RUBY_TYPED_DEFAULT_FREE RUBY_DEFAULT_FREE #define RUBY_TYPED_NEVER_FREE RUBY_NEVER_FREE +/* bits for rb_data_type_struct::flags */ +#define RUBY_TYPED_FREE_IMMEDIATELY 1 /* TYPE field */ +#define RUBY_TYPED_WB_PROTECTED FL_WB_PROTECT + #define Data_Wrap_Struct(klass,mark,free,sval)\ rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free)) |