Changes in src/libcfa/bits/locks.h [b158d8f:2e9aed4]

File:

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

src/libcfa/bits/locks.h

@@ -58 +58 @@
 
 #ifdef __cforall
+        extern "C" {
+                extern void disable_interrupts();
+                extern void enable_interrupts_noPoll();
+        }
+
         extern void yield( unsigned int );
         extern thread_local struct thread_desc *    volatile this_thread;
+        extern thread_local struct processor *      volatile this_processor;
 
         static inline void ?{}( __spinlock_t & this ) {
@@ -68 +74 @@
         static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 _Bool result = __lock_test_and_test_and_set( this.lock );
-                __cfaabi_dbg_debug_do(
-                        if( result ) {
+                if( result ) {
+                        disable_interrupts();
+                        __cfaabi_dbg_debug_do(
                                 this.prev_name = caller;
                                 this.prev_thrd = this_thread;
-                        }
-                )
+                        )
+                }
                 return result;
         }
@@ -99 +106 @@
                         #endif
                 }
+                disable_interrupts();
                 __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
@@ -105 +113 @@
         }
 
-        // Lock the spinlock, spin if already acquired
-        static inline void lock_yield( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
-                for ( unsigned int i = 1;; i += 1 ) {
-                        if ( __lock_test_and_test_and_set( this.lock ) ) break;
-                        yield( i );
-                }
-                __cfaabi_dbg_debug_do(
-                        this.prev_name = caller;
-                        this.prev_thrd = this_thread;
-                )
-        }
+        // // Lock the spinlock, yield if already acquired
+        // static inline void lock_yield( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
+        //      for ( unsigned int i = 1;; i += 1 ) {
+        //              if ( __lock_test_and_test_and_set( this.lock ) ) break;
+        //              yield( i );
+        //      }
+        //      disable_interrupts();
+        //      __cfaabi_dbg_debug_do(
+        //              this.prev_name = caller;
+        //              this.prev_thrd = this_thread;
+        //      )
+        // }
 
         static inline void unlock( __spinlock_t & this ) {
+                enable_interrupts_noPoll();
                 __lock_release( this.lock );
         }