Changeset e71e94a

Timestamp:

Apr 1, 2022, 1:47:47 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

5f53cc3

Parents:

1417f6b

Message:

Some clean-up of ready queue usage of -1llu.
io types ts now returns MAX on empty cq

Location:

libcfa/src/concurrency

Files:

• io/types.hfa (modified) (2 diffs)
• ready_subqueue.hfa (modified) (5 diffs)

libcfa/src/concurrency/io/types.hfa

@@ -25 +25 @@
 #include "iofwd.hfa"
 #include "kernel/fwd.hfa"
+#include "limits.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
@@ -136 +137 @@
 
         static inline unsigned long long ts($io_context *& this) {
+                const __u32 head = *this->cq.head;
+                const __u32 tail = *this->cq.tail;
+
+                if(head == tail) return MAX;
+
                 return this->cq.ts;
         }

libcfa/src/concurrency/ready_subqueue.hfa

@@ -3 +3 @@
 #define __CFA_NO_SCHED_STATS__
 
-#include "containers/queueLockFree.hfa"
+#include "limits.hfa"
 
 // Intrusives lanes which are used by the relaxed ready queue
@@ -32 +32 @@
         /* paranoid */ verify( this.lock );
         /* paranoid */ verify( node->link.next == 0p );
-        /* paranoid */ verify( node->link.ts   == -1llu  );
+        /* paranoid */ verify( node->link.ts   == MAX  );
         /* paranoid */ verify( this.prev->link.next == 0p );
-        /* paranoid */ verify( this.prev->link.ts   == -1llu  );
+        /* paranoid */ verify( this.prev->link.ts   == MAX  );
         if( this.anchor.next == 0p ) {
                 /* paranoid */ verify( this.anchor.next == 0p );
-                /* paranoid */ verify( this.anchor.ts   == -1llu );
+                /* paranoid */ verify( this.anchor.ts   == MAX );
                 /* paranoid */ verify( this.anchor.ts   != 0  );
                 /* paranoid */ verify( this.prev == mock_head( this ) );
         } else {
                 /* paranoid */ verify( this.anchor.next != 0p );
-                /* paranoid */ verify( this.anchor.ts   != -1llu );
+                /* paranoid */ verify( this.anchor.ts   != MAX );
                 /* paranoid */ verify( this.anchor.ts   != 0  );
                 /* paranoid */ verify( this.prev != mock_head( this ) );
@@ -62 +62 @@
         /* paranoid */ verify( this.lock );
         /* paranoid */ verify( this.anchor.next != 0p );
-        /* paranoid */ verify( this.anchor.ts   != -1llu );
+        /* paranoid */ verify( this.anchor.ts   != MAX );
         /* paranoid */ verify( this.anchor.ts   != 0  );
 
@@ -71 +71 @@
         bool is_empty = this.anchor.next == 0p;
         node->link.next = 0p;
-        node->link.ts   = -1llu;
+        node->link.ts   = MAX;
         #if !defined(__CFA_NO_STATISTICS__)
                 this.cnt--;
@@ -80 +80 @@
 
         /* paranoid */ verify( node->link.next == 0p );
-        /* paranoid */ verify( node->link.ts   == -1llu  );
+        /* paranoid */ verify( node->link.ts   == MAX  );
         /* paranoid */ verify( node->link.ts   != 0  );
         /* paranoid */ verify( this.anchor.ts  != 0  );