ruby-changes:5282
From: shyouhei <ko1@a...>
Date: Tue, 3 Jun 2008 15:35:47 +0900 (JST)
Subject: [ruby-changes:5282] Ruby:r16781 (ruby_1_8_5): merge revision(s) 13497:
shyouhei 2008-06-03 15:35:36 +0900 (Tue, 03 Jun 2008) New Revision: 16781 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/gc.c branches/ruby_1_8_5/version.h Log: merge revision(s) 13497: * gc.c (os_obj_of, os_each_obj): hide objects to be finalized. [ruby-dev:31810] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16781&r2=16780&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16781&r2=16780&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/gc.c?r1=16781&r2=16780&diff_format=u Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16780) +++ ruby_1_8_5/ChangeLog (revision 16781) @@ -1,3 +1,8 @@ +Tue Jun 3 15:27:11 2008 Nobuyoshi Nakada <nobu@r...> + + * gc.c (os_obj_of, os_each_obj): hide objects to be finalized. + [ruby-dev:31810] + Tue Jun 3 15:05:48 2008 Nobuyoshi Nakada <nobu@r...> * process.c (struct rb_exec_arg): proc should be a VALUE. Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16780) +++ ruby_1_8_5/version.h (revision 16781) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-03" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080603 -#define RUBY_PATCHLEVEL 122 +#define RUBY_PATCHLEVEL 123 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_5/gc.c =================================================================== --- ruby_1_8_5/gc.c (revision 16780) +++ ruby_1_8_5/gc.c (revision 16781) @@ -1555,38 +1555,6 @@ } static VALUE -os_live_obj() -{ - int i; - int n = 0; - - for (i = 0; i < heaps_used; i++) { - RVALUE *p, *pend; - - p = heaps[i].slot; pend = p + heaps[i].limit; - for (;p < pend; p++) { - if (p->as.basic.flags) { - switch (TYPE(p)) { - case T_ICLASS: - case T_VARMAP: - case T_SCOPE: - case T_NODE: - continue; - case T_CLASS: - if (FL_TEST(p, FL_SINGLETON)) continue; - default: - if (!p->as.basic.klass) continue; - rb_yield((VALUE)p); - n++; - } - } - } - } - - return INT2FIX(n); -} - -static VALUE os_obj_of(of) VALUE of; { @@ -1600,6 +1568,7 @@ for (;p < pend; p++) { if (p->as.basic.flags) { switch (TYPE(p)) { + case T_NONE: case T_ICLASS: case T_VARMAP: case T_SCOPE: @@ -1609,7 +1578,7 @@ if (FL_TEST(p, FL_SINGLETON)) continue; default: if (!p->as.basic.klass) continue; - if (rb_obj_is_kind_of((VALUE)p, of)) { + if (!of || rb_obj_is_kind_of((VALUE)p, of)) { rb_yield((VALUE)p); n++; } @@ -1663,11 +1632,9 @@ rb_secure(4); if (rb_scan_args(argc, argv, "01", &of) == 0) { - return os_live_obj(); + of = 0; } - else { - return os_obj_of(of); - } + return os_obj_of(of); } static VALUE finalizers; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/