github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -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
commit 5b5a720a6a
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();
}