X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Furcu-signal.h;h=707eaf8b785f3c44abe6aa8bcba3a5280de6ebdd;hb=be152bdb1af23ed3781fbda231597bad750ee977;hp=385e6f5d5559c5ca6ca7c70858f15425ddd2f732;hpb=4477a87021ffbfbfdb2a2084d05a084171343d36;p=userspace-rcu.git

diff --git a/include/urcu/static/urcu-signal.h b/include/urcu/static/urcu-signal.h
index 385e6f5..707eaf8 100644
--- a/include/urcu/static/urcu-signal.h
+++ b/include/urcu/static/urcu-signal.h
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <urcu/debug.h>
 #include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
@@ -42,8 +43,8 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/debug.h>
 #include <urcu/static/urcu-common.h>
+#include <urcu/static/urcu-signal-nr.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,28 +58,15 @@ extern "C" {
  * This is required to permit relinking with newer versions of the library.
  */
 
-/*
- * The signal number used by the RCU library can be overridden with
- * -DSIGRCU= when compiling the library.
- * Provide backward compatibility for liburcu 0.3.x SIGURCU.
- */
-#ifdef SIGURCU
-#define SIGRCU SIGURCU
-#endif
-
-#ifndef SIGRCU
-#define SIGRCU SIGUSR1
-#endif
-
 extern struct urcu_gp urcu_signal_gp;
 
 extern DECLARE_URCU_TLS(struct urcu_reader, urcu_signal_reader);
 
 /*
  * Helper for _rcu_read_lock().  The format of urcu_signal_gp.ctr (as well as
- * the per-thread rcu_reader.ctr) has the upper bits containing a count of
- * _rcu_read_lock() nesting, and a lower-order bit that contains either zero
- * or URCU_GP_CTR_PHASE.  The cmm_barrier() ensures that the accesses in
+ * the per-thread rcu_reader.ctr) has the lower-order bits containing a count of
+ * _rcu_read_lock() nesting, and a single high-order URCU_BP_GP_CTR_PHASE bit
+ * that contains either zero or one.  The cmm_barrier() ensures that the accesses in
  * _rcu_read_lock() happen before the subsequent read-side critical section.
  */
 static inline void _urcu_signal_read_lock_update(unsigned long tmp)
@@ -104,10 +92,10 @@ static inline void _urcu_signal_read_lock(void)
 {
 	unsigned long tmp;
 
-	urcu_assert(URCU_TLS(urcu_signal_reader).registered);
+	urcu_assert_debug(URCU_TLS(urcu_signal_reader).registered);
 	cmm_barrier();
 	tmp = URCU_TLS(urcu_signal_reader).ctr;
-	urcu_assert((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
+	urcu_assert_debug((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
 	_urcu_signal_read_lock_update(tmp);
 }
 
@@ -131,7 +119,7 @@ static inline void _urcu_signal_read_unlock_update_and_wakeup(unsigned long tmp)
 }
 
 /*
- * Exit an RCU read-side crtical section.  Both this function and its
+ * Exit an RCU read-side critical section.  Both this function and its
  * helper are smaller than 10 lines of code, and are intended to be
  * usable by non-LGPL code, as called out in LGPL.
  */
@@ -139,9 +127,9 @@ static inline void _urcu_signal_read_unlock(void)
 {
 	unsigned long tmp;
 
-	urcu_assert(URCU_TLS(urcu_signal_reader).registered);
+	urcu_assert_debug(URCU_TLS(urcu_signal_reader).registered);
 	tmp = URCU_TLS(urcu_signal_reader).ctr;
-	urcu_assert(tmp & URCU_GP_CTR_NEST_MASK);
+	urcu_assert_debug(tmp & URCU_GP_CTR_NEST_MASK);
 	_urcu_signal_read_unlock_update_and_wakeup(tmp);
 	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }