Changes in libcfa/src/bits/locks.hfa [3381ed7:2026bb6]

File:

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

libcfa/src/bits/locks.hfa

@@ -60 +60 @@
         }
 
+        extern void yield( unsigned int );
+
         static inline void ?{}( __spinlock_t & this ) {
                 this.lock = 0;
@@ -66 +68 @@
         // 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 );
-                } 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;
@@ -99 +98 @@
                         #endif
                 }
+                disable_interrupts();
                 __cfaabi_dbg_record( this, caller );
         }
 
         static inline void unlock( __spinlock_t & this ) {
+                enable_interrupts_noPoll();
                 __atomic_clear( &this.lock, __ATOMIC_RELEASE );
-                enable_interrupts_noPoll();
         }