Changeset 97fed44 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Jan 25, 2022, 4:54:35 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

6b2d444, a488783, f681823

Parents:

f57f6ea0 (diff), 4fcbf26 (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/kernel/startup.cfa (modified) (6 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -34 +34 @@
 #include "kernel_private.hfa"
 #include "startup.hfa"          // STARTUP_PRIORITY_XXX
+#include "limits.hfa"
 #include "math.hfa"
 
@@ -177 +178 @@
 
 
-
 //=============================================================================================
 // Kernel Setup logic
@@ -515 +515 @@
         this.rdq.its = 0;
         this.rdq.itr = 0;
-        this.rdq.id  = -1u;
-        this.rdq.target = -1u;
-        this.rdq.last = -1u;
-        this.rdq.cutoff = 0ull;
+        this.rdq.id  = MAX;
+        this.rdq.target = MAX;
+        this.rdq.last = MAX;
+        this.rdq.cpu = 0;
+        // this.rdq.cutoff = 0ull;
         do_terminate = false;
         preemption_alarm = 0p;
@@ -536 +537 @@
         }
 
+        this.idle_wctx.fd = 0;
+
+        // I'm assuming these two are reserved for standard input and output
+        // so I'm using them as sentinels with idle_wctx.
+        /* paranoid */ verify( this.idle_fd != 0 );
+        /* paranoid */ verify( this.idle_fd != 1 );
+
         #if !defined(__CFA_NO_STATISTICS__)
                 print_stats = 0;
@@ -589 +597 @@
 // Cluster
 static void ?{}(__cluster_proc_list & this) {
-        this.fd    = 0;
+        this.fdw   = 0p;
         this.idle  = 0;
         this.total = 0;
@@ -686 +694 @@
         uint_fast32_t last_size;
         [this->unique_id, last_size] = ready_mutate_register();
+
+                this->rdq.cpu = __kernel_getcpu();
 
                 this->cltr->procs.total += 1u;