zstreamtest depends only on standard C time.h
diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c
index f021974..c49e9d9 100644
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -23,13 +23,13 @@
**************************************/
#include <stdlib.h> /* free */
#include <stdio.h> /* fgets, sscanf */
-#include <sys/timeb.h> /* timeb */
+#include <time.h> /* clock_t, clock() */
#include <string.h> /* strcmp */
#include "mem.h"
-#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel */
+#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel, ZSTD_customMem */
#include "zstd.h" /* ZSTD_compressBound */
#include "datagen.h" /* RDG_genBuffer */
-#define XXH_STATIC_LINKING_ONLY
+#define XXH_STATIC_LINKING_ONLY /* XXH64_state_t */
#include "xxhash.h" /* XXH64_* */
@@ -55,13 +55,13 @@
static U32 g_displayLevel = 2;
#define DISPLAYUPDATE(l, ...) if (g_displayLevel>=l) { \
- if ((FUZ_GetMilliSpan(g_displayTime) > g_refreshRate) || (g_displayLevel>=4)) \
- { g_displayTime = FUZ_GetMilliStart(); DISPLAY(__VA_ARGS__); \
+ if ((FUZ_GetClockSpan(g_displayClock) > g_refreshRate) || (g_displayLevel>=4)) \
+ { g_displayClock = clock(); DISPLAY(__VA_ARGS__); \
if (g_displayLevel>=4) fflush(stdout); } }
-static const U32 g_refreshRate = 150;
-static U32 g_displayTime = 0;
+static const clock_t g_refreshRate = CLOCKS_PER_SEC * 15 / 100;
+static clock_t g_displayClock = 0;
-static U32 g_testTime = 0;
+static clock_t g_clockTime = 0;
/*-*******************************************************
@@ -69,22 +69,9 @@
*********************************************************/
#define MAX(a,b) ((a)>(b)?(a):(b))
-static U32 FUZ_GetMilliStart(void)
+static clock_t FUZ_GetClockSpan(clock_t clockStart)
{
- struct timeb tb;
- U32 nCount;
- ftime( &tb );
- nCount = (U32) (((tb.time & 0xFFFFF) * 1000) + tb.millitm);
- return nCount;
-}
-
-static U32 FUZ_GetMilliSpan(U32 nTimeStart)
-{
- U32 const nCurrent = FUZ_GetMilliStart();
- U32 nSpan = nCurrent - nTimeStart;
- if (nTimeStart > nCurrent)
- nSpan += 0x100000 * 1000;
- return nSpan;
+ return clock() - clockStart; /* works even when overflow. Max span ~ 30 mn */
}
/*! FUZ_rand() :
@@ -336,7 +323,7 @@
U32 coreSeed = seed;
ZSTD_CStream* zc;
ZSTD_DStream* zd;
- U32 startTime = FUZ_GetMilliStart();
+ clock_t startClock = clock();
/* allocations */
zc = ZSTD_createCStream();
@@ -366,7 +353,7 @@
FUZ_rand(&coreSeed);
/* test loop */
- for ( ; (testNb <= nbTests) || (FUZ_GetMilliSpan(startTime) < g_testTime) ; testNb++ ) {
+ for ( ; (testNb <= nbTests) || (FUZ_GetClockSpan(startClock) < g_clockTime) ; testNb++ ) {
U32 lseed;
const BYTE* srcBuffer;
const BYTE* dict;
@@ -594,7 +581,7 @@
case 'i':
argument++;
- nbTests=0; g_testTime=0;
+ nbTests=0; g_clockTime=0;
while ((*argument>='0') && (*argument<='9')) {
nbTests *= 10;
nbTests += *argument - '0';
@@ -604,15 +591,15 @@
case 'T':
argument++;
- nbTests=0; g_testTime=0;
+ nbTests=0; g_clockTime=0;
while ((*argument>='0') && (*argument<='9')) {
- g_testTime *= 10;
- g_testTime += *argument - '0';
+ g_clockTime *= 10;
+ g_clockTime += *argument - '0';
argument++;
}
- if (*argument=='m') g_testTime *=60, argument++;
+ if (*argument=='m') g_clockTime *=60, argument++;
if (*argument=='n') argument++;
- g_testTime *= 1000;
+ g_clockTime *= CLOCKS_PER_SEC;
break;
case 's':
@@ -656,7 +643,12 @@
/* Get Seed */
DISPLAY("Starting zstream tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), ZSTD_VERSION_STRING);
- if (!seedset) seed = FUZ_GetMilliStart() % 10000;
+ if (!seedset) {
+ time_t const t = time(NULL);
+ U32 const h = XXH32(&t, sizeof(t), 1);
+ seed = h % 10000;
+ }
+
DISPLAY("Seed = %u\n", seed);
if (proba!=FUZ_COMPRESSIBILITY_DEFAULT) DISPLAY("Compressibility : %i%%\n", proba);