Changes in src/libcfa/bits/locks.h [0cf5b79:875a72f]

File:

• src/libcfa/bits/locks.h (modified) (5 diffs)

src/libcfa/bits/locks.h

@@ -16 +16 @@
 #pragma once
 
+#include "bits/debug.h"
 #include "bits/defs.h"
 
@@ -65 +66 @@
 
         // Lock the spinlock, return false if already acquired
-        static inline _Bool try_lock  ( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 _Bool result = __lock_test_and_test_and_set( this.lock );
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         if( result ) {
                                 this.prev_name = caller;
@@ -77 +78 @@
 
         // Lock the spinlock, spin if already acquired
-        static inline void lock( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline void lock( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 #ifndef NOEXPBACK
                         enum { SPIN_START = 4, SPIN_END = 64 * 1024, };
@@ -98 +99 @@
                         #endif
                 }
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
                         this.prev_thrd = this_thread;
@@ -105 +106 @@
 
         // Lock the spinlock, spin if already acquired
-        static inline void lock_yield( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline void lock_yield( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( __lock_test_and_test_and_set( this.lock ) ) break;
                         yield( i );
                 }
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
                         this.prev_thrd = this_thread;