1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby/ruby.h: introduce new flags for T_TYPEDDATA.

Browse Source 
* 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
This commit is contained in:
ko1 2013-10-29 09:42:45 +00:00
parent 5aa527fade
commit 52811ab159
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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> Tue Oct 29 16:49:03 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (vm_malloc_increase): decrease it more carefully. * gc.c (vm_malloc_increase): decrease it more carefully.

12
gc.c
View File

@ -1196,7 +1196,7 @@ VALUE
rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
{ {
if (klass) Check_Type(klass, T_CLASS); 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 size_t
@ -1373,17 +1373,25 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
break; break;
case T_DATA: case T_DATA:
if (DATA_PTR(obj)) { if (DATA_PTR(obj)) {
int free_immediately = 0;
if (RTYPEDDATA_P(obj)) { 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; 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)); xfree(DATA_PTR(obj));
} }
else if (RANY(obj)->as.data.dfree) { else if (RANY(obj)->as.data.dfree) {
if (free_immediately) {
(RDATA(obj)->dfree)(DATA_PTR(obj));
}
else {
make_deferred(RANY(obj)); make_deferred(RANY(obj));
return 1; return 1;
} }
} }
}
break; break;
case T_MATCH: case T_MATCH:
if (RANY(obj)->as.match.rmatch) { if (RANY(obj)->as.match.rmatch) {

4
include/ruby/ruby.h
View File

@ -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_DEFAULT_FREE RUBY_DEFAULT_FREE
#define RUBY_TYPED_NEVER_FREE RUBY_NEVER_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)\ #define Data_Wrap_Struct(klass,mark,free,sval)\
rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free)) rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free))