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

thread_pthread.h (native_thread_data): split list_node between ubf and gvl

Browse Source 
Do not waste extra memory for each thread, but make
thread_pthread.c easier-to-follow as a result.

[ruby-core:88475] [Misc #14937]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-08-15 05:31:31 +00:00
parent 7815d7d713
commit 906ad1670a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
thread_pthread.c
View File

@ -146,7 +146,7 @@ designate_timer_thread(rb_vm_t *vm)
{ {
native_thread_data_t *last; native_thread_data_t *last;
last = list_tail(&vm->gvl.waitq, native_thread_data_t, ubf_list); last = list_tail(&vm->gvl.waitq, native_thread_data_t, node.ubf);
if (last) { if (last) {
rb_native_cond_signal(&last->cond.gvlq); rb_native_cond_signal(&last->cond.gvlq);
return TRUE; return TRUE;
@ -160,9 +160,10 @@ gvl_acquire_common(rb_vm_t *vm, rb_thread_t *th)
if (vm->gvl.acquired) { if (vm->gvl.acquired) {
native_thread_data_t *nd = &th->native_thread_data; native_thread_data_t *nd = &th->native_thread_data;
VM_ASSERT(th->unblock.func == 0 && "we reuse ubf_list for GVL waitq"); VM_ASSERT(th->unblock.func == 0 &&
"we must not be in ubf_list and GVL waitq at the same time");
list_add_tail(&vm->gvl.waitq, &nd->ubf_list); list_add_tail(&vm->gvl.waitq, &nd->node.gvl);
do { do {
if (!vm->gvl.timer) { if (!vm->gvl.timer) {
static struct timespec ts; static struct timespec ts;
@ -196,7 +197,7 @@ gvl_acquire_common(rb_vm_t *vm, rb_thread_t *th)
} }
} while (vm->gvl.acquired); } while (vm->gvl.acquired);
list_del_init(&nd->ubf_list); list_del_init(&nd->node.gvl);
if (vm->gvl.need_yield) { if (vm->gvl.need_yield) {
vm->gvl.need_yield = 0; vm->gvl.need_yield = 0;
@ -224,7 +225,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, node.ubf);
if (next) rb_native_cond_signal(&next->cond.gvlq); if (next) rb_native_cond_signal(&next->cond.gvlq);
return next; return next;
@ -542,7 +543,7 @@ native_thread_init(rb_thread_t *th)
native_thread_data_t *nd = &th->native_thread_data; native_thread_data_t *nd = &th->native_thread_data;
#ifdef USE_UBF_LIST #ifdef USE_UBF_LIST
list_node_init(&nd->ubf_list); list_node_init(&nd->node.ubf);
#endif #endif
rb_native_cond_initialize(&nd->cond.gvlq); rb_native_cond_initialize(&nd->cond.gvlq);
if (&nd->cond.gvlq != &nd->cond.intr) if (&nd->cond.gvlq != &nd->cond.intr)
@ -1229,7 +1230,7 @@ static LIST_HEAD(ubf_list_head);
static void static void
register_ubf_list(rb_thread_t *th) register_ubf_list(rb_thread_t *th)
{ {
struct list_node *node = &th->native_thread_data.ubf_list; struct list_node *node = &th->native_thread_data.node.ubf;
if (list_empty((struct list_head*)node)) { if (list_empty((struct list_head*)node)) {
rb_native_mutex_lock(&ubf_list_lock); rb_native_mutex_lock(&ubf_list_lock);
@ -1242,7 +1243,7 @@ register_ubf_list(rb_thread_t *th)
static void static void
unregister_ubf_list(rb_thread_t *th) unregister_ubf_list(rb_thread_t *th)
{ {
struct list_node *node = &th->native_thread_data.ubf_list; struct list_node *node = &th->native_thread_data.node.ubf;
/* we can't allow re-entry into ubf_list_head */ /* we can't allow re-entry into ubf_list_head */
VM_ASSERT(th->unblock.func == 0); VM_ASSERT(th->unblock.func == 0);
@ -1308,7 +1309,7 @@ ubf_wakeup_all_threads(void)
if (!ubf_threads_empty()) { if (!ubf_threads_empty()) {
rb_native_mutex_lock(&ubf_list_lock); rb_native_mutex_lock(&ubf_list_lock);
list_for_each(&ubf_list_head, dat, ubf_list) { list_for_each(&ubf_list_head, dat, node.ubf) {
th = container_of(dat, rb_thread_t, native_thread_data); th = container_of(dat, rb_thread_t, native_thread_data);
ubf_wakeup_thread(th); ubf_wakeup_thread(th);
} }

5
thread_pthread.h
View File

@ -21,7 +21,10 @@
typedef pthread_cond_t rb_nativethread_cond_t; 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; union {
struct list_node ubf;
struct list_node gvl;
} node;
#if defined(__GLIBC__) || defined(__FreeBSD__) #if defined(__GLIBC__) || defined(__FreeBSD__)
union union
#else #else