github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Random now fork safe

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6236 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-08-07 11:40:10 +00:00
parent 82404cca4c
commit 17e92e4b19
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
uppsrc/Core/Random.cpp
View file

@ -58,6 +58,9 @@ struct MTrand {
dword mt[N];
int mti; /* mti==N+1 means mt[N] is not initialized */
dword mag01[2];
#ifdef PLATFORM_POSIX
int pid;
#endif
void seed();
void init_genrand(dword s);
@ -160,6 +163,9 @@ MTrand::MTrand()
mag01[0] = 0;
mag01[1] = MATRIX_A;
seed();
#ifdef PLATFORM_POSIX
pid = getpid();
#endif
}
void MTrand::seed()
@ -192,14 +198,6 @@ thread__ MTrand *sRng;
thread__ byte sRb[sizeof(MTrand)];
#endif
void SeedRandom()
{
if(!sRng) {
sRng = new(sRb) MTrand;
}
sRng->seed();
}
void SeedRandom(dword *seed, int len){
if(!sRng) {
sRng = new(sRb) MTrand;
@ -219,6 +217,13 @@ dword Random()
if(!sRng) {
sRng = new(sRb) MTrand;
}
#ifdef PLATFORM_POSIX // Be fork safe...
int pid = getpid();
if(sRng->pid != pid) {
sRng->seed();
sRng->pid = pid;
}
#endif
return sRng->genrand();
}

1
uppsrc/Core/Util.h
View file

@ -296,7 +296,6 @@ qword Random64();
qword Random64(qword n);
double Randomf();
void SeedRandom();
void SeedRandom(dword *seed,int len);
void SeedRandom(dword seed = 0);

9
uppsrc/Core/src.tpp/MathUtil$en-us.tpp
View file

@ -95,14 +95,7 @@ d],[@(0.0.255) int]_[*@3 len])&]
[s5;:SeedRandom`(dword`): [@(0.0.255) void]_[* SeedRandom]([_^dword^ dword]_[*@3 seed]_`=_[@3 0
])&]
[s2;%% Seeds random with single value [%-*@3 seed]. This is good to
get always the same sequence of numbers (for the same seed)&]
[s3; &]
[s4; &]
[s5;:SeedRandom`(`): [@(0.0.255) void]_[* SeedRandom]()&]
[s2; Seeds random from the host platform randomness sources. Note
that this is done by default by random number generator, there
is no need to call this function unless you are doing something
special.&]
get always the same sequence of numbers (for the same seed).&]
[s3;%% &]
[s4; &]
[s5;:ZeroArray`(x`): [* ZeroArray]([*@3 x])&]