nobu	2012-07-06 12:24:41 +0900 (Fri, 06 Jul 2012)

  New Revision: 36329

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

  Log:
    ThreadShield: check waiting count
    
    * thread.c (rb_thread_shield_waiting_{inc,dec}): check waiting count.

  Modified files:
    trunk/thread.c

Index: thread.c
===================================================================
--- thread.c	(revision 36328)
+++ thread.c	(revision 36329)
@@ -3723,19 +3723,28 @@
 #define THREAD_SHIELD_WAITING_MASK (FL_USER0|FL_USER1|FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6|FL_USER7|FL_USER8|FL_USER9|FL_USER10|FL_USER11|FL_USER12|FL_USER13|FL_USER14|FL_USER15|FL_USER16|FL_USER17|FL_USER18|FL_USER19)
 #define THREAD_SHIELD_WAITING_SHIFT (FL_USHIFT)
 #define rb_thread_shield_waiting(b) (int)((RBASIC(b)->flags&THREAD_SHIELD_WAITING_MASK)>>THREAD_SHIELD_WAITING_SHIFT)
-#define rb_thread_shield_waiting_inc(b) do { \
-    int w = rb_thread_shield_waiting(b); \
-    w++; \
-    RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK; \
-    RBASIC(b)->flags |= ((VALUE)w << THREAD_SHIELD_WAITING_SHIFT);	\
-} while (0)
-#define rb_thread_shield_waiting_dec(b) do { \
-    int w = rb_thread_shield_waiting(b); \
-    w--; \
-    RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK; \
-    RBASIC(b)->flags |= ((VALUE)w << THREAD_SHIELD_WAITING_SHIFT); \
-} while (0)
 
+static inline void
+rb_thread_shield_waiting_inc(VALUE b)
+{
+    int w = rb_thread_shield_waiting(b);
+    w++;
+    if (w > (THREAD_SHIELD_WAITING_MASK>>THREAD_SHIELD_WAITING_SHIFT))
+	rb_raise(rb_eRuntimeError, "waiting count overflow");
+    RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK;
+    RBASIC(b)->flags |= ((VALUE)w << THREAD_SHIELD_WAITING_SHIFT);
+}
+
+static inline void
+rb_thread_shield_waiting_dec(VALUE b)
+{
+    int w = rb_thread_shield_waiting(b);
+    if (!w) rb_raise(rb_eRuntimeError, "waiting count underflow");
+    w--;
+    RBASIC(b)->flags &= ~THREAD_SHIELD_WAITING_MASK;
+    RBASIC(b)->flags |= ((VALUE)w << THREAD_SHIELD_WAITING_SHIFT);
+}
+
 VALUE
 rb_thread_shield_new(void)
 {

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