* 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@18319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-02 07:08:18 +00:00
parent 05c96af27b
commit 42ec1fa621
4 changed files with 14 additions and 12 deletions

View file

@ -1,14 +1,17 @@
Sat Aug 2 16:08:07 2008 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]
Sat Aug 2 15:51:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (yylex): 8 and 9 in octal integer should cause compile
error. [ruby-dev:35729]
Sat Aug 2 11:51:42 2008 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]
Fri Aug 1 14:54:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_seekdir): no need to rewind to seek forward.

1
eval.c
View file

@ -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;

1
gc.c
View file

@ -1197,6 +1197,7 @@ gc_sweep()
/* clear finalization list */
if (final_list) {
deferred_final_list = final_list;
rb_thread_pending = 1;
return;
}
free_unused_heaps();

View file

@ -78,13 +78,11 @@ RUBY_EXTERN rb_atomic_t rb_trap_pending;
void rb_trap_restore_mask _((void));
RUBY_EXTERN int rb_thread_critical;
void rb_thread_schedule _((void));
void rb_gc_finalize_deferred _((void));
#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
RUBY_EXTERN int rb_thread_pending;
void rb_thread_schedule _((void));
#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
# define CHECK_INTS do {\
if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
rb_gc_finalize_deferred();\
if (rb_thread_pending) rb_thread_schedule();\
if (rb_trap_pending) rb_trap_exec();\
}\
@ -95,8 +93,7 @@ RUBY_EXTERN int rb_thread_tick;
#define THREAD_TICK 500
#define CHECK_INTS do {\
if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
rb_gc_finalize_deferred();\
if (rb_thread_tick-- <= 0) {\
if (rb_thread_pending || rb_thread_tick-- <= 0) {\
rb_thread_tick = THREAD_TICK;\
rb_thread_schedule();\
}\