Changeset 7416d46a for src/libcfa/bits

Timestamp:

Jan 30, 2018, 3:54:32 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:

633a642

Parents:

f792cb8 (diff), 42be3c3 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa/bits

Files:

• locks.h (modified) (8 diffs)
• signal.h (added)

src/libcfa/bits/locks.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 15:14:38 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec  8 16:02:22 2017
+// Update Count     : 1
 //
 
@@ -24 +24 @@
 #elif defined( __i386 ) || defined( __x86_64 )
         #define Pause() __asm__ __volatile__ ( "pause" : : : )
+#elif defined( __ARM_ARCH )
+        #define Pause() __asm__ __volatile__ ( "nop" : : : )
 #else
         #error unsupported architecture
 #endif
 
-#if defined( __i386 ) || defined( __x86_64 )
+#if defined( __i386 ) || defined( __x86_64 ) || defined( __ARM_ARCH )
         // Intel recommendation
         #define __ALIGN__ __attribute__(( aligned (128) ))
@@ -37 +39 @@
 #endif
 
-#if defined( __x86_64 )
+#if __SIZEOF_SIZE_T__ == 8
         #define __lock_test_and_test_and_set( lock ) (lock) == 0 && __sync_lock_test_and_set_8( &(lock), 1 ) == 0
         #define __lock_release( lock ) __sync_lock_release_8( &(lock) );
-#elif defined( __i386 )
+#elif __SIZEOF_SIZE_T__ == 4
         #define __lock_test_and_test_and_set( lock ) (lock) == 0 && __sync_lock_test_and_set_4( &(lock), 1 ) == 0
         #define __lock_release( lock ) __sync_lock_release_4( &(lock) );
@@ -48 +50 @@
 
 struct __spinlock_t {
-        __ALIGN__ volatile uintptr_t lock;
+        __ALIGN__ volatile size_t lock;
         #ifdef __CFA_DEBUG__
                 const char * prev_name;
@@ -56 +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 ) {
@@ -66 +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;
         }
@@ -97 +106 @@
                         #endif
                 }
+                disable_interrupts();
                 __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
@@ -103 +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 );
         }