Changeset f04a3df6 for libcfa/src/concurrency/ready_queue.cfa

Timestamp:

May 3, 2021, 3:41:12 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f6fdfb14

Parents:

bac0ba8 (diff), 2b96031 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -257 +257 @@
 
                 // write timestamp
-                thrd->link.ts = rdtscl();
+                #if !defined(USE_NEW_SUBQUEUE)
+                        thrd->link.ts = rdtscl();
+                #endif
 
                 bool local;
@@ -354 +356 @@
 
                 // write timestamp
-                thrd->link.ts = rdtscl();
+                #if !defined(USE_NEW_SUBQUEUE)
+                        thrd->link.ts = rdtscl();
+                #endif
 
                 // Try to pick a lane and lock it
@@ -525 +529 @@
                                 assert(!lanes.data[idx].lock);
 
-                                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));
-                                }
+                                #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
                         }
                 }
@@ -558 +574 @@
 static inline void fix(__intrusive_lane_t & ll) {
         #if !defined(USE_MPSC)
-                // 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);
-                }
+                #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
         #endif
 }