Changeset 42daeb4 for libcfa/src/concurrency/kernel

Timestamp:

Jan 13, 2022, 10:53:25 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

3eaa689

Parents:

3bb12921 (diff), 00f5fde (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

Location:

libcfa/src/concurrency/kernel

Files:

• fwd.hfa (modified) (3 diffs)
• startup.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -77 +77 @@
 
                 static inline uint64_t __tls_rand() {
+                        return
                         #if defined(__SIZEOF_INT128__)
-                                return __lehmer64( kernelTLS().rand_seed );
+                                __lehmer64( kernelTLS().rand_seed );
                         #else
-                                return __xorshift64( kernelTLS().rand_seed );
+                                __xorshift64( kernelTLS().rand_seed );
                         #endif
                 }
@@ -91 +92 @@
 
                 static inline unsigned __tls_rand_fwd() {
-
                         kernelTLS().ready_rng.fwd_seed = (A * kernelTLS().ready_rng.fwd_seed + C) & (M - 1);
                         return kernelTLS().ready_rng.fwd_seed >> D;
@@ -112 +112 @@
                 }
         }
-
-
 
         extern void disable_interrupts();

libcfa/src/concurrency/kernel/startup.cfa

@@ -101 +101 @@
 extern void __wake_proc(processor *);
 extern int cfa_main_returned;                                                   // from interpose.cfa
+extern uint32_t __global_random_seed;
 
 //-----------------------------------------------------------------------------
@@ -489 +490 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
+        random_state = __global_random_seed;
         #if defined( __CFA_WITH_VERIFY__ )
                 canary = 0x0D15EA5E0D15EA5Ep;