diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml index f5a12c9a9d1..87b2507284a 100644 --- a/.github/workflows/generic-dev.yml +++ b/.github/workflows/generic-dev.yml @@ -55,11 +55,9 @@ jobs: CC=gcc-7 CFLAGS=-Werror make -j all make clean LDFLAGS=-Wl,--no-undefined make -C lib libzstd-mt - make -C tests zbufftest-dll # candidate test (to check) : underlink test # LDFLAGS=-Wl,--no-undefined : will make the linker fail if dll is underlinked - # zbufftest-dll : test that a user program can link to multi-threaded libzstd without specifying -pthread gcc-8-asan-ubsan-testzstd: runs-on: ubuntu-latest diff --git a/.github/workflows/generic-release.yml b/.github/workflows/generic-release.yml index 1ee26f31e73..cb91fb255c3 100644 --- a/.github/workflows/generic-release.yml +++ b/.github/workflows/generic-release.yml @@ -25,14 +25,6 @@ jobs: make test # make -c lib all (need to fix. not working right now) - zbuff: - runs-on: ubuntu-16.04 - steps: - - uses: actions/checkout@v2 - - name: zbuff test - run: | - make -C tests test-zbuff - tsan: runs-on: ubuntu-latest steps: diff --git a/build/VS2010/libzstd-dll/libzstd-dll.vcxproj b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj index 0957d413bf4..79ae9d32761 100644 --- a/build/VS2010/libzstd-dll/libzstd-dll.vcxproj +++ b/build/VS2010/libzstd-dll/libzstd-dll.vcxproj @@ -44,9 +44,6 @@ - - - @@ -69,7 +66,6 @@ - diff --git a/build/VS2010/libzstd/libzstd.vcxproj b/build/VS2010/libzstd/libzstd.vcxproj index 203429355f5..c4df5ddaa45 100644 --- a/build/VS2010/libzstd/libzstd.vcxproj +++ b/build/VS2010/libzstd/libzstd.vcxproj @@ -44,9 +44,6 @@ - - - @@ -69,7 +66,6 @@ - diff --git a/build/cmake/tests/.gitignore b/build/cmake/tests/.gitignore index 2ab62a3e1ef..ca2947f61f3 100644 --- a/build/cmake/tests/.gitignore +++ b/build/cmake/tests/.gitignore @@ -3,5 +3,4 @@ datagen fullbench fuzzer paramgrill -zbufftest diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build index 00488875370..053ece2ca05 100644 --- a/build/meson/lib/meson.build +++ b/build/meson/lib/meson.build @@ -45,10 +45,7 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'), join_paths(zstd_rootdir, 'lib/dictBuilder/cover.c'), join_paths(zstd_rootdir, 'lib/dictBuilder/fastcover.c'), join_paths(zstd_rootdir, 'lib/dictBuilder/divsufsort.c'), - join_paths(zstd_rootdir, 'lib/dictBuilder/zdict.c'), - join_paths(zstd_rootdir, 'lib/deprecated/zbuff_common.c'), - join_paths(zstd_rootdir, 'lib/deprecated/zbuff_compress.c'), - join_paths(zstd_rootdir, 'lib/deprecated/zbuff_decompress.c')] + join_paths(zstd_rootdir, 'lib/dictBuilder/zdict.c')] # Explicit define legacy support add_project_arguments('-DZSTD_LEGACY_SUPPORT=@0@'.format(legacy_level), diff --git a/contrib/VS2005/zstdlib/zstdlib.vcproj b/contrib/VS2005/zstdlib/zstdlib.vcproj index f77df786f26..30a02f584a8 100644 --- a/contrib/VS2005/zstdlib/zstdlib.vcproj +++ b/contrib/VS2005/zstdlib/zstdlib.vcproj @@ -371,18 +371,6 @@ RelativePath="..\..\..\lib\common\xxhash.c" > - - - - - - diff --git a/lib/Makefile b/lib/Makefile index fc14eaf83ff..6a26e6c7927 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -91,7 +91,7 @@ endif ZSTD_LIB_COMPRESSION ?= 1 ZSTD_LIB_DECOMPRESSION ?= 1 ZSTD_LIB_DICTBUILDER ?= 1 -ZSTD_LIB_DEPRECATED ?= 1 +ZSTD_LIB_DEPRECATED ?= 0 # Legacy support ZSTD_LEGACY_SUPPORT ?= 5 diff --git a/tests/Makefile b/tests/Makefile index c6268d35d6a..d80b4c4ef88 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -46,7 +46,6 @@ ZSTDCOMMON_FILES := $(ZSTDDIR)/common/*.c ZSTDCOMP_FILES := $(ZSTDDIR)/compress/*.c ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) -ZBUFF_FILES := $(ZSTDDIR)/deprecated/*.c ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c ZSTD_F1 := $(wildcard $(ZSTD_FILES)) @@ -160,15 +159,6 @@ fuzzer32 : $(ZSTD_FILES) fuzzer-dll : $(ZSTDDIR)/common/xxhash.c $(PRGDIR)/util.c $(PRGDIR)/timefn.c $(PRGDIR)/datagen.c fuzzer.c $(CC) $(CPPFLAGS) $(CFLAGS) $(filter %.c,$^) $(LDFLAGS) -o $@$(EXT) -zbufftest zbufftest32 zbufftest-dll : CPPFLAGS += -I$(ZSTDDIR)/deprecated -zbufftest zbufftest32 zbufftest-dll : CFLAGS += -Wno-deprecated-declarations # required to silence deprecation warnings -zbufftest32 : CFLAGS += -m32 -zbufftest zbufftest32 : $(ZSTD_OBJECTS) $(ZBUFF_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c $(PRGDIR)/datagen.c zbufftest.c - $(LINK.c) $^ -o $@$(EXT) - -zbufftest-dll : $(ZSTDDIR)/common/xxhash.c $(PRGDIR)/util.c $(PRGDIR)/timefn.c $(PRGDIR)/datagen.c zbufftest.c - $(CC) $(CPPFLAGS) $(CFLAGS) $(filter %.c,$^) $(LDFLAGS) -o $@$(EXT) - ZSTREAM_LOCAL_FILES := $(PRGDIR)/datagen.c $(PRGDIR)/util.c $(PRGDIR)/timefn.c seqgen.c zstreamtest.c ZSTREAM_PROPER_FILES := $(ZDICT_FILES) $(ZSTREAM_LOCAL_FILES) ZSTREAMFILES := $(ZSTD_FILES) $(ZSTREAM_PROPER_FILES) @@ -240,8 +230,8 @@ clean: $(PRGDIR)/zstd$(EXT) $(PRGDIR)/zstd32$(EXT) \ fullbench$(EXT) fullbench32$(EXT) \ fullbench-lib$(EXT) fullbench-dll$(EXT) \ - fuzzer$(EXT) fuzzer32$(EXT) zbufftest$(EXT) zbufftest32$(EXT) \ - fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT) \ + fuzzer$(EXT) fuzzer32$(EXT) \ + fuzzer-dll$(EXT) zstreamtest-dll$(EXT) \ zstreamtest$(EXT) zstreamtest32$(EXT) \ datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \ symbols$(EXT) invalidDictionaries$(EXT) legacy$(EXT) poolTests$(EXT) \ @@ -345,12 +335,6 @@ test-fuzzer-stackmode: test-fuzzer test-fuzzer32: fuzzer32 $(QEMU_SYS) ./fuzzer32 -v $(FUZZERTEST) $(FUZZER_FLAGS) -test-zbuff: zbufftest - $(QEMU_SYS) ./zbufftest $(ZSTREAM_TESTTIME) - -test-zbuff32: zbufftest32 - $(QEMU_SYS) ./zbufftest32 $(ZSTREAM_TESTTIME) - test-zstream: zstreamtest $(QEMU_SYS) ./zstreamtest -v $(ZSTREAM_TESTTIME) $(FUZZER_FLAGS) $(QEMU_SYS) ./zstreamtest --newapi -t1 $(ZSTREAM_TESTTIME) $(FUZZER_FLAGS) diff --git a/tests/libzstd_partial_builds.sh b/tests/libzstd_partial_builds.sh index bee2dbda526..05dad8f981f 100755 --- a/tests/libzstd_partial_builds.sh +++ b/tests/libzstd_partial_builds.sh @@ -21,7 +21,7 @@ mustBeAbsent() { $ECHO "$@ correctly not present" # for some reason, this $ECHO must exist, otherwise mustBeAbsent() always fails (??) } -# default compilation : all features enabled +# default compilation : all features enabled - no zbuff $ECHO "testing default library compilation" CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID nm $DIR/../lib/libzstd.a | $GREP "\.o" > tmplog @@ -29,10 +29,10 @@ isPresent "zstd_compress.o" isPresent "zstd_decompress.o" isPresent "zdict.o" isPresent "zstd_v07.o" -isPresent "zbuff_compress.o" +mustBeAbsent "zbuff_compress.o" $RM $DIR/../lib/libzstd.a tmplog -# compression disabled => also disable zdict and zbuff +# compression disabled => also disable zdict $ECHO "testing with compression disabled" ZSTD_LIB_COMPRESSION=0 CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID nm $DIR/../lib/libzstd.a | $GREP "\.o" > tmplog @@ -43,7 +43,7 @@ isPresent "zstd_v07.o" mustBeAbsent "zbuff_compress.o" $RM $DIR/../lib/libzstd.a tmplog -# decompression disabled => also disable legacy and zbuff +# decompression disabled => also disable legacy $ECHO "testing with decompression disabled" ZSTD_LIB_DECOMPRESSION=0 CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID nm $DIR/../lib/libzstd.a | $GREP "\.o" > tmplog @@ -65,6 +65,17 @@ isPresent "zstd_v07.o" mustBeAbsent "zbuff_compress.o" $RM $DIR/../lib/libzstd.a tmplog +# deprecated function enabled => zbuff present +$ECHO "testing with deprecated functions enabled" +ZSTD_LIB_DEPRECATED=1 CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID +nm $DIR/../lib/libzstd.a | $GREP "\.o" > tmplog +isPresent "zstd_compress.o" +isPresent "zstd_decompress.o" +isPresent "zdict.o" +isPresent "zstd_v07.o" +isPresent "zbuff_compress.o" +$RM $DIR/../lib/libzstd.a tmplog + # dictionary builder disabled => only remove zdict $ECHO "testing with dictionary builder disabled" ZSTD_LIB_DICTBUILDER=0 CFLAGS= make -C $DIR/../lib libzstd.a > $INTOVOID @@ -73,7 +84,7 @@ isPresent "zstd_compress.o" isPresent "zstd_decompress.o" mustBeAbsent "zdict.o" isPresent "zstd_v07.o" -isPresent "zbuff_compress.o" +mustBeAbsent "zbuff_compress.o" $RM $DIR/../lib/libzstd.a tmplog # both decompression and dictionary builder disabled => only compression remains diff --git a/tests/zbufftest.c b/tests/zbufftest.c deleted file mode 100644 index c67ee971782..00000000000 --- a/tests/zbufftest.c +++ /dev/null @@ -1,625 +0,0 @@ -/* - * Copyright (c) Yann Collet, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under both the BSD-style license (found in the - * LICENSE file in the root directory of this source tree) and the GPLv2 (found - * in the COPYING file in the root directory of this source tree). - * You may select, at your option, one of the above-listed licenses. - */ - - -/*-************************************ -* Compiler specific -**************************************/ -#ifdef _MSC_VER /* Visual Studio */ -# define _CRT_SECURE_NO_WARNINGS /* fgets */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# pragma warning(disable : 4146) /* disable: C4146: minus unsigned expression */ -#endif - - -/*-************************************ -* Includes -**************************************/ -#include /* free */ -#include /* fgets, sscanf */ -#include /* strcmp */ -#include "timefn.h" /* UTIL_time_t */ -#include "mem.h" -#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel */ -#include "zstd.h" /* ZSTD_compressBound */ -#define ZBUFF_STATIC_LINKING_ONLY /* ZBUFF_createCCtx_advanced */ -#include "zbuff.h" /* ZBUFF_isError */ -#include "datagen.h" /* RDG_genBuffer */ -#define XXH_STATIC_LINKING_ONLY -#include "xxhash.h" /* XXH64_* */ -#include "util.h" -#include "assert.h" - - -/*-************************************ -* Constants -**************************************/ -#define KB *(1U<<10) -#define MB *(1U<<20) -#define GB *(1U<<30) - -static const U32 nbTestsDefault = 10000; -#define COMPRESSIBLE_NOISE_LENGTH (10 MB) -#define FUZ_COMPRESSIBILITY_DEFAULT 50 -static const U32 prime1 = 2654435761U; -static const U32 prime2 = 2246822519U; - - - -/*-************************************ -* Display Macros -**************************************/ -#define DISPLAY(...) fprintf(stderr, __VA_ARGS__) -#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static U32 g_displayLevel = 2; - -static const U64 g_refreshRate = SEC_TO_MICRO / 6; -static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER; - -#define DISPLAYUPDATE(l, ...) if (g_displayLevel>=l) { \ - if ((UTIL_clockSpanMicro(g_displayClock) > g_refreshRate) || (g_displayLevel>=4)) \ - { g_displayClock = UTIL_getTime(); DISPLAY(__VA_ARGS__); \ - if (g_displayLevel>=4) fflush(stderr); } } - -static U64 g_clockTime = 0; - - -/*-******************************************************* -* Fuzzer functions -*********************************************************/ -#undef MIN -#undef MAX -#define MIN(a,b) ((a)<(b)?(a):(b)) -#define MAX(a,b) ((a)>(b)?(a):(b)) -/*! FUZ_rand() : - @return : a 27 bits random value, from a 32-bits `seed`. - `seed` is also modified */ -# define FUZ_rotl32(x,r) ((x << r) | (x >> (32 - r))) -static unsigned int FUZ_rand(unsigned int* seedPtr) -{ - U32 rand32 = *seedPtr; - rand32 *= prime1; - rand32 += prime2; - rand32 = FUZ_rotl32(rand32, 13); - *seedPtr = rand32; - return rand32 >> 5; -} - - -/* -static unsigned FUZ_highbit32(U32 v32) -{ - unsigned nbBits = 0; - if (v32==0) return 0; - for ( ; v32 ; v32>>=1) nbBits++; - return nbBits; -} -*/ - -static void* ZBUFF_allocFunction(void* opaque, size_t size) -{ - void* address = malloc(size); - (void)opaque; - /* DISPLAYLEVEL(4, "alloc %p, %d opaque=%p \n", address, (int)size, opaque); */ - return address; -} - -static void ZBUFF_freeFunction(void* opaque, void* address) -{ - (void)opaque; - /* if (address) DISPLAYLEVEL(4, "free %p opaque=%p \n", address, opaque); */ - free(address); -} - -static int basicUnitTests(U32 seed, double compressibility, ZSTD_customMem customMem) -{ - int testResult = 0; - size_t CNBufferSize = COMPRESSIBLE_NOISE_LENGTH; - void* CNBuffer = malloc(CNBufferSize); - size_t const skippableFrameSize = 11; - size_t const compressedBufferSize = (8 + skippableFrameSize) + ZSTD_compressBound(COMPRESSIBLE_NOISE_LENGTH); - void* compressedBuffer = malloc(compressedBufferSize); - size_t const decodedBufferSize = CNBufferSize; - void* decodedBuffer = malloc(decodedBufferSize); - size_t cSize, readSize, readSkipSize, genSize; - U32 testNb=0; - ZBUFF_CCtx* zc = ZBUFF_createCCtx_advanced(customMem); - ZBUFF_DCtx* zd = ZBUFF_createDCtx_advanced(customMem); - - /* Create compressible test buffer */ - if (!CNBuffer || !compressedBuffer || !decodedBuffer || !zc || !zd) { - DISPLAY("Not enough memory, aborting\n"); - goto _output_error; - } - RDG_genBuffer(CNBuffer, CNBufferSize, compressibility, 0., seed); - - /* generate skippable frame */ - MEM_writeLE32(compressedBuffer, ZSTD_MAGIC_SKIPPABLE_START); - MEM_writeLE32(((char*)compressedBuffer)+4, (U32)skippableFrameSize); - cSize = skippableFrameSize + 8; - - /* Basic compression test */ - DISPLAYLEVEL(4, "test%3i : compress %u bytes : ", testNb++, COMPRESSIBLE_NOISE_LENGTH); - ZBUFF_compressInitDictionary(zc, CNBuffer, 128 KB, 1); - readSize = CNBufferSize; - genSize = compressedBufferSize; - { size_t const r = ZBUFF_compressContinue(zc, ((char*)compressedBuffer)+cSize, &genSize, CNBuffer, &readSize); - if (ZBUFF_isError(r)) goto _output_error; } - if (readSize != CNBufferSize) goto _output_error; /* entire input should be consumed */ - cSize += genSize; - genSize = compressedBufferSize - cSize; - { size_t const r = ZBUFF_compressEnd(zc, ((char*)compressedBuffer)+cSize, &genSize); - if (r != 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); - - /* skippable frame test */ - DISPLAYLEVEL(4, "test%3i : decompress skippable frame : ", testNb++); - ZBUFF_decompressInitDictionary(zd, CNBuffer, 128 KB); - readSkipSize = cSize; - genSize = CNBufferSize; - { size_t const r = ZBUFF_decompressContinue(zd, decodedBuffer, &genSize, compressedBuffer, &readSkipSize); - if (r != 0) goto _output_error; } - if (genSize != 0) goto _output_error; /* skippable frame len is 0 */ - DISPLAYLEVEL(4, "OK \n"); - - /* Basic decompression test */ - DISPLAYLEVEL(4, "test%3i : decompress %u bytes : ", testNb++, COMPRESSIBLE_NOISE_LENGTH); - ZBUFF_decompressInitDictionary(zd, CNBuffer, 128 KB); - readSize = cSize - readSkipSize; - genSize = CNBufferSize; - { size_t const r = ZBUFF_decompressContinue(zd, decodedBuffer, &genSize, ((char*)compressedBuffer)+readSkipSize, &readSize); - if (r != 0) goto _output_error; } /* should reach end of frame == 0; otherwise, some data left, or an error */ - if (genSize != CNBufferSize) goto _output_error; /* should regenerate the same amount */ - if (readSize+readSkipSize != cSize) goto _output_error; /* should have read the entire frame */ - DISPLAYLEVEL(4, "OK \n"); - - DISPLAYLEVEL(4, "test%3i : ZBUFF_recommendedCInSize : ", testNb++); { assert(ZBUFF_recommendedCInSize() != 0); } DISPLAYLEVEL(4, "OK \n"); - DISPLAYLEVEL(4, "test%3i : ZBUFF_recommendedCOutSize : ", testNb++); { assert(ZBUFF_recommendedCOutSize() != 0); } DISPLAYLEVEL(4, "OK \n"); - DISPLAYLEVEL(4, "test%3i : ZBUFF_recommendedDInSize : ", testNb++); { assert(ZBUFF_recommendedDInSize() != 0); } DISPLAYLEVEL(4, "OK \n"); - DISPLAYLEVEL(4, "test%3i : ZBUFF_recommendedDOutSize : ", testNb++); { assert(ZBUFF_recommendedDOutSize() != 0); } DISPLAYLEVEL(4, "OK \n"); - - /* check regenerated data is byte exact */ - DISPLAYLEVEL(4, "test%3i : check decompressed result : ", testNb++); - { size_t i; - for (i=0; i "); DISPLAY(__VA_ARGS__); \ - DISPLAY(" (seed %u, test nb %u) \n", seed, testNb); goto _output_error; } - -static int fuzzerTests(U32 seed, U32 nbTests, unsigned startTest, double compressibility) -{ - static const U32 maxSrcLog = 24; - static const U32 maxSampleLog = 19; - BYTE* cNoiseBuffer[5]; - size_t const srcBufferSize = (size_t)1<= testNb) DISPLAYUPDATE(2, "/%6u ", nbTests); - FUZ_rand(&coreSeed); - lseed = coreSeed ^ prime1; - - /* states full reset (unsynchronized) */ - /* some issues only happen when reusing states in a specific sequence of parameters */ - if ((FUZ_rand(&lseed) & 0xFF) == 131) { ZBUFF_freeCCtx(zc); zc = ZBUFF_createCCtx(); } - if ((FUZ_rand(&lseed) & 0xFF) == 132) { ZBUFF_freeDCtx(zd); zd = ZBUFF_createDCtx(); } - - /* srcBuffer selection [0-4] */ - { U32 buffNb = FUZ_rand(&lseed) & 0x7F; - if (buffNb & 7) buffNb=2; /* most common : compressible (P) */ - else { - buffNb >>= 3; - if (buffNb & 7) { - const U32 tnb[2] = { 1, 3 }; /* barely/highly compressible */ - buffNb = tnb[buffNb >> 3]; - } else { - const U32 tnb[2] = { 0, 4 }; /* not compressible / sparse */ - buffNb = tnb[buffNb >> 3]; - } } - srcBuffer = cNoiseBuffer[buffNb]; - } - - /* compression init */ - { U32 const testLog = FUZ_rand(&lseed) % maxSrcLog; - U32 const cLevel = (FUZ_rand(&lseed) % (ZSTD_maxCLevel() - (testLog/3))) + 1; - maxTestSize = FUZ_rLogLength(&lseed, testLog); - dictSize = (FUZ_rand(&lseed)==1) ? FUZ_randomLength(&lseed, maxSampleLog) : 0; - /* random dictionary selection */ - { size_t const dictStart = FUZ_rand(&lseed) % (srcBufferSize - dictSize); - dict = srcBuffer + dictStart; - } - { ZSTD_parameters params = ZSTD_getParams(cLevel, 0, dictSize); - params.fParams.checksumFlag = FUZ_rand(&lseed) & 1; - params.fParams.noDictIDFlag = FUZ_rand(&lseed) & 1; - { size_t const initError = ZBUFF_compressInit_advanced(zc, dict, dictSize, params, ZSTD_CONTENTSIZE_UNKNOWN); - CHECK (ZBUFF_isError(initError),"init error : %s", ZBUFF_getErrorName(initError)); - } } } - - /* multi-segments compression test */ - XXH64_reset(&xxhState, 0); - nbChunks = (FUZ_rand(&lseed) & 127) + 2; - for (n=0, cSize=0, totalTestSize=0 ; (n= remainingToFlush; - remainingToFlush = ZBUFF_compressEnd(zc, cBuffer+cSize, &dstBuffSize); - CHECK (ZBUFF_isError(remainingToFlush), "flush error : %s", ZBUFF_getErrorName(remainingToFlush)); - CHECK (enoughDstSize && remainingToFlush, "ZBUFF_compressEnd() not fully flushed (%u remaining), but enough space available", (U32)remainingToFlush); - cSize += dstBuffSize; - } } - crcOrig = XXH64_digest(&xxhState); - - /* multi - fragments decompression test */ - ZBUFF_decompressInitDictionary(zd, dict, dictSize); - errorCode = 1; - for (totalCSize = 0, totalGenSize = 0 ; errorCode ; ) { - size_t readCSrcSize = FUZ_randomLength(&lseed, maxSampleLog); - size_t const randomDstSize = FUZ_randomLength(&lseed, maxSampleLog); - size_t dstBuffSize = MIN(dstBufferSize - totalGenSize, randomDstSize); - errorCode = ZBUFF_decompressContinue(zd, dstBuffer+totalGenSize, &dstBuffSize, cBuffer+totalCSize, &readCSrcSize); - CHECK (ZBUFF_isError(errorCode), "decompression error : %s", ZBUFF_getErrorName(errorCode)); - totalGenSize += dstBuffSize; - totalCSize += readCSrcSize; - } - CHECK (errorCode != 0, "frame not fully decoded"); - CHECK (totalGenSize != totalTestSize, "decompressed data : wrong size") - CHECK (totalCSize != cSize, "compressed data should be fully read") - { U64 const crcDest = XXH64(dstBuffer, totalTestSize, 0); - if (crcDest!=crcOrig) findDiff(copyBuffer, dstBuffer, totalTestSize); - CHECK (crcDest!=crcOrig, "decompressed data corrupted"); } - - /*===== noisy/erroneous src decompression test =====*/ - - /* add some noise */ - { U32 const nbNoiseChunks = (FUZ_rand(&lseed) & 7) + 2; - U32 nn; for (nn=0; nn='0') && (*argument<='9')) { - nbTests *= 10; - nbTests += *argument - '0'; - argument++; - } - break; - - case 'T': - argument++; - nbTests=0; g_clockTime=0; - while ((*argument>='0') && (*argument<='9')) { - g_clockTime *= 10; - g_clockTime += *argument - '0'; - argument++; - } - if (*argument=='m') g_clockTime *=60, argument++; - if (*argument=='n') argument++; - g_clockTime *= SEC_TO_MICRO; - break; - - case 's': - argument++; - seed=0; - seedset=1; - while ((*argument>='0') && (*argument<='9')) { - seed *= 10; - seed += *argument - '0'; - argument++; - } - break; - - case 't': - argument++; - testNb=0; - while ((*argument>='0') && (*argument<='9')) { - testNb *= 10; - testNb += *argument - '0'; - argument++; - } - break; - - case 'P': /* compressibility % */ - argument++; - proba=0; - while ((*argument>='0') && (*argument<='9')) { - proba *= 10; - proba += *argument - '0'; - argument++; - } - if (proba<0) proba=0; - if (proba>100) proba=100; - break; - - default: - return FUZ_usage(programName); - } - } } } /* for(argNb=1; argNb