Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge revision(s) 18316,18319:

	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@21334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 1e486d4e1cbae1804a69cec24fca89d23b073977 1 parent b09d436
@shyouhei shyouhei authored
Showing with 25 additions and 8 deletions.
  1. +15 −0 ChangeLog
  2. +1 −0  eval.c
  3. +1 −0  gc.c
  4. +4 −4 rubysig.h
  5. +4 −4 version.h
View
15 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.
View
1  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;
View
1  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();
View
8 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();\
View
8 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[];
Please sign in to comment.
Something went wrong with that request. Please try again.