Changeset ff29f08 for src/libcfa/bits/locks.h

Timestamp:

May 18, 2018, 2:09:21 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

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

src/libcfa/bits/locks.h

@@ -69 +69 @@
         }
 
+
+        #ifdef __CFA_DEBUG__
+                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+        #else
+                #define __cfaabi_dbg_record(x, y)
+        #endif
+
         // Lock the spinlock, return false if already acquired
         static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
@@ -74 +81 @@
                 if( result ) {
                         disable_interrupts();
-                        // __cfaabi_dbg_debug_do(
-                        //      this.prev_name = caller;
-                        //      this.prev_thrd = TL_GET( this_thread );
-                        // )
+                        __cfaabi_dbg_record( this, caller );
                 }
                 return result;
@@ -105 +109 @@
                 }
                 disable_interrupts();
-                // __cfaabi_dbg_debug_do(
-                //      this.prev_name = caller;
-                //      this.prev_thrd = TL_GET( this_thread );
-                // )
+                __cfaabi_dbg_record( this, caller );
         }