diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-18 12:29:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-18 12:29:21 +0000 |
commit | 22f75c300d1fc5341fb21126adc787f30c310bdf (patch) | |
tree | 800452d6904ff4c3b559970524b9893aa0d479c6 | |
parent | 1998039ea4f867583d7e37ce200a88490707c330 (diff) | |
download | ruby-22f75c300d1fc5341fb21126adc787f30c310bdf.tar.gz |
thread.c: gather common statements
* thread.c (vm_check_ints_blocking): gather common statements at
the end, and prefer LIKELY for Visual C optimization.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sat Jul 18 21:29:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (vm_check_ints_blocking): gather common statements at + the end, and prefer LIKELY for Visual C optimization. + Sat Jul 18 20:44:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_load_internal0): do not raise any exceptions but @@ -168,15 +168,15 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio static inline void vm_check_ints_blocking(rb_thread_t *th) { - if (UNLIKELY(!rb_threadptr_pending_interrupt_empty_p(th))) { + if (LIKELY(rb_threadptr_pending_interrupt_empty_p(th))) { + if (LIKELY(!RUBY_VM_INTERRUPTED_ANY(th))) return; + } + else { th->pending_interrupt_queue_checked = 0; RUBY_VM_SET_INTERRUPT(th); - rb_threadptr_execute_interrupts(th, 1); - } - else if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) { - rb_threadptr_execute_interrupts(th, 1); } + rb_threadptr_execute_interrupts(th, 1); } #if THREAD_DEBUG |