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

Timestamp:

May 3, 2021, 4:39:32 PM (4 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:

d3ba775

Parents:

f6fdfb14

Message:

Forgot some changes for new sub-queue

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -524 +524 @@
                                 assert(!lanes.data[idx].lock);
 
-                                #if defined(USE_NEW_SUBQUEUE)
                                         if(is_empty(sl)) {
                                                 assert( sl.anchor.next == 0p );
@@ -534 +533 @@
                                                 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
                         }
                 }
@@ -569 +554 @@
 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
         #endif
 }