* internal.h: added a declaration of ruby_kill().
* thread.c (ruby_kill): helper function of kill(). * signal.c (rb_f_kill): use ruby_kill() instead of kill(). * signal.c (rb_f_kill): call rb_thread_execute_interrupts() to ensure that make SignalException if sent a signal to myself. [Bug #7951] [ruby-core:52864] * vm_core.h (typedef struct rb_thread_struct): added th->interrupt_cond. * thread.c (rb_threadptr_interrupt_common): added to initialization of th->interrupt_cond. * thread.c (thread_create_core): ditto. * test/ruby/test_signal.rb (TestSignal#test_hup_me): test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b945ad289f
commit
4ea96ece84
19
ChangeLog
19
ChangeLog
@ -1,3 +1,22 @@
|
|||||||
|
Sat Mar 16 01:44:29 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
|
* internal.h: added a declaration of ruby_kill().
|
||||||
|
* thread.c (ruby_kill): helper function of kill().
|
||||||
|
|
||||||
|
* signal.c (rb_f_kill): use ruby_kill() instead of kill().
|
||||||
|
* signal.c (rb_f_kill): call rb_thread_execute_interrupts()
|
||||||
|
to ensure that make SignalException if sent a signal
|
||||||
|
to myself. [Bug #7951] [ruby-core:52864]
|
||||||
|
|
||||||
|
* vm_core.h (typedef struct rb_thread_struct): added
|
||||||
|
th->interrupt_cond.
|
||||||
|
* thread.c (rb_threadptr_interrupt_common): added to
|
||||||
|
initialization of th->interrupt_cond.
|
||||||
|
* thread.c (thread_create_core): ditto.
|
||||||
|
|
||||||
|
* test/ruby/test_signal.rb (TestSignal#test_hup_me): test for
|
||||||
|
the above.
|
||||||
|
|
||||||
Sat Mar 16 00:42:39 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
Sat Mar 16 00:42:39 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
|
* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
|
||||||
|
@ -308,6 +308,7 @@ VALUE rb_thread_shield_destroy(VALUE self);
|
|||||||
void rb_mutex_allow_trap(VALUE self, int val);
|
void rb_mutex_allow_trap(VALUE self, int val);
|
||||||
VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
|
VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
|
||||||
VALUE rb_mutex_owned_p(VALUE self);
|
VALUE rb_mutex_owned_p(VALUE self);
|
||||||
|
void ruby_kill(pid_t pid, int sig);
|
||||||
|
|
||||||
/* thread_pthread.c, thread_win32.c */
|
/* thread_pthread.c, thread_win32.c */
|
||||||
void Init_native_thread(void);
|
void Init_native_thread(void);
|
||||||
|
6
signal.c
6
signal.c
@ -18,6 +18,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "ruby_atomic.h"
|
#include "ruby_atomic.h"
|
||||||
#include "eval_intern.h"
|
#include "eval_intern.h"
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
#if defined(__native_client__) && defined(NACL_NEWLIB)
|
#if defined(__native_client__) && defined(NACL_NEWLIB)
|
||||||
# include "nacl/signal.h"
|
# include "nacl/signal.h"
|
||||||
@ -421,10 +422,11 @@ rb_f_kill(int argc, VALUE *argv)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (i=1; i<argc; i++) {
|
for (i=1; i<argc; i++) {
|
||||||
if (kill(NUM2PIDT(argv[i]), sig) < 0)
|
ruby_kill(NUM2PIDT(argv[i]), sig);
|
||||||
rb_sys_fail(0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
rb_thread_execute_interrupts(rb_thread_current());
|
||||||
|
|
||||||
return INT2FIX(i-1);
|
return INT2FIX(i-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,4 +273,11 @@ EOS
|
|||||||
sleep 0.1
|
sleep 0.1
|
||||||
INPUT
|
INPUT
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_hup_me
|
||||||
|
# [Bug #7951] [ruby-core:52864]
|
||||||
|
assert_raise(SignalException) {
|
||||||
|
Process.kill('HUP',Process.pid)
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
23
thread.c
23
thread.c
@ -337,6 +337,7 @@ rb_threadptr_interrupt_common(rb_thread_t *th, int trap)
|
|||||||
else {
|
else {
|
||||||
/* none */
|
/* none */
|
||||||
}
|
}
|
||||||
|
native_cond_signal(&th->interrupt_cond);
|
||||||
native_mutex_unlock(&th->interrupt_lock);
|
native_mutex_unlock(&th->interrupt_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -624,6 +625,7 @@ thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(ANYARGS))
|
|||||||
th->interrupt_mask = 0;
|
th->interrupt_mask = 0;
|
||||||
|
|
||||||
native_mutex_initialize(&th->interrupt_lock);
|
native_mutex_initialize(&th->interrupt_lock);
|
||||||
|
native_cond_initialize(&th->interrupt_cond, RB_CONDATTR_CLOCK_MONOTONIC);
|
||||||
|
|
||||||
/* kick thread */
|
/* kick thread */
|
||||||
err = native_thread_create(th);
|
err = native_thread_create(th);
|
||||||
@ -5055,6 +5057,8 @@ Init_Thread(void)
|
|||||||
gvl_acquire(th->vm, th);
|
gvl_acquire(th->vm, th);
|
||||||
native_mutex_initialize(&th->vm->thread_destruct_lock);
|
native_mutex_initialize(&th->vm->thread_destruct_lock);
|
||||||
native_mutex_initialize(&th->interrupt_lock);
|
native_mutex_initialize(&th->interrupt_lock);
|
||||||
|
native_cond_initialize(&th->interrupt_cond,
|
||||||
|
RB_CONDATTR_CLOCK_MONOTONIC);
|
||||||
|
|
||||||
th->pending_interrupt_queue = rb_ary_tmp_new(0);
|
th->pending_interrupt_queue = rb_ary_tmp_new(0);
|
||||||
th->pending_interrupt_queue_checked = 0;
|
th->pending_interrupt_queue_checked = 0;
|
||||||
@ -5198,3 +5202,22 @@ rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data)
|
|||||||
|
|
||||||
return rb_ensure(b_proc, data, rb_ary_pop, cur_th->pending_interrupt_mask_stack);
|
return rb_ensure(b_proc, data, rb_ary_pop, cur_th->pending_interrupt_mask_stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ruby_kill(pid_t pid, int sig)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
rb_thread_t *th = GET_THREAD();
|
||||||
|
rb_vm_t *vm = GET_VM();
|
||||||
|
|
||||||
|
if ((th == vm->main_thread) && (pid == getpid())) {
|
||||||
|
native_mutex_lock(&th->interrupt_lock);
|
||||||
|
err = kill(pid, sig);
|
||||||
|
native_cond_wait(&th->interrupt_cond, &th->interrupt_lock);
|
||||||
|
native_mutex_unlock(&th->interrupt_lock);
|
||||||
|
} else {
|
||||||
|
err = kill(pid, sig);
|
||||||
|
}
|
||||||
|
if (err < 0)
|
||||||
|
rb_sys_fail(0);
|
||||||
|
}
|
||||||
|
@ -551,6 +551,7 @@ typedef struct rb_thread_struct {
|
|||||||
rb_atomic_t interrupt_flag;
|
rb_atomic_t interrupt_flag;
|
||||||
unsigned long interrupt_mask;
|
unsigned long interrupt_mask;
|
||||||
rb_thread_lock_t interrupt_lock;
|
rb_thread_lock_t interrupt_lock;
|
||||||
|
rb_thread_cond_t interrupt_cond;
|
||||||
struct rb_unblock_callback unblock;
|
struct rb_unblock_callback unblock;
|
||||||
VALUE locking_mutex;
|
VALUE locking_mutex;
|
||||||
struct rb_mutex_struct *keeping_mutexes;
|
struct rb_mutex_struct *keeping_mutexes;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user