fixed g++ warning

diff --git a/programs/Makefile b/programs/Makefile
index a0cad24c13ea4dfe1ced4fc70de68c8be0936510..a8ca605cd428f9b3341fb5abed5c400a5e17c057 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -53,6 +53,8 @@ EXT =
 VOID = /dev/null
 endif
 
+ZBUFFTEST = -T2mn
+
 .PHONY: default all clean install uninstall test test32 test-all
 
 default: zstd
@@ -240,10 +242,10 @@ test-fuzzer32: fuzzer32
        ./fuzzer32
 
 test-zbuff: zbufftest
-       ./zbufftest
+       ./zbufftest $(ZBUFFTEST)
 
 test-zbuff32: zbufftest32
-       ./zbufftest32
+       ./zbufftest32 $(ZBUFFTEST)
 
 valgrindTest: zstd datagen fuzzer fullbench
        @echo "\n ---- valgrind tests : memory analyzer ----"

diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index 717c4bce30af352f12755c7a923f4fe36cdbb801..b6fd7530bbb5cf7a108c1200bae142d037b5935f 100644 (file)
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -80,11 +80,13 @@ static const U32 prime2 = 2246822519U;
 static U32 g_displayLevel = 2;
 
 #define DISPLAYUPDATE(l, ...) if (g_displayLevel>=l) { \
-            if ((FUZ_GetMilliSpan(g_time) > g_refreshRate) || (g_displayLevel>=4)) \
-            { g_time = FUZ_GetMilliStart(); DISPLAY(__VA_ARGS__); \
+            if ((FUZ_GetMilliSpan(g_displayTime) > g_refreshRate) || (g_displayLevel>=4)) \
+            { g_displayTime = FUZ_GetMilliStart(); DISPLAY(__VA_ARGS__); \
             if (g_displayLevel>=4) fflush(stdout); } }
 static const U32 g_refreshRate = 150;
-static U32 g_time = 0;
+static U32 g_displayTime = 0;
+
+static U32 g_testTime = 0;
 
 
 /*********************************************************
@@ -170,7 +172,7 @@ static int basicUnitTests(U32 seed, double compressibility)
     if (readSize != CNBufferSize) goto _output_error;   /* entire input should be consumed */
     cSize = genSize;
     genSize = compressedBufferSize - cSize;
-    result = ZBUFF_compressEnd(zc, compressedBuffer+cSize, &genSize);
+    result = ZBUFF_compressEnd(zc, ((char*)compressedBuffer)+cSize, &genSize);
     if (result != 0) goto _output_error;   /* error, or some data not flushed */
     cSize += genSize;
     DISPLAYLEVEL(4, "OK (%u bytes : %.2f%%)\n", (U32)cSize, (double)cSize/COMPRESSIBLE_NOISE_LENGTH*100);
@@ -247,6 +249,7 @@ int fuzzerTests(U32 seed, U32 nbTests, unsigned startTest, double compressibilit
     ZBUFF_CCtx* zc;
     ZBUFF_DCtx* zd;
     XXH64_state_t crc64;
+    U32 startTime = FUZ_GetMilliStart();
 
     /* allocation */
     zc = ZBUFF_createCCtx();
@@ -276,7 +279,7 @@ int fuzzerTests(U32 seed, U32 nbTests, unsigned startTest, double compressibilit
         FUZ_rand(&coreSeed);
 
     /* test loop */
-    for ( ; testNb <= nbTests; testNb++ )
+    for ( ; (testNb <= nbTests) || (FUZ_GetMilliSpan(startTime) < g_testTime); testNb++ )
     {
         size_t sampleSize, sampleStart;
         size_t cSize;
@@ -369,7 +372,7 @@ int fuzzerTests(U32 seed, U32 nbTests, unsigned startTest, double compressibilit
         /* noisy/erroneous src decompression test */
         /* TBD later */
     }
-    DISPLAY("\rAll fuzzer tests completed   \n");
+    DISPLAY("\r%u fuzzer tests completed   \n", testNb);
 
 _cleanup:
     ZBUFF_freeCCtx(zc);
@@ -456,7 +459,7 @@ int main(int argc, char** argv)
 
                 case 'i':
                     argument++;
-                    nbTests=0;
+                    nbTests=0; g_testTime=0;
                     while ((*argument>='0') && (*argument<='9'))
                     {
                         nbTests *= 10;
@@ -465,6 +468,20 @@ int main(int argc, char** argv)
                     }
                     break;
 
+                case 'T':
+                    argument++;
+                    nbTests=0; g_testTime=0;
+                    while ((*argument>='0') && (*argument<='9'))
+                    {
+                        g_testTime *= 10;
+                        g_testTime += *argument - '0';
+                        argument++;
+                    }
+                    if (*argument=='m') g_testTime *=60, argument++;
+                    if (*argument=='n') argument++;
+                    g_testTime *= 1000;
+                    break;
+
                 case 's':
                     argument++;
                     seed=0;