Changeset 280ec46

Timestamp:

Jun 13, 2020, 10:40:44 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c45d2fa

Parents:

ee06db5c

Message:

switch lock-free stack from CAAD to CAVD

File:

• libcfa/src/containers/stackLockFree.hfa (modified) (4 diffs)

libcfa/src/containers/stackLockFree.hfa

@@ -9 +9 @@
 // Created On       : Wed May 13 20:58:58 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 13:30:08 2020
-// Update Count     : 55
+// Last Modified On : Sat Jun 13 12:24:37 2020
+// Update Count     : 62
 // 
 
@@ -19 +19 @@
 forall( dtype T )
 union Link {
-        struct {                                                                        // 32/64-bit x 2
-                T * top;                                                                // pointer to stack top
-                uintptr_t count;                                                // count each push
+        struct {                                                                                        // 32/64-bit x 2
+                T * top;                                                                                // pointer to stack top
+                uintptr_t count;                                                                // count each push
         };
         #if __SIZEOF_INT128__ == 16
-        __int128                                                                        // gcc, 128-bit integer
+        __int128                                                                                        // gcc, 128-bit integer
         #else
-        uint64_t                                                                        // 64-bit integer
+        uint64_t                                                                                        // 64-bit integer
         #endif // __SIZEOF_INT128__ == 16
         atom;
 }; // Link
 
-forall( otype T | { Link(T) * getNext( T * ); } ) {
+forall( dtype T | sized(T) | { Link(T) * getNext( T * ); } ) {
     struct StackLF {
                 Link(T) stack;
@@ -42 +42 @@
 
                 void push( StackLF(T) & this, T & n ) with(this) {
+                        *getNext( &n ) = stack;                                         // atomic assignment unnecessary, or use CAA
                         for () {                                                                        // busy wait
-                                *getNext( &n ) = stack;                                 // atomic assignment unnecessary, or use CAA
                           if ( __atomic_compare_exchange_n( &stack.atom, &getNext( &n )->atom, (Link(T))@{ {&n, getNext( &n )->count + 1} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) break; // attempt to update top node
                         } // for
@@ -50 +50 @@
                 T * pop( StackLF(T) & this ) with(this) {
                         Link(T) t @= {};
+                        t = stack;                                                                      // atomic assignment unnecessary, or use CAA
                         for () {                                                                        // busy wait
-                                t = stack;                                                              // atomic assignment unnecessary, or use CAA
                           if ( t.top == 0p ) return 0p;                         // empty stack ?
                           if ( __atomic_compare_exchange_n( &stack.atom, &t.atom, (Link(T))@{ {getNext( t.top )->top, t.count} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) return t.top; // attempt to update top node