Ticket #11408: 11408_sig_on_macro

# HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1333960909 -7200
# Node ID b66fce9af3c17e52975f7a7d2fbae96a3af2da7c
# Parent  8b937382f6df038b680e6a91fdcd0f830ecbd0ef
Make sig_on() into a macro

diff --git a/c_lib/include/interrupt.h b/c_lib/include/interrupt.h
--- a/c_lib/include/interrupt.h
+++ b/c_lib/include/interrupt.h
@@ -170,7 +170,46 @@
  * a short-circuiting operator (the second argument is only evaluated
  * if the first returns 0).
  */
-#define _sig_on_(message) ( unlikely(_sig_on_prejmp(message, __FILE__, __LINE__)) || _sig_on_postjmp(sigsetjmp(_signals.env,0)) )
+//#define _sig_on_(message) ( unlikely(_sig_on_prejmp(message, __FILE__, __LINE__)) || _sig_on_postjmp(sigsetjmp(_signals.env,0)) )
+#define _sig_on_(message) \
+( \
+    /* Set message if called as sig_str() */ \
+    _signals.s = message, \
+    \
+    (ENABLE_DEBUG_INTERRUPT == 0) ? 0 : \
+    ( \
+        fprintf(stderr, "sig_on (counter = %i) at %s:%i\n", _signals.sig_on_count+1, __FILE__, __LINE__), \
+        fflush(stderr) \
+    ), \
+    \
+    _signals.sig_on_count > 0 ? \
+        /* If we are already inside sig_on, simply increase the reference counter */ \
+        (++_signals.sig_on_count, 1) \
+    : \
+    ( \
+        /* At this point, _signals.sig_on_count == 0 */ \
+        unlikely(sigsetjmp(_signals.env, 0) > 0) ? \
+        ( \
+            /* An exception occured */ \
+            _sig_on_recover(), \
+            0 \
+        ) \
+        : \
+        ( \
+            /* When we are here, it's either the original sig_on() call or we \
+             * got here after sig_retry(). */ \
+            _signals.sig_on_count = 1, \
+            \
+            /* Check whether we received an interrupt before this point. \
+             * _signals.interrupt_received can only be set by the interrupt \
+             * handler if _signals.sig_on_count is zero.  Because of that and \
+             * because _signals.sig_on_count and _signals.interrupt_received are \
+             * volatile, we can safely evaluate _signals.interrupt_received here \
+             * without race conditions. */ \
+            unlikely(_signals.interrupt_received) ? _sig_on_interrupt_received() : 1 \
+        ) \
+    ) \
+)
 
 /* This will be called during _sig_on_postjmp() when a SIGINT was
  * received *before* the call to sig_on().