Changes in libcfa/src/stdlib.cfa [1959528:15b05c8]

File:

• libcfa/src/stdlib.cfa (modified) (2 diffs)

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 12 16:25:36 2022
-// Update Count     : 578
+// Last Modified On : Mon Jan  3 09:36:27 2022
+// Update Count     : 519
 //
 
 #include "stdlib.hfa"
-//#include "concurrency/kernel/fwd.hfa"
-#include "concurrency/invoke.h"                                                 // random_state
 
 //---------------------------------------
@@ -223 +221 @@
 //---------------------------------------
 
-// Pipelined to allow OoO overlap with reduced dependencies. Critically, return the current value, and compute and store
-// the next value.
+static uint32_t seed = 0;                                                               // current seed
+static thread_local uint32_t state;                                             // random state
+
+void set_seed( uint32_t seed_ ) { state = seed = seed_; }
+uint32_t get_seed() { return seed; }
 
 #define GENERATOR LCG
 
-static inline uint32_t MarsagliaXor( uint32_t & state ) {
-        uint32_t ret = state;
+inline uint32_t MarsagliaXor( uint32_t & state ) {
+        if ( unlikely( seed == 0 ) ) set_seed( rdtscl() );
+        else if ( unlikely( state == 0 ) ) state = seed;
         state ^= state << 6;
         state ^= state >> 21;
         state ^= state << 7;
-        return ret;
+        return state;
 } // MarsagliaXor
 
-static inline uint32_t LCG( uint32_t & state ) {                // linear congruential generator
-        uint32_t ret = state;
-        state = 36969 * (state & 65535) + (state >> 16);        // 36969 is NOT prime! No not change it!
-        return ret;
+inline uint32_t LCG( uint32_t & state ) {                               // linear congruential generator
+        if ( unlikely( seed == 0 ) ) set_seed( rdtscl() );
+        else if ( unlikely( state == 0 ) ) state = seed;
+        return state = 36969 * (state & 65535) + (state >> 16); // 36969 is NOT prime!
 } // LCG
 
-uint32_t __global_random_seed;
-
-void set_seed( PRNG & prng, uint32_t seed_ ) with( prng ) { state = seed = seed_; GENERATOR( state ); } // set seed
 uint32_t prng( PRNG & prng ) with( prng ) { callcnt += 1; return GENERATOR( state ); }
 
-void set_seed( uint32_t seed ) {
-        active_thread()->random_state = __global_random_seed = seed;
-        GENERATOR( active_thread()->random_state );
-} // set_seed
-uint32_t get_seed() { return __global_random_seed; }
-uint32_t prng( void ) { return GENERATOR( active_thread()->random_state ); } // [0,UINT_MAX]
+uint32_t prng( void ) { return GENERATOR( state ); }
 
 //---------------------------------------