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

thread_pthread.h (native_thread_data): split condvars on some platforms

Browse Source 
Maybe some platforms have strange condition variable implementations
which have a "memory" of which mutexes they're associated with.

In any case, it makes documentation easier even on GNU/Linux and
FreeBSD.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-07-30 09:54:41 +00:00
parent c307ffe64f
commit a038bf238b
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
thread_pthread.c
View File

@ -100,9 +100,9 @@ gvl_acquire_common(rb_vm_t *vm, rb_thread_t *th)
* become designated timer thread to kick vm->gvl.acquired * become designated timer thread to kick vm->gvl.acquired
* periodically * periodically
*/ */
ts = native_cond_timeout(&nd->sleep_cond, ts); ts = native_cond_timeout(&nd->cond.gvlq, ts);
vm->gvl.timer = th; vm->gvl.timer = th;
native_cond_timedwait(&nd->sleep_cond, &vm->gvl.lock, &ts); native_cond_timedwait(&nd->cond.gvlq, &vm->gvl.lock, &ts);
vm->gvl.timer = 0; vm->gvl.timer = 0;
ubf_wakeup_all_threads(); ubf_wakeup_all_threads();
@ -114,7 +114,7 @@ gvl_acquire_common(rb_vm_t *vm, rb_thread_t *th)
if (vm->gvl.acquired) timer_thread_function(); if (vm->gvl.acquired) timer_thread_function();
} }
else { else {
rb_native_cond_wait(&nd->sleep_cond, &vm->gvl.lock); rb_native_cond_wait(&nd->cond.gvlq, &vm->gvl.lock);
} }
} while (vm->gvl.acquired); } while (vm->gvl.acquired);
@ -135,7 +135,7 @@ gvl_acquire_common(rb_vm_t *vm, rb_thread_t *th)
last = list_tail(&vm->gvl.waitq, native_thread_data_t, ubf_list); last = list_tail(&vm->gvl.waitq, native_thread_data_t, ubf_list);
if (last) { if (last) {
rb_native_cond_signal(&last->sleep_cond); rb_native_cond_signal(&last->cond.gvlq);
} }
else if (!ubf_threads_empty()) { else if (!ubf_threads_empty()) {
rb_thread_wakeup_timer_thread(0); rb_thread_wakeup_timer_thread(0);
@ -157,7 +157,7 @@ gvl_release_common(rb_vm_t *vm)
native_thread_data_t *next; native_thread_data_t *next;
vm->gvl.acquired = 0; vm->gvl.acquired = 0;
next = list_top(&vm->gvl.waitq, native_thread_data_t, ubf_list); next = list_top(&vm->gvl.waitq, native_thread_data_t, ubf_list);
if (next) rb_native_cond_signal(&next->sleep_cond); if (next) rb_native_cond_signal(&next->cond.gvlq);
return next; return next;
} }
@ -472,7 +472,9 @@ native_thread_init(rb_thread_t *th)
#ifdef USE_UBF_LIST #ifdef USE_UBF_LIST
list_node_init(&nd->ubf_list); list_node_init(&nd->ubf_list);
#endif #endif
rb_native_cond_initialize(&nd->sleep_cond); rb_native_cond_initialize(&nd->cond.gvlq);
if (&nd->cond.gvlq != &nd->cond.intr)
rb_native_cond_initialize(&nd->cond.intr);
ruby_thread_set_native(th); ruby_thread_set_native(th);
} }
@ -483,7 +485,11 @@ native_thread_init(rb_thread_t *th)
static void static void
native_thread_destroy(rb_thread_t *th) native_thread_destroy(rb_thread_t *th)
{ {
rb_native_cond_destroy(&th->native_thread_data.sleep_cond); native_thread_data_t *nd = &th->native_thread_data;
rb_native_cond_destroy(&nd->cond.gvlq);
if (&nd->cond.gvlq != &nd->cond.intr)
rb_native_cond_destroy(&nd->cond.intr);
/* /*
* prevent false positive from ruby_thread_has_gvl_p if that * prevent false positive from ruby_thread_has_gvl_p if that
@ -1092,7 +1098,7 @@ ubf_pthread_cond_signal(void *ptr)
{ {
rb_thread_t *th = (rb_thread_t *)ptr; rb_thread_t *th = (rb_thread_t *)ptr;
thread_debug("ubf_pthread_cond_signal (%p)\n", (void *)th); thread_debug("ubf_pthread_cond_signal (%p)\n", (void *)th);
rb_native_cond_signal(&th->native_thread_data.sleep_cond); rb_native_cond_signal(&th->native_thread_data.cond.intr);
} }
static void static void
@ -1100,7 +1106,7 @@ native_cond_sleep(rb_thread_t *th, struct timespec *timeout_rel)
{ {
struct timespec timeout; struct timespec timeout;
rb_nativethread_lock_t *lock = &th->interrupt_lock; rb_nativethread_lock_t *lock = &th->interrupt_lock;
rb_nativethread_cond_t *cond = &th->native_thread_data.sleep_cond; rb_nativethread_cond_t *cond = &th->native_thread_data.cond.intr;
if (timeout_rel) { if (timeout_rel) {
/* Solaris cond_timedwait() return EINVAL if an argument is greater than /* Solaris cond_timedwait() return EINVAL if an argument is greater than
@ -1205,7 +1211,7 @@ ubf_select(void *ptr)
last = list_tail(&vm->gvl.waitq, native_thread_data_t, ubf_list); last = list_tail(&vm->gvl.waitq, native_thread_data_t, ubf_list);
if (last) { if (last) {
rb_native_cond_signal(&last->sleep_cond); rb_native_cond_signal(&last->cond.gvlq);
} }
else { else {
rb_thread_wakeup_timer_thread(0); rb_thread_wakeup_timer_thread(0);
@ -1565,7 +1571,7 @@ rb_sleep_cond_get(const rb_execution_context_t *ec)
{ {
rb_thread_t *th = rb_ec_thread_ptr(ec); rb_thread_t *th = rb_ec_thread_ptr(ec);
return &th->native_thread_data.sleep_cond; return &th->native_thread_data.cond.intr;
} }
void void

14
thread_pthread.h
View File

@ -22,7 +22,19 @@ typedef pthread_cond_t rb_nativethread_cond_t;
typedef struct native_thread_data_struct { typedef struct native_thread_data_struct {
struct list_node ubf_list; struct list_node ubf_list;
rb_nativethread_cond_t sleep_cond; #if defined(__GLIBC__) || defined(__FreeBSD__)
union
#else
/*
* assume the platform condvars are badly implemented and have a
* "memory" of which mutex they're associated with
*/
struct
#endif
{
rb_nativethread_cond_t intr; /* th->interrupt_lock */
rb_nativethread_cond_t gvlq; /* vm->gvl.lock */
} cond;
} native_thread_data_t; } native_thread_data_t;
#undef except #undef except