Changeset 2dcd80a for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Dec 14, 2022, 12:23:42 PM (17 months ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

441a6a7

Parents:

7d9598d (diff), d8bdf13 (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) (4 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -39 +39 @@
 #include "limits.hfa"
 #include "math.hfa"
+#include "bits/random.hfa"                                                              // prng
 
 #define CFA_PROCESSOR_USE_MMAP 0
@@ -107 +108 @@
 extern void __wake_proc(processor *);
 extern int cfa_main_returned;                                                   // from interpose.cfa
-uint32_t __global_random_prime = 4_294_967_291u, __global_random_mask = false;
+size_t __global_random_prime = 4_294_967_291u;
+bool __global_random_mask = false;
 
 //-----------------------------------------------------------------------------
@@ -133 +135 @@
 // Global state
 __thread struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
-        NULL,                                                                                           // cannot use 0p
-        NULL,
-        false,
-        { 1, false, false },
-        0,
-        { 0, 0 },
-        NULL,
+        .this_thread : NULL,                                                            // cannot use 0p
+        .this_processor : NULL,
+        .sched_lock : false,
+        .preemption_state : { .disable_count : 1, .enabled : false, .in_progress : false },
+        // random_state uninitialized
+        .ready_rng : { .fwd_seed : 0, .bck_seed : 0 },
+        .this_stats : NULL,
         #ifdef __CFA_WITH_VERIFY__
-                false,
-                0,
+                .in_sched_lock : false,
+                .sched_id : 0,
         #endif
 };
@@ -513 +515 @@
         rdy_link.next = 0p;
         rdy_link.ts   = MAX;
+        user_link.next = 0p;
+        user_link.prev = 0p;
+        cltr_link.next = 0p;
+        cltr_link.prev = 0p;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
-        random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
+        PRNG_SET_SEED( random_state,  __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl() );
         #if defined( __CFA_WITH_VERIFY__ )
                 executing = 0p;