mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* bin/erb (ERB::Main::run): typo fixed. [ruby-core:06337]
* env.h: move struct METHOD and struct BLOCK from eval.c to support NodeWrap and ParseTree. * rubysig.h (CHECK_INTS): prevent signal handler to run during critical section. [ruby-core:04039] * eval.c (load_wait): need not to call rb_thread_schedule() explicitly. [ruby-core:04039] * eval.c (rb_thread_schedule): clear rb_thread_critical. [ruby-core:04039] * eval.c (rb_obj_instance_exec): create instance_exec and module_exec which pass arguments to the block. * eval.c (rb_f_funcall): rename fcall to funcall to follow tradition. * st.c (st_free_table): do not call free() but xfree(). [ruby-core:06205] * eval.c (splat_value): call rb_Array() to convert svalue to values. [ruby-dev:27397] * lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may not be parsed correctly. A patch from August Z. Flatby (augustzf) in [ruby-Patches-2595]. [ruby-core:06183] * object.c (rb_Array): Array() to raise error for objects without to_ary, nor to_a. * object.c (nil_to_a): revert NilClass#to_a. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
73f94bb851
commit
5b014a7427
9 changed files with 214 additions and 87 deletions
17
rubysig.h
17
rubysig.h
|
@ -82,10 +82,9 @@ 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) {\
|
||||
if (!(rb_prohibit_interrupt | rb_thread_critical)) {\
|
||||
if (rb_thread_pending) rb_thread_schedule();\
|
||||
if (rb_trap_pending) rb_trap_exec();\
|
||||
if (rb_thread_pending && !rb_thread_critical)\
|
||||
rb_thread_schedule();\
|
||||
}\
|
||||
} while (0)
|
||||
#else
|
||||
|
@ -93,15 +92,13 @@ RUBY_EXTERN int rb_thread_pending;
|
|||
RUBY_EXTERN int rb_thread_tick;
|
||||
#define THREAD_TICK 500
|
||||
#define CHECK_INTS do {\
|
||||
if (!rb_prohibit_interrupt) {\
|
||||
if (rb_trap_pending) rb_trap_exec();\
|
||||
if (!rb_thread_critical) {\
|
||||
if (rb_thread_tick-- <= 0) {\
|
||||
rb_thread_tick = THREAD_TICK;\
|
||||
rb_thread_schedule();\
|
||||
}\
|
||||
if (!(rb_prohibit_interrupt | rb_thread_critical)) {\
|
||||
if (rb_thread_tick-- <= 0) {\
|
||||
rb_thread_tick = THREAD_TICK;
|
||||
rb_thread_schedule();
|
||||
}\
|
||||
}\
|
||||
if (rb_trap_pending) rb_trap_exec();\
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue