1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread_pthread.c: timer thread flag

Browse Source 
* thread_pthread.c (timer_thread): add a flag to tell timer thread
  is created, since 0 may be a valid value as pthread_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-11 08:37:44 +00:00
parent a678de48c5
commit e2b10b6d13
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thread.c
View File

@ -3725,7 +3725,7 @@ timer_thread_function(void *arg)
void void
rb_thread_stop_timer_thread(int close_anyway) rb_thread_stop_timer_thread(int close_anyway)
{ {
if (timer_thread_id && native_stop_timer_thread(close_anyway)) { if (TIMER_THREAD_CREATED_P() && native_stop_timer_thread(close_anyway)) {
native_reset_timer_thread(); native_reset_timer_thread();
} }
} }

21
thread_pthread.c
View File

@ -45,7 +45,11 @@ static void native_cond_wait(rb_nativethread_cond_t *cond, pthread_mutex_t *mute
static void native_cond_initialize(rb_nativethread_cond_t *cond, int flags); static void native_cond_initialize(rb_nativethread_cond_t *cond, int flags);
static void native_cond_destroy(rb_nativethread_cond_t *cond); static void native_cond_destroy(rb_nativethread_cond_t *cond);
static void rb_thread_wakeup_timer_thread_low(void); static void rb_thread_wakeup_timer_thread_low(void);
static pthread_t timer_thread_id; static struct {
pthread_t id;
int created;
} timer_thread;
#define TIMER_THREAD_CREATED_P() (timer_thread.created != 0)
#define RB_CONDATTR_CLOCK_MONOTONIC 1 #define RB_CONDATTR_CLOCK_MONOTONIC 1
@ -1172,7 +1176,7 @@ ubf_select(void *ptr)
* In the other hands, we shouldn't call rb_thread_wakeup_timer_thread() * In the other hands, we shouldn't call rb_thread_wakeup_timer_thread()
* if running on timer thread because it may make endless wakeups. * if running on timer thread because it may make endless wakeups.
*/ */
if (!pthread_equal(pthread_self(), timer_thread_id)) if (!pthread_equal(pthread_self(), timer_thread.id))
rb_thread_wakeup_timer_thread(); rb_thread_wakeup_timer_thread();
ubf_select_each(th); ubf_select_each(th);
} }
@ -1477,7 +1481,7 @@ thread_timer(void *p)
static void static void
rb_thread_create_timer_thread(void) rb_thread_create_timer_thread(void)
{ {
if (!timer_thread_id) { if (!timer_thread.created) {
int err; int err;
#ifdef HAVE_PTHREAD_ATTR_INIT #ifdef HAVE_PTHREAD_ATTR_INIT
pthread_attr_t attr; pthread_attr_t attr;
@ -1507,18 +1511,19 @@ rb_thread_create_timer_thread(void)
#endif /* USE_SLEEPY_TIMER_THREAD */ #endif /* USE_SLEEPY_TIMER_THREAD */
/* create timer thread */ /* create timer thread */
if (timer_thread_id) { if (timer_thread.created) {
rb_bug("rb_thread_create_timer_thread: Timer thread was already created\n"); rb_bug("rb_thread_create_timer_thread: Timer thread was already created\n");
} }
#ifdef HAVE_PTHREAD_ATTR_INIT #ifdef HAVE_PTHREAD_ATTR_INIT
err = pthread_create(&timer_thread_id, &attr, thread_timer, &GET_VM()->gvl); err = pthread_create(&timer_thread.id, &attr, thread_timer, &GET_VM()->gvl);
#else #else
err = pthread_create(&timer_thread_id, NULL, thread_timer, &GET_VM()->gvl); err = pthread_create(&timer_thread.id, NULL, thread_timer, &GET_VM()->gvl);
#endif #endif
if (err != 0) { if (err != 0) {
fprintf(stderr, "[FATAL] Failed to create timer thread: %s\n", strerror(err)); fprintf(stderr, "[FATAL] Failed to create timer thread: %s\n", strerror(err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
timer_thread.created = 1;
#ifdef HAVE_PTHREAD_ATTR_INIT #ifdef HAVE_PTHREAD_ATTR_INIT
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
#endif #endif
@ -1535,9 +1540,9 @@ native_stop_timer_thread(int close_anyway)
if (stopped) { if (stopped) {
/* join */ /* join */
rb_thread_wakeup_timer_thread(); rb_thread_wakeup_timer_thread();
native_thread_join(timer_thread_id); native_thread_join(timer_thread.id);
if (TT_DEBUG) fprintf(stderr, "joined timer thread\n"); if (TT_DEBUG) fprintf(stderr, "joined timer thread\n");
timer_thread_id = 0; timer_thread.created = 0;
/* close communication pipe */ /* close communication pipe */
if (close_anyway) { if (close_anyway) {

33
thread_win32.c
View File

@ -692,14 +692,17 @@ ubf_handle(void *ptr)
w32_set_event(th->native_thread_data.interrupt_event); w32_set_event(th->native_thread_data.interrupt_event);
} }
static HANDLE timer_thread_id = 0; static struct {
static HANDLE timer_thread_lock; HANDLE id;
HANDLE lock;
} timer_thread;
#define TIMER_THREAD_CREATED_P() (timer_thread.id != 0)
static unsigned long __stdcall static unsigned long __stdcall
timer_thread_func(void *dummy) timer_thread_func(void *dummy)
{ {
thread_debug("timer_thread\n"); thread_debug("timer_thread\n");
while (WaitForSingleObject(timer_thread_lock, TIME_QUANTUM_USEC/1000) == while (WaitForSingleObject(timer_thread.lock, TIME_QUANTUM_USEC/1000) ==
WAIT_TIMEOUT) { WAIT_TIMEOUT) {
timer_thread_function(dummy); timer_thread_function(dummy);
} }
@ -716,13 +719,13 @@ rb_thread_wakeup_timer_thread(void)
static void static void
rb_thread_create_timer_thread(void) rb_thread_create_timer_thread(void)
{ {
if (timer_thread_id == 0) { if (timer_thread.id == 0) {
if (!timer_thread_lock) { if (!timer_thread.lock) {
timer_thread_lock = CreateEvent(0, TRUE, FALSE, 0); timer_thread.lock = CreateEvent(0, TRUE, FALSE, 0);
} }
timer_thread_id = w32_create_thread(1024 + (THREAD_DEBUG ? BUFSIZ : 0), timer_thread.id = w32_create_thread(1024 + (THREAD_DEBUG ? BUFSIZ : 0),
timer_thread_func, 0); timer_thread_func, 0);
w32_resume_thread(timer_thread_id); w32_resume_thread(timer_thread.id);
} }
} }
@ -731,10 +734,10 @@ native_stop_timer_thread(int close_anyway)
{ {
int stopped = --system_working <= 0; int stopped = --system_working <= 0;
if (stopped) { if (stopped) {
SetEvent(timer_thread_lock); SetEvent(timer_thread.lock);
native_thread_join(timer_thread_id); native_thread_join(timer_thread.id);
CloseHandle(timer_thread_lock); CloseHandle(timer_thread.lock);
timer_thread_lock = 0; timer_thread.lock = 0;
} }
return stopped; return stopped;
} }
@ -742,9 +745,9 @@ native_stop_timer_thread(int close_anyway)
static void static void
native_reset_timer_thread(void) native_reset_timer_thread(void)
{ {
if (timer_thread_id) { if (timer_thread.id) {
CloseHandle(timer_thread_id); CloseHandle(timer_thread.id);
timer_thread_id = 0; timer_thread.id = 0;
} }
} }