Changeset 1ab773e0

Timestamp:

Dec 14, 2022, 2:25:52 PM (16 months ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

26544f9, 46da46b, 93e0603

Parents:

441a6a7

Message:

more lock cleanup

File:

• libcfa/src/concurrency/locks.hfa (modified) (6 diffs)

libcfa/src/concurrency/locks.hfa

@@ -38 +38 @@
 #include <unistd.h>
 
+// undef to make a number of the locks not reacquire upon waking from a condlock
+#define REACQ 1
+
 //-----------------------------------------------------------------------------
 // Semaphore
@@ -353 +356 @@
         // flag showing if lock is held
         bool held:1;
-
-        #ifdef __CFA_DEBUG__
-        // for deadlock detection
-        struct thread$ * owner;
-        #endif
 };
 
@@ -372 +370 @@
 static inline void lock(fast_block_lock & this) with(this) {
         lock( lock __cfaabi_dbg_ctx2 );
-
-        #ifdef __CFA_DEBUG__
-        assert(!(held && owner == active_thread()));
-        #endif
         if ( held ) {
                 insert_last( blocked_threads, *active_thread() );
@@ -383 +377 @@
         }
         held = true;
-        #ifdef __CFA_DEBUG__
-        owner = active_thread();
-        #endif
         unlock( lock );
 }
@@ -394 +385 @@
         thread$ * t = &try_pop_front( blocked_threads );
         held = ( t ? true : false );
-        #ifdef __CFA_DEBUG__
-        owner = ( t ? t : 0p );
-        #endif
         unpark( t );
         unlock( lock );
@@ -662 +650 @@
         // if internal fast_block_lock is not held
         held = true;
-        #ifdef __CFA_DEBUG__
-        owner = t;
-        #endif
         unlock( lock );