summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 16:42:01 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 16:42:01 (GMT)
commit10c516dda7d2984396c114b3c5190f460d0055fa (patch)
treeb62ce1917645356f9b749bcc4d306db189999975
parentef7fdbd71ea0d9b98ac0f70a55077f71c080d6c6 (diff)
add tag v1_8_6_227v1_8_6_227
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_6_227@17446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/eval.c b/eval.c
index 951676c..da2eb5a 100644
--- a/eval.c
+++ b/eval.c
@@ -11808,18 +11808,13 @@ catch_timer(sig)
/* cause EINTR */
}
-static int time_thread_alive_p = 0;
static pthread_t time_thread;
static void*
thread_timer(dummy)
void *dummy;
{
-#ifdef _THREAD_SAFE
#define test_cancel() pthread_testcancel()
-#else
-#define test_cancel() /* void */
-#endif
sigset_t all_signals;
@@ -11865,21 +11860,18 @@ rb_thread_stop_timer()
void
rb_child_atfork()
{
- time_thread_alive_p = 0;
+ thread_init = 0;
}
void
rb_thread_cancel_timer()
{
-#ifdef _THREAD_SAFE
- if( time_thread_alive_p )
+ if (thread_init)
{
- pthread_cancel( time_thread );
- pthread_join( time_thread, NULL );
- time_thread_alive_p = 0;
+ pthread_cancel(time_thread);
+ pthread_join(time_thread, NULL);
}
thread_init = 0;
-#endif
}
#elif defined(HAVE_SETITIMER)
static void
@@ -11923,7 +11915,6 @@ void
rb_thread_cancel_timer()
{
}
-
#else /* !(_THREAD_SAFE || HAVE_SETITIMER) */
int rb_thread_tick = THREAD_TICK;
@@ -11961,7 +11952,6 @@ rb_thread_start_0(fn, arg, th)
#ifdef _THREAD_SAFE
pthread_create(&time_thread, 0, thread_timer, 0);
- time_thread_alive_p = 1;
pthread_atfork(0, 0, rb_child_atfork);
#else
rb_thread_start_timer();