kosaki	2012-11-19 20:04:39 +0900 (Mon, 19 Nov 2012)

  New Revision: 37728

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37728

  Log:
    * 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//.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37727)
+++ ChangeLog	(revision 37728)
@@ -1,3 +1,11 @@
+Tue Nov 20 09:56:15 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* 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  <kosaki.motohiro@g...>
 
 	* signal.c (rb_get_next_signal): removed pointless signal
Index: thread.c
===================================================================
--- thread.c	(revision 37727)
+++ thread.c	(revision 37728)
@@ -1012,8 +1012,6 @@
     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_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 @@
     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;
 
@@ -1759,17 +1757,11 @@
 }
 
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/