Changeset 1a3eab8 for src/libcfa/bits

Timestamp:

Apr 30, 2018, 11:59:07 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct, with_gc

Children:

7b45636

Parents:

c0453ca3 (diff), b9c432f (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 branch 'master' into fix-reference-overloading

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 );
         }