Changeset eb5962a for libcfa/src/bits/locks.hfa

Timestamp:

Jun 21, 2022, 1:39:24 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b62d1d6

Parents:

1df492a (diff), 1dbbef6 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/bits/locks.hfa

@@ -26 +26 @@
         // Wrap in struct to prevent false sharing with debug info
         volatile bool lock;
-        #ifdef __CFA_DEBUG__
-                // previous function to acquire the lock
-                const char * prev_name;
-                // previous thread to acquire the lock
-                void* prev_thrd;
-                // keep track of number of times we had to spin, just in case the number is unexpectedly huge
-                size_t spin_count;
-        #endif
 };
 
@@ -40 +32 @@
                 extern void disable_interrupts() OPTIONAL_THREAD;
                 extern void enable_interrupts( bool poll = true ) OPTIONAL_THREAD;
-
-                #ifdef __CFA_DEBUG__
-                        void __cfaabi_dbg_record_lock(__spinlock_t & this, const char prev_name[]);
-                #else
-                        #define __cfaabi_dbg_record_lock(x, y)
-                #endif
+                #define __cfaabi_dbg_record_lock(x, y)
         }
 
         static inline void ?{}( __spinlock_t & this ) {
                 this.lock = 0;
-                #ifdef __CFA_DEBUG__
-                        this.spin_count = 0;
-                #endif
         }
 
@@ -77 +61 @@
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0) ) break;
-                        #ifdef __CFA_DEBUG__
-                                this.spin_count++;
-                        #endif
                         #ifndef NOEXPBACK
                                 // exponential spin