Moved random to stable, just needs some minor tweaks. But it's already in use

in a couple of core components, including in tempFile name generation.

12 files changed, 7 insertions, 11 deletions

diff --git a/src/stable/file.cpp b/src/stable/file.cpp
index 8d10596..81b476d 100644
--- a/src/stable/file.cpp
+++ b/src/stable/file.cpp
@@ -12,6 +12,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>
+#include "bu/random.h"
 
 #include "bu/config.h"
 
@@ -190,7 +191,6 @@ void Bu::File::setBlocking( bool bBlocking )
 Bu::File Bu::File::tempFile( Bu::String &sName )
 {
         uint32_t iX;
-        iX = time( NULL ) + getpid();
         int iXes;
         for( iXes = sName.getSize()-1; iXes >= 0; iXes-- )
         {
@@ -200,11 +200,11 @@ Bu::File Bu::File::tempFile( Bu::String &sName )
         iXes++;
         if( iXes == sName.getSize() )
                 throw Bu::ExceptionBase("Invalid temporary filename template.");
-        for( int iter = 0; iter < 100; iter++ )
+        for( int iter = 0; iter < 1000; iter++ )
         {
                 for( int j = iXes; j < sName.getSize(); j++ )
                 {
-                        iX = (1103515245 * iX + 12345);
+                        uint32_t iX = Bu::Random::rand();
                         sName[j] = ('A'+(iX%26)) | ((iX&0x1000)?(0x20):(0));
                 }
 
@@ -214,7 +214,7 @@ Bu::File Bu::File::tempFile( Bu::String &sName )
                                         |Bu::File::Create|Bu::File::Exclusive );
                 } catch(...) { }
         }
-        throw Bu::FileException("Failed to create unique temporary file after 100"
+        throw Bu::FileException("Failed to create unique temporary file after 1000"
                         " iterations.");
 }
 
diff --git a/src/experimental/random.cpp b/src/stable/random.cpp
index 725948a..725948a 100644
--- a/src/experimental/random.cpp
+++ b/src/stable/random.cpp
diff --git a/src/experimental/random.h b/src/stable/random.h
index ba26f21..ba26f21 100644
--- a/src/experimental/random.h
+++ b/src/stable/random.h
diff --git a/src/experimental/randombase.cpp b/src/stable/randombase.cpp
index 6514df3..6514df3 100644
--- a/src/experimental/randombase.cpp
+++ b/src/stable/randombase.cpp
diff --git a/src/experimental/randombase.h b/src/stable/randombase.h
index aff1d45..aff1d45 100644
--- a/src/experimental/randombase.h
+++ b/src/stable/randombase.h
diff --git a/src/experimental/randombasic.cpp b/src/stable/randombasic.cpp
index ac591be..ac591be 100644
--- a/src/experimental/randombasic.cpp
+++ b/src/stable/randombasic.cpp
diff --git a/src/experimental/randombasic.h b/src/stable/randombasic.h
index a53e16f..a53e16f 100644
--- a/src/experimental/randombasic.h
+++ b/src/stable/randombasic.h
diff --git a/src/experimental/randomcmwc.cpp b/src/stable/randomcmwc.cpp
index a4e807e..a4e807e 100644
--- a/src/experimental/randomcmwc.cpp
+++ b/src/stable/randomcmwc.cpp
diff --git a/src/experimental/randomcmwc.h b/src/stable/randomcmwc.h
index 747eb6a..747eb6a 100644
--- a/src/experimental/randomcmwc.h
+++ b/src/stable/randomcmwc.h
diff --git a/src/experimental/randomsystem.cpp b/src/stable/randomsystem.cpp
index 0501587..0501587 100644
--- a/src/experimental/randomsystem.cpp
+++ b/src/stable/randomsystem.cpp
diff --git a/src/experimental/randomsystem.h b/src/stable/randomsystem.h
index 7106d58..7106d58 100644
--- a/src/experimental/randomsystem.h
+++ b/src/stable/randomsystem.h
diff --git a/src/unstable/bitstring.cpp b/src/unstable/bitstring.cpp
index c32240c..9559aad 100644
--- a/src/unstable/bitstring.cpp
+++ b/src/unstable/bitstring.cpp
@@ -6,16 +6,12 @@
  */
 
 #include "bu/bitstring.h"
-#include <stdlib.h>
+#include "bu/random.h"
 #include <stdio.h>
 #include <string.h>
 
 #include "bu/exceptionbase.h"
 
-#ifdef _WIN32
-#define random() rand()
-#endif
-
 #define bitsToBytes( iBits ) (((iBits/8)+((iBits%8)?(1):(0))));
 
 Bu::BitString::BitString()
@@ -51,7 +47,7 @@ Bu::BitString::BitString( long iNewBits, bool bFillRandomly )
                 // I'll just use the low order byte)
                 for( j = 0; j < iBytes; j++ )
                 {
-                        caData[j] = (unsigned char)(random() & 0xFF);
+                        caData[j] = (unsigned char)(Bu::Random::rand() & 0xFF);
                 }
         }
         else
@@ -413,7 +409,7 @@ void Bu::BitString::randomize()
         {
                 for( int j = 0; j < iBytes; j++ )
                 {
-                        caData[j] = (unsigned char)(random() & 0xFF);
+                        caData[j] = (unsigned char)(Bu::Random::rand() & 0xFF);
                 }
                 fixup();
         }