Changeset 2dcd80a for libcfa/src/concurrency/kernel/fwd.hfa

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/fwd.hfa (modified) (4 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -46 +46 @@
                         } preemption_state;
 
-                        #if defined(__SIZEOF_INT128__)
-                                __uint128_t rand_seed;
-                        #else
-                                uint64_t rand_seed;
-                        #endif
+                        PRNG_STATE_T random_state;
+
                         struct {
                                 uint64_t fwd_seed;
@@ -57 +54 @@
 
                         struct __stats_t        * volatile this_stats;
-
 
                         #ifdef __CFA_WITH_VERIFY__
@@ -76 +72 @@
                 #define publicTLS_get( member ) ((typeof(__cfaabi_tls.member))__cfatls_get( __builtin_offsetof(KernelThreadData, member) ))
 
-                static inline uint64_t __tls_rand() {
-                        return
-                        #if defined(__SIZEOF_INT128__)
-                                lehmer64( kernelTLS().rand_seed );
-                        #else
-                                xorshift_13_7_17( kernelTLS().rand_seed );
-                        #endif
+                static inline
+                        #ifdef __x86_64__                                                       // 64-bit architecture
+                        uint64_t
+                        #else                                                                           // 32-bit architecture
+                        uint32_t
+                        #endif // __x86_64__
+                __tls_rand() {
+                        return PRNG_NAME( kernelTLS().random_state );
                 }
 
@@ -120 +117 @@
 
                 // Yield: yield N times
-                static inline void yield( unsigned times ) {
+                static inline void yield( size_t times ) {
                         for( times ) {
                                 yield();