@@ -92,6 +92,10 @@ static __inline void srand48(long seed) {
92
92
x = seed ;
93
93
}
94
94
95
+ #ifndef RAND_MAX
96
+ //#define RAND_MAX 0x7fffffff
97
+ #endif
98
+
95
99
static __inline long lrand48 (void ) {
96
100
return next () & 0x7fffffff ;
97
101
// int x;
@@ -132,7 +136,7 @@ static void fill_random(int64_t *dst, const int size) {
132
136
int i ;
133
137
134
138
for (i = 0 ; i < size ; i ++ ) {
135
- // dst[i] = lrand48();
139
+ dst [i ] = lrand48 ();
136
140
}
137
141
}
138
142
@@ -288,7 +292,7 @@ int run_tests(int64_t *sizes, int sizes_cnt, int type) {
288
292
double usec1 , usec2 , diff ;
289
293
int64_t * dst = (int64_t * )malloc (MAXSIZE * sizeof (int64_t ));
290
294
printf ("-------\nRunning tests with %s:\n-------\n" , test_names [type ]);
291
- TEST_SORT_H (quick_sort );
295
+ // TEST_SORT_H(quick_sort);
292
296
TEST_SORT_H (merge_sort );
293
297
//TEST_STDLIB(qsort);
294
298
// #if !defined(__linux__) && !defined(__CYGWIN__) && !defined(_WIN32)
@@ -432,10 +436,10 @@ int main(void) {
432
436
int64_t sizes [TESTS ];
433
437
srand48 (SEED );
434
438
//stable_tests();
435
- // fill_random(sizes, TESTS);
439
+ fill_random (sizes , TESTS );
436
440
437
441
for (i = 0 ; i < TESTS ; i ++ ) {
438
- // RAND_RANGE(sizes[i], 1, MAXSIZE);
442
+ RAND_RANGE (sizes [i ], 1 , MAXSIZE );
439
443
}
440
444
441
445
sizes [TESTS - 1 ] = MAXSIZE ;
0 commit comments