Changeset eba74ba for src/libcfa/bits

Timestamp:

May 25, 2018, 2:51:06 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/libcfa/bits

Files:

• containers.h (modified) (2 diffs)
• locks.h (modified) (4 diffs)

src/libcfa/bits/containers.h

@@ -220 +220 @@
         }
 
-        #define _next .0
-        #define _prev .1
+        #define next 0
+        #define prev 1
         forall(dtype T | sized(T))
         static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
+                verify(__get);
                 if ( head ) {
-                        __get( node )_next = head;
-                        __get( node )_prev = __get( *head )_prev;
+                        __get( node ).next = head;
+                        __get( node ).prev = __get( *head ).prev;
                         // inserted node must be consistent before it is seen
                         // prevent code movement across barrier
                         asm( "" : : : "memory" );
-                        __get( *head )_prev = &node;
-                        T & prev = *__get( node )_prev;
-                        __get( prev )_next = &node;
+                        __get( *head ).prev = &node;
+                        T & _prev = *__get( node ).prev;
+                        __get( _prev ).next = &node;
                 }
                 else {
-                        __get( node )_next = &node;
-                        __get( node )_prev = &node;
+                        __get( node ).next = &node;
+                        __get( node ).prev = &node;
                 }
 
@@ -246 +247 @@
         forall(dtype T | sized(T))
         static inline void remove( __dllist(T) & this, T & node ) with( this ) {
+                verify(__get);
                 if ( &node == head ) {
-                        if ( __get( *head )_next == head ) {
+                        if ( __get( *head ).next == head ) {
                                 head = NULL;
                         }
                         else {
-                                head = __get( *head )_next;
+                                head = __get( *head ).next;
                         }
                 }
-                __get( *__get( node )_next )_prev = __get( node )_prev;
-                __get( *__get( node )_prev )_next = __get( node )_next;
-                __get( node )_next = NULL;
-                __get( node )_prev = NULL;
-        }
-        #undef _next
-        #undef _prev
+                __get( *__get( node ).next ).prev = __get( node ).prev;
+                __get( *__get( node ).prev ).next = __get( node ).next;
+                __get( node ).next = NULL;
+                __get( node ).prev = NULL;
+        }
+        #undef next
+        #undef prev
 #endif
 

src/libcfa/bits/locks.h

@@ -39 +39 @@
 #endif
 
-#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 __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) );
-#else
-        #error unsupported architecture
-#endif
-
 struct __spinlock_t {
-        __ALIGN__ volatile size_t lock;
+        // Wrap in struct to prevent false sharing with debug info
+        struct {
+                // Align lock on 128-bit boundary
+                __ALIGN__ volatile _Bool lock;
+        };
         #ifdef __CFA_DEBUG__
+                // previous function to acquire the lock
                 const char * prev_name;
+                // previous thread to acquire the lock
                 void* prev_thrd;
         #endif
@@ -78 +74 @@
         // Lock the spinlock, return false if already acquired
         static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
-                _Bool result = __lock_test_and_test_and_set( this.lock );
+                _Bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
                 if( result ) {
                         disable_interrupts();
@@ -94 +90 @@
 
                 for ( unsigned int i = 1;; i += 1 ) {
-                        if ( __lock_test_and_test_and_set( this.lock ) ) break;
+                        if ( (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0) ) break;
                         #ifndef NOEXPBACK
                                 // exponential spin
@@ -112 +108 @@
         }
 
-        // // 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 );
+                __atomic_clear( &this.lock, __ATOMIC_RELEASE );
         }
 #endif