ruby-changes:9892
From: shyouhei <ko1@a...>
Date: Mon, 12 Jan 2009 00:23:39 +0900 (JST)
Subject: [ruby-changes:9892] Ruby:r21433 (ruby_1_8_6): merge revision(s) 18392:
shyouhei 2009-01-12 00:22:46 +0900 (Mon, 12 Jan 2009) New Revision: 21433 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21433 Log: merge revision(s) 18392: * gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and Data. [ruby-dev:35578] * gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers cannot be invoked. [ruby-dev:35681] Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/gc.c branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 21432) +++ ruby_1_8_6/ChangeLog (revision 21433) @@ -1,3 +1,11 @@ +Mon Jan 12 00:21:49 2009 Nobuyoshi Nakada <nobu@r...> + + * gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and + Data. [ruby-dev:35578] + + * gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers + cannot be invoked. [ruby-dev:35681] + Sun Jan 11 11:31:52 2009 Shugo Maeda <shugo@r...> * lib/net/ftp.rb (chdir): handle 5xx errors correctly. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 21432) +++ ruby_1_8_6/version.h (revision 21433) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-11" +#define RUBY_RELEASE_DATE "2009-01-12" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090111 -#define RUBY_PATCHLEVEL 295 +#define RUBY_RELEASE_CODE 20090112 +#define RUBY_PATCHLEVEL 296 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8_6/gc.c =================================================================== --- ruby_1_8_6/gc.c (revision 21432) +++ ruby_1_8_6/gc.c (revision 21433) @@ -1012,8 +1012,17 @@ } } -static void obj_free _((VALUE)); +static int obj_free _((VALUE)); +static inline void +add_freelist(p) + RVALUE *p; +{ + p->as.free.flags = 0; + p->as.free.next = freelist; + freelist = p; +} + static void finalize_list(p) RVALUE *p; @@ -1022,9 +1031,7 @@ RVALUE *tmp = p->as.free.next; run_final((VALUE)p); if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */ - p->as.free.flags = 0; - p->as.free.next = freelist; - freelist = p; + add_freelist(p); } p = tmp; } @@ -1049,6 +1056,8 @@ } } +#define T_DEFERRED 0x3a + void rb_gc_abort_threads(void); static void @@ -1092,26 +1101,28 @@ int n = 0; RVALUE *free = freelist; RVALUE *final = final_list; + int deferred; p = heaps[i].slot; pend = p + heaps[i].limit; while (p < pend) { if (!(p->as.basic.flags & FL_MARK)) { - if (p->as.basic.flags) { - obj_free((VALUE)p); - } - if (need_call_final && FL_TEST(p, FL_FINALIZE)) { - p->as.free.flags = FL_MARK; /* remain marked */ + if (p->as.basic.flags && + ((deferred = obj_free((VALUE)p)) || + ((FL_TEST(p, FL_FINALIZE)) && need_call_final))) { + if (!deferred) { + p->as.free.flags = T_DEFERRED; + RDATA(p)->dfree = 0; + } + p->as.free.flags |= FL_MARK; p->as.free.next = final_list; final_list = p; } else { - p->as.free.flags = 0; - p->as.free.next = freelist; - freelist = p; + add_freelist(p); } n++; } - else if (RBASIC(p)->flags == FL_MARK) { + else if (BUILTIN_TYPE(p) == T_DEFERRED) { /* objects to be finalized */ /* do nothing remain marked */ } @@ -1157,16 +1168,21 @@ rb_gc_force_recycle(p) VALUE p; { - RANY(p)->as.free.flags = 0; - RANY(p)->as.free.next = freelist; - freelist = RANY(p); + add_freelist(p); } -static void +static inline void +make_deferred(p) + RVALUE *p; +{ + p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_DEFERRED; +} + +static int obj_free(obj) VALUE obj; { - switch (RANY(obj)->as.basic.flags & T_MASK) { + switch (BUILTIN_TYPE(obj)) { case T_NIL: case T_FIXNUM: case T_TRUE: @@ -1179,7 +1195,7 @@ rb_free_generic_ivar((VALUE)obj); } - switch (RANY(obj)->as.basic.flags & T_MASK) { + switch (BUILTIN_TYPE(obj)) { case T_OBJECT: if (RANY(obj)->as.object.iv_tbl) { st_free_table(RANY(obj)->as.object.iv_tbl); @@ -1222,7 +1238,8 @@ RUBY_CRITICAL(free(DATA_PTR(obj))); } else if (RANY(obj)->as.data.dfree) { - (*RANY(obj)->as.data.dfree)(DATA_PTR(obj)); + make_deferred(RANY(obj)); + return 1; } } break; @@ -1234,8 +1251,11 @@ break; case T_FILE: if (RANY(obj)->as.file.fptr) { - rb_io_fptr_finalize(RANY(obj)->as.file.fptr); - RUBY_CRITICAL(free(RANY(obj)->as.file.fptr)); + struct rb_io_t *fptr = RANY(obj)->as.file.fptr; + make_deferred(RANY(obj)); + RDATA(obj)->dfree = (void (*)(void*))rb_io_fptr_finalize; + RDATA(obj)->data = fptr; + return 1; } break; case T_ICLASS: @@ -1263,7 +1283,7 @@ RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node)); break; } - return; /* no need to free iv_tbl */ + break; /* no need to free iv_tbl */ case T_SCOPE: if (RANY(obj)->as.scope.local_vars && @@ -1286,6 +1306,8 @@ rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)", RANY(obj)->as.basic.flags & T_MASK, obj); } + + return 0; } void @@ -1633,6 +1655,7 @@ case T_VARMAP: case T_SCOPE: case T_NODE: + case T_DEFERRED: continue; case T_CLASS: if (FL_TEST(p, FL_SINGLETON)) continue; @@ -1874,6 +1897,21 @@ } } +static int +chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg) +{ + RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg; + if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == FL_FINALIZE) { + if (BUILTIN_TYPE(p) != T_DEFERRED) { + p->as.free.flags = FL_MARK | T_DEFERRED; /* remain marked */ + RDATA(p)->dfree = 0; + } + p->as.free.next = *final_list; + *final_list = p; + } + return ST_CONTINUE; +} + void rb_gc_call_finalizer_at_exit() { @@ -1882,20 +1920,14 @@ /* run finalizers */ if (need_call_final) { - p = deferred_final_list; - deferred_final_list = 0; - finalize_list(p); - for (i = 0; i < heaps_used; i++) { - p = heaps[i].slot; pend = p + heaps[i].limit; - while (p < pend) { - if (FL_TEST(p, FL_FINALIZE)) { - FL_UNSET(p, FL_FINALIZE); - p->as.basic.klass = 0; - run_final((VALUE)p); - } - p++; - } - } + do { + p = deferred_final_list; + deferred_final_list = 0; + finalize_list(p); + mark_tbl(finalizer_table, 0); + st_foreach(finalizer_table, chain_finalized_object, + (st_data_t)&deferred_final_list); + } while (deferred_final_list); } /* run data object's finalizers */ for (i = 0; i < heaps_used; i++) { @@ -1956,7 +1988,7 @@ } if (!is_pointer_to_heap((void *)ptr)|| - (type = BUILTIN_TYPE(ptr)) >= T_BLKTAG || type == T_ICLASS) { + (type = BUILTIN_TYPE(ptr)) > T_SYMBOL || type == T_ICLASS) { rb_raise(rb_eRangeError, "0x%lx is not id value", p0); } if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/