Changeset 7030dab for libcfa/src/bits/locks.hfa

Timestamp:

Apr 6, 2020, 4:46:28 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

File:

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

libcfa/src/bits/locks.hfa

@@ -10 +10 @@
 // Created On       : Tue Oct 31 15:14:38 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 11 15:42:24 2018
-// Update Count     : 10
+// Last Modified On : Tue Feb  4 13:03:19 2020
+// Update Count     : 11
 //
 
@@ -54 +54 @@
 
                 #ifdef __CFA_DEBUG__
-                        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+                        void __cfaabi_dbg_record_lock(__spinlock_t & this, const char prev_name[]);
                 #else
-                        #define __cfaabi_dbg_record(x, y)
+                        #define __cfaabi_dbg_record_lock(x, y)
                 #endif
         }
-
-        extern void yield( unsigned int );
 
         static inline void ?{}( __spinlock_t & this ) {
@@ -68 +66 @@
         // Lock the spinlock, return false if already acquired
         static inline bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
+                disable_interrupts();
                 bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
                 if( result ) {
-                        disable_interrupts();
-                        __cfaabi_dbg_record( this, caller );
+                        __cfaabi_dbg_record_lock( this, caller );
+                } else {
+                        enable_interrupts_noPoll();
                 }
                 return result;
@@ -83 +83 @@
                 #endif
 
+                disable_interrupts();
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0) ) break;
@@ -98 +99 @@
                         #endif
                 }
-                disable_interrupts();
-                __cfaabi_dbg_record( this, caller );
+                __cfaabi_dbg_record_lock( this, caller );
         }
 
         static inline void unlock( __spinlock_t & this ) {
+                __atomic_clear( &this.lock, __ATOMIC_RELEASE );
                 enable_interrupts_noPoll();
-                __atomic_clear( &this.lock, __ATOMIC_RELEASE );
         }
 
@@ -139 +139 @@
         }
 
-        static inline void post(__bin_sem_t & this) with( this ) {
-                verify(__cfaabi_dbg_in_kernel());
-
+        static inline bool post(__bin_sem_t & this) with( this ) {
                 pthread_mutex_lock(&lock);
                         bool needs_signal = !signaled;
@@ -147 +145 @@
                 pthread_mutex_unlock(&lock);
 
-                if (needs_signal)
-                        pthread_cond_signal(&cond);
+                if (needs_signal) pthread_cond_signal(&cond);
+
+                return needs_signal;
         }
 #endif