Changes in libcfa/src/concurrency/ready_queue.cfa [2b96031:c993b15]

File:

• libcfa/src/concurrency/ready_queue.cfa (modified) (4 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -257 +257 @@
 
                 // write timestamp
-                #if !defined(USE_NEW_SUBQUEUE)
-                        thrd->link.ts = rdtscl();
-                #endif
+                thrd->link.ts = rdtscl();
 
                 bool local;
@@ -356 +354 @@
 
                 // write timestamp
-                #if !defined(USE_NEW_SUBQUEUE)
-                        thrd->link.ts = rdtscl();
-                #endif
+                thrd->link.ts = rdtscl();
 
                 // Try to pick a lane and lock it
@@ -529 +525 @@
                                 assert(!lanes.data[idx].lock);
 
-                                #if defined(USE_NEW_SUBQUEUE)
-                                        if(is_empty(sl)) {
-                                                assert( sl.anchor.next == 0p );
-                                                assert( sl.anchor.ts   == 0  );
-                                                assert( mock_head(sl)  == sl.prev );
-                                        } else {
-                                                assert( sl.anchor.next != 0p );
-                                                assert( sl.anchor.ts   != 0  );
-                                                assert( mock_head(sl)  != sl.prev );
-                                        }
-                                #else
-                                        assert(head(sl)->link.prev == 0p );
-                                        assert(head(sl)->link.next->link.prev == head(sl) );
-                                        assert(tail(sl)->link.next == 0p );
-                                        assert(tail(sl)->link.prev->link.next == tail(sl) );
-
-                                        if(is_empty(sl)) {
-                                                assert(tail(sl)->link.prev == head(sl));
-                                                assert(head(sl)->link.next == tail(sl));
-                                        } else {
-                                                assert(tail(sl)->link.prev != head(sl));
-                                                assert(head(sl)->link.next != tail(sl));
-                                        }
-                                #endif
+                                assert(head(sl)->link.prev == 0p );
+                                assert(head(sl)->link.next->link.prev == head(sl) );
+                                assert(tail(sl)->link.next == 0p );
+                                assert(tail(sl)->link.prev->link.next == tail(sl) );
+
+                                if(is_empty(sl)) {
+                                        assert(tail(sl)->link.prev == head(sl));
+                                        assert(head(sl)->link.next == tail(sl));
+                                } else {
+                                        assert(tail(sl)->link.prev != head(sl));
+                                        assert(head(sl)->link.next != tail(sl));
+                                }
                         }
                 }
@@ -574 +558 @@
 static inline void fix(__intrusive_lane_t & ll) {
         #if !defined(USE_MPSC)
-                #if defined(USE_NEW_SUBQUEUE)
-                        if(is_empty(ll)) {
-                                verify(ll.anchor.next == 0p);
-                                ll.prev = mock_head(ll);
-                        }
-                #else
-                        // if the list is not empty then follow he pointer and fix its reverse
-                        if(!is_empty(ll)) {
-                                head(ll)->link.next->link.prev = head(ll);
-                                tail(ll)->link.prev->link.next = tail(ll);
-                        }
-                        // Otherwise just reset the list
-                        else {
-                                verify(tail(ll)->link.next == 0p);
-                                tail(ll)->link.prev = head(ll);
-                                head(ll)->link.next = tail(ll);
-                                verify(head(ll)->link.prev == 0p);
-                        }
-                #endif
+                // if the list is not empty then follow he pointer and fix its reverse
+                if(!is_empty(ll)) {
+                        head(ll)->link.next->link.prev = head(ll);
+                        tail(ll)->link.prev->link.next = tail(ll);
+                }
+                // Otherwise just reset the list
+                else {
+                        verify(tail(ll)->link.next == 0p);
+                        tail(ll)->link.prev = head(ll);
+                        head(ll)->link.next = tail(ll);
+                        verify(head(ll)->link.prev == 0p);
+                }
         #endif
 }