Changes in libcfa/src/containers/stackLockFree.hfa [6f36dde:0f89d4f]

File:

• libcfa/src/containers/stackLockFree.hfa (modified) (5 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 : Wed Jan 20 20:40:03 2021
-// Update Count     : 67
+// Last Modified On : Mon May 18 13:30:08 2020
+// Update Count     : 55
 //
 
@@ -19 +19 @@
 forall( dtype T )
 union Link {
-        struct {                                                                                        // 32/64-bit x 2
+        struct {                                                                        // 32/64-bit x 2
                 T * volatile top;                                                               // pointer to stack top
-                uintptr_t count;                                                                // count each push
+                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 | sized(T) | { Link(T) * ?`next( T * ); } ) {
+forall( otype T | { Link(T) * ?`next( T * ); } ) {
         struct StackLF {
                 Link(T) stack;
@@ -42 +42 @@
 
                 void push( StackLF(T) & this, T & n ) with(this) {
-                        *( &n )`next = stack;                                           // atomic assignment unnecessary, or use CAA
                         for () {                                                                        // busy wait
+                                *( &n )`next = stack;                                   // atomic assignment unnecessary, or use CAA
                           if ( __atomic_compare_exchange_n( &stack.atom, &( &n )`next->atom, (Link(T))@{ {&n, ( &n )`next->count + 1} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) break; // attempt to update top node
                         } // for
@@ -49 +49 @@
 
                 T * pop( StackLF(T) & this ) with(this) {
-                        Link(T) t @= stack;                                                     // atomic assignment unnecessary, or use CAA
+                        Link(T) t @= {};
                         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))@{ {( t.top )`next->top, t.count} }.atom, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ) return t.top; // attempt to update top node
@@ -65 +66 @@
                                 }
                                 if( next == 0p ) return false;
-                                link = ( next )`next;
+                                link = (next)`next;
                         }
                 }