archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* thread.c (rb_thread_stop_timer_thread): terminates timer thread

Browse source 
immediately.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-11-06 13:21:26 +00:00
parent 514626ad8d
commit 5732566f4d
4 changed files with 56 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
thread.c
View file

@ -71,10 +71,10 @@ static void rb_check_deadlock(rb_vm_t *vm);
void rb_signal_exec(rb_thread_t *th, int sig);
void rb_disable_interrupt(void);
void rb_thread_stop_timer_thread(void);
static const VALUE eKillSignal = INT2FIX(0);
static const VALUE eTerminateSignal = INT2FIX(1);
static volatile int system_working = 1;
inline static void
st_delete_wrap(st_table *table, st_data_t key)
@ -318,7 +318,7 @@ rb_thread_terminate_all(void)
}
POP_TAG();
}
system_working = 0;
rb_thread_stop_timer_thread();
}
static void
@ -2322,7 +2322,7 @@ int rb_get_next_signal(void);
static void
timer_thread_function(void *arg)
{
rb_vm_t *vm = arg; /* TODO: fix me for Multi-VM */
rb_vm_t *vm = GET_VM(); /* TODO: fix me for Multi-VM */
int sig;
/* for time slice */
@ -2356,7 +2356,7 @@ void
rb_thread_stop_timer_thread(void)
{
if (timer_thread_id) {
system_working = 0;
native_stop_timer_thread();
native_thread_join(timer_thread_id);
timer_thread_id = 0;
}