Changeset 28:bac3a3382c4a in xplcommon

Timestamp:

01/02/13 08:53:57 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The local socket test program now uses the pseudo-random number generator

File:

• test/testlocsock.cc (modified) (5 diffs)

test/testlocsock.cc

@@ -40 +40 @@
 #include <xplcommon/WritingBuffer.h>
 #include <xplcommon/WaitableEvent.h>
+#include <xplcommon/PseudoRandom.h>
 
 #include <cstdlib>
@@ -61 +62 @@
 using xplcommon::WritingBuffer;
 using xplcommon::WaitableEvent;
+using xplcommon::PseudoRandom;
 
 using std::min;
@@ -72 +74 @@
     static const size_t minToWrite = 2076;
     static const size_t maxToWrite = 1345670;
-    static const size_t rangeToWrite = maxToWrite - minToWrite;
 
     static const size_t reportingInterval = 10000;
 
-    static const int sleepThreshold = static_cast<int>(RAND_MAX * 0.99);
-    static const int sleepRemainder = RAND_MAX - sleepThreshold;
+    static const int sleepThreshold = static_cast<int>(PseudoRandom::MAX * 0.99);
+    static const int sleepRemainder = PseudoRandom::MAX - sleepThreshold;
     static const unsigned minSleep = 10;
     static const unsigned maxSleep = 250;
@@ -92 +93 @@
     bool toQuit = false;
 
+    PseudoRandom random(seed);
     while(!toQuit) {
-#if TARGET_API_POSIX
-        int r = rand_r(&seed);
-#endif
-#if TARGET_API_WIN32
-        int r = rand();
-#endif
-        size_t toWrite = minToWrite +
-            static_cast<size_t>( static_cast<double>(r) *
-                                 rangeToWrite / RAND_MAX );
+        size_t toWrite = random.nextUnsigned(maxToWrite, minToWrite);
 
         size_t lastWriteLength = 0;
@@ -204 +198 @@
             }
 
-#if TARGET_API_POSIX
-            r = rand_r(&seed);
-#endif
-#if TARGET_API_WIN32
-            r = rand();
-#endif
+            int r = random.next();
             if (r>=sleepThreshold) {
                 unsigned toSleep = minSleep +