Changeset 29702ad for libcfa/src/concurrency

Timestamp:

Nov 22, 2022, 10:18:04 AM (19 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

20cf96d

Parents:

1553a55 (diff), d41735a (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

Files:

• invoke.h (modified) (3 diffs)
• kernel/fwd.hfa (modified) (1 diff)
• kernel/startup.cfa (modified) (2 diffs)
• thread.cfa (modified) (3 diffs)
• thread.hfa (modified) (3 diffs)

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  9 19:06:45 2022
-// Update Count     : 48
+// Last Modified On : Mon Nov 21 17:40:24 2022
+// Update Count     : 55
 //
 
@@ -17 +17 @@
 #include "bits/defs.hfa"
 #include "bits/locks.hfa"
+#include "bits/random.hfa"
 #include "kernel/fwd.hfa"
 
@@ -222 +223 @@
                 struct processor * last_proc;
 
-                uint32_t random_state;                                                  // fast random numbers
+                PRNG_ARG_T random_state;                                                // fast random numbers
 
                 #if defined( __CFA_WITH_VERIFY__ )

libcfa/src/concurrency/kernel/fwd.hfa

@@ -120 +120 @@
 
                 // Yield: yield N times
-                static inline void yield( unsigned times ) {
+                static inline void yield( size_t times ) {
                         for( times ) {
                                 yield();

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;
+PRNG_ARG_T __global_random_prime = 4_294_967_291u;
+bool __global_random_mask = false;
 
 //-----------------------------------------------------------------------------

libcfa/src/concurrency/thread.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 12 15:24:18 2022
-// Update Count     : 66
+// Last Modified On : Sun Nov 20 17:17:50 2022
+// Update Count     : 80
 //
 
@@ -26 +26 @@
 #include "invoke.h"
 
-extern uint32_t __global_random_seed, __global_random_prime, __global_random_mask;
+extern PRNG_ARG_T __global_random_seed, __global_random_prime;
+extern bool __global_random_mask;
 
 #pragma GCC visibility push(default)
@@ -225 +226 @@
 
 //-----------------------------------------------------------------------------
-#define GENERATOR LCG
-
-void set_seed( uint32_t seed ) {
-        uint32_t & state = active_thread()->random_state;
+
+void set_seed( uint64_t seed ) {
+        PRNG_ARG_T & state = active_thread()->random_state;
         state = __global_random_seed = seed;
-        GENERATOR( state );
+        (void)PRNG_NAME( state );                                                       // prime PRNG
         __global_random_prime = state;
         __global_random_mask = true;
 } // set_seed
 
-uint32_t prng( void ) {                                                                 // [0,UINT_MAX]
-        uint32_t & state = active_thread()->random_state;
-        return GENERATOR( state );
+uint64_t prng( void ) {                                                                 // [0,UINT_MAX]
+        PRNG_ARG_T & state = active_thread()->random_state;
+        return PRNG_NAME( state );
 } // prng
 

libcfa/src/concurrency/thread.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 11 16:34:07 2022
-// Update Count     : 20
+// Last Modified On : Sat Nov 19 16:41:27 2022
+// Update Count     : 30
 //
 
@@ -23 +23 @@
 #include "monitor.hfa"
 #include "exception.hfa"
+#include "bits/random.hfa"
 
 //-----------------------------------------------------------------------------
@@ -142 +143 @@
 // prng
 static inline {
-        uint32_t prng( thread$ & th ) __attribute__(( warn_unused_result )) { return LCG( th.random_state ); } // [0,UINT_MAX]
-        uint32_t prng( thread$ & th, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
-        uint32_t prng( thread$ & th, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
+        uint64_t prng( thread$ & th ) __attribute__(( warn_unused_result )) { return PRNG_NAME( th.random_state ); } // [0,UINT_MAX]
+        uint64_t prng( thread$ & th, uint64_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
+        uint64_t prng( thread$ & th, uint64_t l, uint64_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
         forall( T & | is_thread(T) ) {
-                uint32_t prng( T & th ) __attribute__(( warn_unused_result )) { return prng( (thread &)th ); } // [0,UINT_MAX]
-                uint32_t prng( T & th, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
-                uint32_t prng( T & th, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
+                uint64_t prng( T & th ) __attribute__(( warn_unused_result )) { return prng( (thread &)th ); } // [0,UINT_MAX]
+                uint64_t prng( T & th, uint64_t u ) __attribute__(( warn_unused_result )) { return prng( th ) % u; } // [0,u)
+                uint64_t prng( T & th, uint64_t l, uint64_t u ) __attribute__(( warn_unused_result )) { return prng( th, u - l + 1 ) + l; } // [l,u]
         } // distribution
 } // distribution