From 7643e4604bc5a661d10c7940b948ae6c66694f09 Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 19 Nov 2012 11:04:39 +0000 Subject: * thread.c (rb_threadptr_execute_interrupts) removed. * thread.c (rb_threadptr_execute_interrupts_common) renamed to rb_threadptr_execute_interrupts. I.e. unified rb_threadptr_execute_interrupts and rb_threadptr_execute_interrupts_common. * thread.c (rb_thread_schedule, rb_thread_execute_interrupts) s/_common//. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ thread.c | 16 ++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 039f1be95e..e53c1214c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 20 09:56:15 2012 KOSAKI Motohiro + + * thread.c (rb_threadptr_execute_interrupts) removed. + * thread.c (rb_threadptr_execute_interrupts_common) renamed to + rb_threadptr_execute_interrupts. I.e. unified + rb_threadptr_execute_interrupts and rb_threadptr_execute_interrupts_common. + * thread.c (rb_thread_schedule, rb_thread_execute_interrupts) s/_common//. + Tue Nov 20 09:48:34 2012 KOSAKI Motohiro * signal.c (rb_get_next_signal): removed pointless signal diff --git a/thread.c b/thread.c index bf5cb9be61..1a37b2873a 100644 --- a/thread.c +++ b/thread.c @@ -1012,8 +1012,6 @@ rb_thread_sleep(int sec) rb_thread_wait_for(rb_time_timeval(INT2FIX(sec))); } -static void rb_threadptr_execute_interrupts_common(rb_thread_t *, int blocking); - static void rb_thread_schedule_limits(unsigned long limits_us) { @@ -1039,7 +1037,7 @@ rb_thread_schedule(void) rb_thread_schedule_limits(0); if (UNLIKELY(GET_THREAD()->interrupt_flag)) { - rb_threadptr_execute_interrupts_common(GET_THREAD(), 0); + rb_threadptr_execute_interrupts(GET_THREAD(), 0); } } @@ -1696,8 +1694,8 @@ rb_threadptr_to_kill(rb_thread_t *th) TH_JUMP_TAG(th, TAG_FATAL); } -static void -rb_threadptr_execute_interrupts_common(rb_thread_t *th, int blocking_timing) +void +rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) { rb_atomic_t interrupt; @@ -1758,18 +1756,12 @@ rb_threadptr_execute_interrupts_common(rb_thread_t *th, int blocking_timing) } } -void -rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) -{ - rb_threadptr_execute_interrupts_common(th, blocking_timing); -} - void rb_thread_execute_interrupts(VALUE thval) { rb_thread_t *th; GetThreadPtr(thval, th); - rb_threadptr_execute_interrupts_common(th, 1); + rb_threadptr_execute_interrupts(th, 1); } static void -- cgit v1.2.3