diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-14 20:20:59 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-14 20:20:59 +0000 |
| commit | dfcc89576d958472e026e88f9c0e862e32fda349 (patch) | |
| tree | 310b35a7efc1bdb782d992f99d3c0bb96cd57b0e | |
| parent | ef3fb5d1e89c6494f1223da46ed8c7a74dff7d2d (diff) | |
| download | ruby-dfcc89576d958472e026e88f9c0e862e32fda349.tar.gz | |
* ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's
the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM
is defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Jun 15 05:12:59 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's + the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM + is defined. + Wed Jun 15 04:42:47 2011 Koichi Sasada <ko1@atdot.net> * benchmark/bm_vm3_thread_*.rb: renamed bm_vm3_thread_*.rb to diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index d27af153a5..f0f0b4a6db 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -2526,11 +2526,11 @@ lib_eventloop_core(check_root, update_flag, check_var, interp) rb_thread_schedule(); } - DUMP1("trap check & thread scheduling"); -#ifdef RUBY_USE_NATIVE_THREAD - /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX TODO !!!! */ -#else + DUMP1("check interrupts"); +#if defined(RUBY_USE_NATIVE_THREAD) || defined(RUBY_VM) if (update_flag == 0) rb_thread_check_ints(); +#else + if (update_flag == 0) CHECK_INTS; #endif } |