merge revision(s) 18316,18319:

shyouhei · shyouhei · commit 7e575886770f · 2009-01-05T02:16:18.000Z
* rubysig.h (CHECK_INTS): gives the chance to perform to deferred
	  finalizers before explicit GC.start or the process termination.
	  [ruby-core:18045]
	* eval.c (rb_thread_schedule): runs deferred finalizers.
	* gc.c (gc_sweep): sets rb_thread_pending to run deferred finalizers.
	* rubysig.h (CHECK_INTS): now checks rb_thread_pending even on
	  platforms where setitimer is not available.  [ruby-core:18045]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): runs deferred finalizers.
+
+	* gc.c (gc_sweep): sets rb_thread_pending to run deferred finalizers.
+
+	* rubysig.h (CHECK_INTS): now checks rb_thread_pending even on
+	  platforms where setitimer is not available.  [ruby-core:18045]
+
+Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rubysig.h (CHECK_INTS): gives the chance to perform to deferred
+	  finalizers before explicit GC.start or the process termination.
+	  [ruby-core:18045]
+
 Sun Jan  4 04:49:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_telldir): just returns loc.
diff --git a/eval.c b/eval.c
@@ -10948,6 +10948,7 @@ rb_thread_schedule()
     }
 #endif
     rb_thread_pending = 0;
+    rb_gc_finalize_deferred();
     if (curr_thread == curr_thread->next
 	&& curr_thread->status == THREAD_RUNNABLE)
 	return;
diff --git a/gc.c b/gc.c
@@ -1187,6 +1187,7 @@ gc_sweep()
     /* clear finalization list */
     if (final_list) {
 	deferred_final_list = final_list;
+	rb_thread_pending = 1;
 	return;
     }
     free_unused_heaps();
diff --git a/rubysig.h b/rubysig.h
@@ -78,12 +78,12 @@ RUBY_EXTERN rb_atomic_t rb_trap_pending;
 void rb_trap_restore_mask _((void));
 
 RUBY_EXTERN int rb_thread_critical;
+RUBY_EXTERN int rb_thread_pending;
 void rb_thread_schedule _((void));
 #if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
-RUBY_EXTERN int rb_thread_pending;
 # define CHECK_INTS do {\
     if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
-        if (rb_thread_pending) rb_thread_schedule();\
+	if (rb_thread_pending) rb_thread_schedule();\
 	if (rb_trap_pending) rb_trap_exec();\
     }\
 } while (0)
@@ -93,9 +93,9 @@ RUBY_EXTERN int rb_thread_tick;
 #define THREAD_TICK 500
 #define CHECK_INTS do {\
     if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
-	if (rb_thread_tick-- <= 0) {\
+	if (rb_thread_pending || rb_thread_tick-- <= 0) {\
 	    rb_thread_tick = THREAD_TICK;\
-            rb_thread_schedule();\
+	    rb_thread_schedule();\
 	}\
     }\
     if (rb_trap_pending) rb_trap_exec();\
diff --git a/version.h b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-04"
+#define RUBY_RELEASE_DATE "2009-01-05"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090104
-#define RUBY_PATCHLEVEL 76
+#define RUBY_RELEASE_CODE 20090105
+#define RUBY_PATCHLEVEL 77
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

Original file line number	Diff line number	Diff line change
`@@ -10948,6 +10948,7 @@ rb_thread_schedule()`
`10948`	`10948`	`}`
`10949`	`10949`	`#endif`
`10950`	`10950`	`rb_thread_pending = 0;`
	`10951`	`+ rb_gc_finalize_deferred();`
`10951`	`10952`	`if (curr_thread == curr_thread->next`
`10952`	`10953`	`&& curr_thread->status == THREAD_RUNNABLE)`
`10953`	`10954`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1187,6 +1187,7 @@ gc_sweep()`
`1187`	`1187`	`/* clear finalization list */`
`1188`	`1188`	`if (final_list) {`
`1189`	`1189`	`deferred_final_list = final_list;`
	`1190`	`+ rb_thread_pending = 1;`
`1190`	`1191`	`return;`
`1191`	`1192`	`}`
`1192`	`1193`	`free_unused_heaps();`