Changeset 12c1eef for libcfa/src/stdlib.cfa

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (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/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 Dec 29 15:32:44 2021
-// Update Count     : 512
+// Last Modified On : Thu Jan 13 21:38:30 2022
+// Update Count     : 593
 //
 
 #include "stdlib.hfa"
+#include "bits/random.hfa"
+#include "concurrency/invoke.h"                                                 // random_state
 
 //---------------------------------------
@@ -221 +223 @@
 //---------------------------------------
 
-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
 
-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 state;
-} // MarsagliaXor
-
-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 = 36973 * (state & 65535) + (state >> 16);
-} // LCG
-
+uint32_t __global_random_seed;                                                  // sequential/concurrent
+uint32_t __global_random_state;                                         // sequential only
+
+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 ); }
 
-uint32_t prng( void ) { return GENERATOR( state ); }
+void set_seed( uint32_t seed ) { __global_random_seed = seed; GENERATOR( __global_random_state ); }
+uint32_t get_seed() { return __global_random_seed; }
+uint32_t prng( void ) { return GENERATOR( __global_random_state ); } // [0,UINT_MAX]
 
 //---------------------------------------