Changes in libcfa/src/containers/lockfree.hfa [e8b8e65:88ac843e]

File:

• libcfa/src/containers/lockfree.hfa (modified) (5 diffs)

libcfa/src/containers/lockfree.hfa

@@ -142 +142 @@
 
         static inline void ?{}(poison_list(T) & this) { this.head = 0p; }
-        static inline bool is_poisoned( const poison_list(T) & this ) { return 1p == this.head; }
 
         static inline forall(| { T * volatile & ?`next ( T * ); })
@@ -148 +147 @@
                 // Adds an element to the list
                 // Multi-Thread Safe, Lock-Free
-                bool push(poison_list(T) & this, T * elem) __attribute__((artificial));
-                bool push(poison_list(T) & this, T * elem) {
+                T * push(poison_list(T) & this, T * elem) __attribute__((artificial));
+                T * push(poison_list(T) & this, T * elem) {
                         /* paranoid */ verify(0p == (elem`next));
                         __atomic_store_n( &elem`next, (T*)1p, __ATOMIC_RELAXED );
@@ -157 +156 @@
                         for() {
                                 // check if it's poisoned
-                                if(expected == 1p) return false;
+                                if(expected == 1p) return 0p;
 
                                 // try to CAS the elem in
@@ -163 +162 @@
                                         // We managed to exchange in, we are done
 
-                                        // We should never succeed the CAS if it's poisonned and the elem should be 1p.
-                                        /* paranoid */ verify( expected  != 1p );
-                                        /* paranoid */ verify( elem`next == 1p );
+                                        // We should never succeed the CAS if it's poisonned.
+                                        /* paranoid */ verify( expected != 1p );
 
                                         // If we aren't the first, we need to tell the person before us
                                         // No need to
                                         elem`next = expected;
-                                        return true;
+                                        return expected;
                                 }
                         }
@@ -192 +190 @@
                 T * poison(poison_list(T) & this) {
                         T * ret = __atomic_exchange_n( &this.head, (T*)1p, __ATOMIC_SEQ_CST );
-                        /* paranoid */ verifyf( ret != (T*)1p, "Poison list %p poisoned more than once!", &this );
+                        /* paranoid */ verify( ret != (T*)1p );
                         return ret;
                 }