From 1a1c7ed2ddb6fcc9d05cf20ddb57f47de8b33d62 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 27 Mar 2009 10:21:06 +0000 Subject: merge revision(s) 22882,22961,22971: * gc.c (run_final): calls free function. [ruby-core:22578] * gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects unfinalized. [ruby-dev:38168] * gc.c (run_final): frees zombies only. [ruby-dev:38171] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@23077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++++++++++ gc.c | 6 +++++- version.h | 8 ++++---- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fef9774ec..0ee05ec23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Fri Mar 27 19:12:40 2009 Nobuyoshi Nakada + + * gc.c (run_final): frees zombies only. [ruby-dev:38171] + +Fri Mar 27 19:12:40 2009 Nobuyoshi Nakada + + * gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects + unfinalized. [ruby-dev:38168] + +Fri Mar 27 19:12:40 2009 Nobuyoshi Nakada + + * gc.c (run_final): calls free function. [ruby-core:22578] + Mon Mar 23 19:00:59 2009 Nobuyoshi Nakada * ext/thread/thread.c (rb_queue_pop, rb_queue_push): should not lock diff --git a/gc.c b/gc.c index 51ceb3db1..318e24ca7 100644 --- a/gc.c +++ b/gc.c @@ -1898,6 +1898,9 @@ run_final(obj) objid = rb_obj_id(obj); /* make obj into id */ rb_thread_critical = Qtrue; + if (BUILTIN_TYPE(obj) == T_DEFERRED && RDATA(obj)->dfree) { + (*RDATA(obj)->dfree)(DATA_PTR(obj)); + } args[1] = 0; args[2] = (VALUE)ruby_safe_level; for (i=0; ilen; i++) { @@ -1966,7 +1969,8 @@ rb_gc_call_finalizer_at_exit() p = heaps[i].slot; pend = p + heaps[i].limit; while (p < pend) { if (BUILTIN_TYPE(p) == T_DATA && - DATA_PTR(p) && RANY(p)->as.data.dfree) { + DATA_PTR(p) && RANY(p)->as.data.dfree && + RANY(p)->as.basic.klass != rb_cThread) { p->as.free.flags = 0; if ((long)RANY(p)->as.data.dfree == -1) { RUBY_CRITICAL(free(DATA_PTR(p))); diff --git a/version.h b/version.h index a6b02f085..1f1d37b97 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-03-23" +#define RUBY_RELEASE_DATE "2009-03-27" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090323 -#define RUBY_PATCHLEVEL 365 +#define RUBY_RELEASE_CODE 20090327 +#define RUBY_PATCHLEVEL 366 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 27 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit