Use rnd() from testlib instead for rand() from libc, so that test case is repeatable.

Copied from Perforce
 Change: 182430
 ServerID: perforce.ravenbrook.com

2 files changed, 10 insertions, 11 deletions

diff --git a/mps/code/apss.c b/mps/code/apss.c
index e55a911a9a0..8821542cec8 100644
--- a/mps/code/apss.c
+++ b/mps/code/apss.c
@@ -16,8 +16,8 @@
 #include "testlib.h"
 #include "mpslib.h"
 
-#include <stdlib.h>
 #include <stdarg.h>
+#include <stdlib.h> /* malloc */
 
 
 #define testArenaSIZE   ((((size_t)3)<<24) - 4)
@@ -43,14 +43,14 @@ static mps_res_t make(mps_addr_t *p, mps_ap_t ap, size_t size)
 
 /* stress -- create a pool of the requested type and allocate in it */
 
-static mps_res_t stress(mps_class_t class, size_t (*size)(int i),
+static mps_res_t stress(mps_class_t class, size_t (*size)(unsigned long i),
                         mps_arena_t arena, ...)
 {
   mps_res_t res = MPS_RES_OK;
   mps_pool_t pool;
   mps_ap_t ap;
   va_list arg;
-  int i, k;
+  unsigned long i, k;
   int *ps[testSetSIZE];
   size_t ss[testSetSIZE];
 
@@ -78,7 +78,7 @@ static mps_res_t stress(mps_class_t class, size_t (*size)(int i),
   for (k=0; k<testLOOPS; ++k) {
     /* shuffle all the objects */
     for (i=0; i<testSetSIZE; ++i) {
-      int j = rand()%(testSetSIZE-i);
+      unsigned long j = rnd()%(testSetSIZE-i);
       void *tp;
       size_t ts;
      
@@ -119,7 +119,7 @@ allocFail:
 /* randomSizeAligned -- produce sizes both large and small,
  * aligned by platform alignment */
 
-static size_t randomSizeAligned(int i)
+static size_t randomSizeAligned(unsigned long i)
 {
   size_t maxSize = 2 * 160 * 0x2000;
   /* Reduce by a factor of 2 every 10 cycles.  Total allocation about 40 MB. */
diff --git a/mps/code/mv2test.c b/mps/code/mv2test.c
index 54b64d8792b..29e5606327a 100644
--- a/mps/code/mv2test.c
+++ b/mps/code/mv2test.c
@@ -5,7 +5,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include "mpstd.h"
 #include <time.h>
@@ -47,7 +46,7 @@ static size_t max;
 static int verbose = 0;
 static mps_pool_t pool;
 
-static size_t randomSize(int i)
+static size_t randomSize(unsigned long i)
 {
   /* Distribution centered on mean.  Verify that allocations
      below min and above max are handled correctly */
@@ -93,11 +92,11 @@ static mps_res_t make(mps_addr_t *p, mps_ap_t ap, size_t size)
 
 
 static mps_res_t stress(mps_class_t class, mps_arena_t arena,
-                        size_t (*size)(int i), mps_arg_s args[])
+                        size_t (*size)(unsigned long i), mps_arg_s args[])
 {
   mps_res_t res;
   mps_ap_t ap;
-  int i, k;
+  unsigned long i, k;
   int *ps[TEST_SET_SIZE];
   size_t ss[TEST_SET_SIZE];
 
@@ -127,10 +126,10 @@ static mps_res_t stress(mps_class_t class, mps_arena_t arena,
   }
 
   for (k=0; k<TEST_LOOPS; ++k) {
-    int x = rand()%(TEST_SET_SIZE-1);
+    unsigned long x = rnd()%(TEST_SET_SIZE-1);
     /* shuffle all the objects */
     for(i=0; i<TEST_SET_SIZE; ++i) {
-      int j = rand()%(TEST_SET_SIZE-i);
+      unsigned long j = rnd()%(TEST_SET_SIZE-i);
       void *tp;
       size_t ts;