Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merges r32345 from trunk into ruby_1_9_2.

--
* thread.c (rb_threadptr_check_signal): only wake up main thread.
* thread.c (rb_threadptr_execute_interrupts_common): check signal
  deliverly if it is main thread.
  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
* bootstraptest/test_fork.rb: add a test for above.
* signal.c (rb_get_next_signal): skip if signal_buff is empty.
  (check signal_buff.size first)
* vm_core.h: remove unused variable rb_thread_t::exec_signal.
* thread.c (rb_thread_check_trap_pending): check
  rb_signal_buff_size() because rb_thread_t::exec_signal
  is no longer available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 4197f337b9881accd21c15ca0f225dae752f5fd3 1 parent 01d1a35
@yugui yugui authored
View
19 ChangeLog
@@ -1,3 +1,22 @@
+Fri Jul 1 06:41:36 2011 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c (rb_threadptr_check_signal): only wake up main thread.
+
+ * thread.c (rb_threadptr_execute_interrupts_common): check signal
+ deliverly if it is main thread.
+ fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
+
+ * bootstraptest/test_fork.rb: add a test for above.
+
+ * signal.c (rb_get_next_signal): skip if signal_buff is empty.
+ (check signal_buff.size first)
+
+ * vm_core.h: remove unused variable rb_thread_t::exec_signal.
+
+ * thread.c (rb_thread_check_trap_pending): check
+ rb_signal_buff_size() because rb_thread_t::exec_signal
+ is no longer available.
+
Fri Jul 1 03:28:25 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (Init_class_hierarchy): should name BasicObject
View
20 bootstraptest/test_fork.rb
@@ -47,3 +47,23 @@
:ok
end
}, '[ruby-core:28924]'
+
+assert_equal '[1, 2]', %q{
+ a = []
+ trap(:INT) { a.push(1) }
+ trap(:TERM) { a.push(2) }
+ pid = $$
+ begin
+ fork do
+ sleep 0.5
+ Process.kill(:INT, pid)
+ Process.kill(:TERM, pid)
+ end
+
+ sleep 1
+ a.sort
+ rescue NotImplementedError
+ [1, 2]
+ end
+}, '[ruby-dev:44005] [Ruby 1.9 - Bug #4950]'
+
View
20 signal.c
@@ -566,16 +566,18 @@ rb_get_next_signal(void)
{
int i, sig = 0;
- for (i=1; i<RUBY_NSIG; i++) {
- if (signal_buff.cnt[i] > 0) {
- rb_disable_interrupt();
- {
- ATOMIC_DEC(signal_buff.cnt[i]);
- ATOMIC_DEC(signal_buff.size);
+ if (signal_buff.size != 0) {
+ for (i=1; i<RUBY_NSIG; i++) {
+ if (signal_buff.cnt[i] > 0) {
+ rb_disable_interrupt();
+ {
+ ATOMIC_DEC(signal_buff.cnt[i]);
+ ATOMIC_DEC(signal_buff.size);
+ }
+ rb_enable_interrupt();
+ sig = i;
+ break;
}
- rb_enable_interrupt();
- sig = i;
- break;
}
}
return sig;
View
27 thread.c
@@ -985,7 +985,7 @@ rb_thread_check_ints(void)
int
rb_thread_check_trap_pending(void)
{
- return GET_THREAD()->exec_signal != 0;
+ return rb_signal_buff_size() != 0;
}
/* This function can be called in blocking region. */
@@ -1252,25 +1252,22 @@ thread_s_pass(VALUE klass)
static void
rb_threadptr_execute_interrupts_rec(rb_thread_t *th, int sched_depth)
{
- if (GET_VM()->main_thread == th) {
- while (rb_signal_buff_size() && !th->exec_signal) native_thread_yield();
- }
-
if (th->raised_flag) return;
while (th->interrupt_flag) {
enum rb_thread_status status = th->status;
int timer_interrupt = th->interrupt_flag & 0x01;
int finalizer_interrupt = th->interrupt_flag & 0x04;
+ int sig;
th->status = THREAD_RUNNABLE;
th->interrupt_flag = 0;
/* signal handling */
- if (th->exec_signal) {
- int sig = th->exec_signal;
- th->exec_signal = 0;
- rb_signal_exec(th, sig);
+ if (th == th->vm->main_thread) {
+ while ((sig = rb_get_next_signal()) != 0) {
+ rb_signal_exec(th, sig);
+ }
}
/* exception from another thread */
@@ -2664,18 +2661,10 @@ int rb_get_next_signal(void);
void
rb_threadptr_check_signal(rb_thread_t *mth)
{
- int sig;
-
/* mth must be main_thread */
-
- if (!mth->exec_signal && (sig = rb_get_next_signal()) > 0) {
- enum rb_thread_status prev_status = mth->status;
- thread_debug("main_thread: %s, sig: %d\n",
- thread_status_name(prev_status), sig);
- mth->exec_signal = sig;
- if (mth->status != THREAD_KILLED) mth->status = THREAD_RUNNABLE;
+ if (rb_signal_buff_size() > 0) {
+ /* wakeup main thread */
rb_threadptr_interrupt(mth);
- mth->status = prev_status;
}
}
View
2  version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
View
1  vm_core.h
@@ -420,7 +420,6 @@ typedef struct rb_thread_struct
VALUE errinfo;
VALUE thrown_errinfo;
- int exec_signal;
int interrupt_flag;
rb_thread_lock_t interrupt_lock;
Please sign in to comment.
Something went wrong with that request. Please try again.