diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | insns.def | 37 | ||||
-rw-r--r-- | vm_core.h | 1 |
3 files changed, 27 insertions, 20 deletions
@@ -1,3 +1,12 @@ +Fri Sep 12 04:24:03 2014 Eric Wong <e@80x24.org> + + * insns.def (once): define and use fake RUNNING_THREAD_ONCE_DONE + pointer to indicate is->once.running_thread is done. + + * vm_core.h (iseq_inline_storage_entry): remove done field, + allowing the union to be reduced from 24=>16 bytes on 64-bit + [Feature #10187] + Thu Sep 11 20:10:00 2014 Koichi Sasada <ko1@atdot.net> * vm.c (rb_thread_mark): use rb_gc_mark_values() to mark VM stack. @@ -1239,28 +1239,27 @@ once { union iseq_inline_storage_entry *is = (union iseq_inline_storage_entry *)ic; +#define RUNNING_THREAD_ONCE_DONE ((rb_thread_t *)(0x1)) retry: - if (is->once.done == Qfalse) { - if (is->once.running_thread == NULL) { - is->once.running_thread = th; - val = is->once.value = rb_ensure(vm_once_exec, (VALUE)iseq, vm_once_clear, (VALUE)is); - /* is->once.running_thread is cleared by vm_once_clear() */ - is->once.done = Qtrue; - rb_iseq_add_mark_object(GET_ISEQ(), val); - } - else if (is->once.running_thread == th) { - /* recursive once */ - val = vm_once_exec((VALUE)iseq); - } - else { - /* waiting for finish */ - RUBY_VM_CHECK_INTS(th); - rb_thread_schedule(); - goto retry; - } + if (is->once.running_thread == RUNNING_THREAD_ONCE_DONE) { + val = is->once.value; + } + else if (is->once.running_thread == NULL) { + is->once.running_thread = th; + val = is->once.value = rb_ensure(vm_once_exec, (VALUE)iseq, vm_once_clear, (VALUE)is); + /* is->once.running_thread is cleared by vm_once_clear() */ + is->once.running_thread = RUNNING_THREAD_ONCE_DONE; /* success */ + rb_iseq_add_mark_object(GET_ISEQ(), val); + } + else if (is->once.running_thread == th) { + /* recursive once */ + val = vm_once_exec((VALUE)iseq); } else { - val = is->once.value; + /* waiting for finish */ + RUBY_VM_CHECK_INTS(th); + rb_thread_schedule(); + goto retry; } } @@ -127,7 +127,6 @@ union iseq_inline_storage_entry { struct { struct rb_thread_struct *running_thread; VALUE value; - VALUE done; } once; struct iseq_inline_cache_entry cache; }; |