Changeset fc59df78 for libcfa/src

Timestamp:

Apr 24, 2021, 7:36:42 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:

89eff25

Parents:

5c04e82

Message:

Split ready-queue routines in 3 instead of 2.

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (1 diff)
• kernel_private.hfa (modified) (2 diffs)
• ready_queue.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -488 +488 @@
 
         ready_schedule_lock();
-                $thread * thrd = pop_slow( this );
+                $thread * thrd;
+                for(25) {
+                        thrd = pop_slow( this );
+                        if(thrd) goto RET;
+                }
+                thrd = pop_search( this );
+
+                RET:
         ready_schedule_unlock();
 

libcfa/src/concurrency/kernel_private.hfa

@@ -289 +289 @@
 
 //-----------------------------------------------------------------------
-// pop thread from the ready queue of a cluster
+// pop thread from the local queues of a cluster
 // returns 0p if empty
 // May return 0p spuriously
@@ -295 +295 @@
 
 //-----------------------------------------------------------------------
-// pop thread from the ready queue of a cluster
+// pop thread from any ready queue of a cluster
+// returns 0p if empty
+// May return 0p spuriously
+__attribute__((hot)) struct $thread * pop_slow(struct cluster * cltr);
+
+//-----------------------------------------------------------------------
+// search all ready queues of a cluster for any thread
 // returns 0p if empty
 // guaranteed to find any threads added before this call
-__attribute__((hot)) struct $thread * pop_slow(struct cluster * cltr);
+__attribute__((hot)) struct $thread * pop_search(struct cluster * cltr);
 
 //-----------------------------------------------------------------------

libcfa/src/concurrency/ready_queue.cfa

@@ -344 +344 @@
         }
 
-        __attribute__((hot)) struct $thread * pop_slow(struct cluster * cltr) {
+        __attribute__((hot)) struct $thread * pop_slow(struct cluster * cltr) { return pop_fast(cltr); }
+        __attribute__((hot)) struct $thread * pop_search(struct cluster * cltr) {
                 return search(cltr);
         }
@@ -436 +437 @@
 
         __attribute__((hot)) struct $thread * pop_slow(struct cluster * cltr) with (cltr->ready_queue) {
-                for(25) {
-                        unsigned i = __tls_rand() % lanes.count;
-                        $thread * t = try_pop(cltr, i __STATS(, __tls_stats()->ready.pop.steal));
-                        if(t) return t;
-                }
-
+                unsigned i = __tls_rand() % lanes.count;
+                return try_pop(cltr, i __STATS(, __tls_stats()->ready.pop.steal));
+        }
+
+        __attribute__((hot)) struct $thread * pop_search(struct cluster * cltr) with (cltr->ready_queue) {
                 return search(cltr);
         }