Changeset 2e9aed4 for src/libcfa/bits/locks.h

Timestamp:

Jan 30, 2018, 2:04:27 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ffd0ac2

Parents:

813ddcaa

Message:

Fixed non-preemptive locks

File:

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

src/libcfa/bits/locks.h

@@ -65 +65 @@
         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 ) {
@@ -112 +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 );
-                }
-                disable_interrupts();
-                __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 );
-                enable_interrupts_noPoll();
         }
 #endif