lz4c : automatic output name when decoding a *.lz4 file, as requested by Peter Humphreys

Cleaner C99 detection, thanks to Elad
Modified Basic Types, as recommended by Wayne Scott
Simplified compression function
Corrected : warning on missing #undef in lz4hc, thanks Arseny Kapoulkine
Modified length loops as suggested by Wouter Vermaelen
Modified pragma pack directive for older versions of GCC, as reported by Peter Costello
Updated xxHash to r29
Indent lz4hc.c with spaces 

git-svn-id: https://lz4.googlecode.com/svn/trunk@95 650e7d94-2a16-8b24-b05c-7c0b3f6821cd

1 files changed, 193 insertions, 193 deletions

diff --git a/bench.c b/bench.c
index ca26369..669c584 100644
--- a/bench.c
+++ b/bench.c
@@ -1,7 +1,7 @@
 /*

     bench.c - Demo program to benchmark open-source compression algorithm

     Copyright (C) Yann Collet 2012-2013

-	GPL v2 License

+    GPL v2 License

 

     This program is free software; you can redistribute it and/or modify

     it under the terms of the GNU General Public License as published by

@@ -17,9 +17,9 @@
     with this program; if not, write to the Free Software Foundation, Inc.,

     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 

-	You can contact the author at :

-	- LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html

-	- LZ4 source repository : http://code.google.com/p/lz4/

+    You can contact the author at :

+    - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html

+    - LZ4 source repository : http://code.google.com/p/lz4/

 */

 

 //**************************************

@@ -77,19 +77,19 @@
 //**************************************

 // Basic Types

 //**************************************

-#if defined(_MSC_VER)    // Visual Studio does not support 'stdint' natively

-#define BYTE	unsigned __int8

-#define U16		unsigned __int16

-#define U32		unsigned __int32

-#define S32		__int32

-#define U64		unsigned __int64

+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   // C99

+# include <stdint.h>

+  typedef uint8_t  BYTE;

+  typedef uint16_t U16;

+  typedef uint32_t U32;

+  typedef  int32_t S32;

+  typedef uint64_t U64;

 #else

-#include <stdint.h>

-#define BYTE	uint8_t

-#define U16		uint16_t

-#define U32		uint32_t

-#define S32		int32_t

-#define U64		uint64_t

+  typedef unsigned char       BYTE;

+  typedef unsigned short      U16;

+  typedef unsigned int        U32;

+  typedef   signed int        S32;

+  typedef unsigned long long  U64;

 #endif

 

 

@@ -109,17 +109,17 @@
 //**************************************

 struct chunkParameters

 {

-	U32   id;

-	char* origBuffer;

-	char* compressedBuffer;

-	int   origSize;

-	int   compressedSize;

+    U32   id;

+    char* origBuffer;

+    char* compressedBuffer;

+    int   origSize;

+    int   compressedSize;

 };

 

 struct compressionParameters

 {

-	int (*compressionFunction)(const char*, char*, int);

-	int (*decompressionFunction)(const char*, char*, int);

+    int (*compressionFunction)(const char*, char*, int);

+    int (*decompressionFunction)(const char*, char*, int);

 };

 

 

@@ -139,14 +139,14 @@ static int BMK_pause = 0;
 

 void BMK_SetBlocksize(int bsize)

 {

-	chunkSize = bsize;

-	DISPLAY("-Using Block Size of %i KB-\n", chunkSize>>10);

+    chunkSize = bsize;

+    DISPLAY("-Using Block Size of %i KB-\n", chunkSize>>10);

 }

 

 void BMK_SetNbIterations(int nbLoops)

 {

-	nbIterations = nbLoops;

-	DISPLAY("- %i iterations -\n", nbIterations);

+    nbIterations = nbLoops;

+    DISPLAY("- %i iterations -\n", nbIterations);

 }

 

 void BMK_SetPause()

@@ -199,36 +199,36 @@ static int BMK_GetMilliSpan( int nTimeStart )
 

 static size_t BMK_findMaxMem(U64 requiredMem)

 {

-	size_t step = (64U<<20);   // 64 MB

-	BYTE* testmem=NULL;

+    size_t step = (64U<<20);   // 64 MB

+    BYTE* testmem=NULL;

 

-	requiredMem = (((requiredMem >> 25) + 1) << 26);

-	if (requiredMem > MAX_MEM) requiredMem = MAX_MEM;

+    requiredMem = (((requiredMem >> 25) + 1) << 26);

+    if (requiredMem > MAX_MEM) requiredMem = MAX_MEM;

 

-	requiredMem += 2*step;

-	while (!testmem)

-	{

-		requiredMem -= step;

-		testmem = malloc ((size_t)requiredMem);

-	}

+    requiredMem += 2*step;

+    while (!testmem)

+    {

+        requiredMem -= step;

+        testmem = malloc ((size_t)requiredMem);

+    }

 

-	free (testmem);

-	return (size_t) (requiredMem - step);

+    free (testmem);

+    return (size_t) (requiredMem - step);

 }

 

 

 static U64 BMK_GetFileSize(char* infilename)

 {

-	int r;

+    int r;

 #if defined(_MSC_VER)

-	struct _stat64 statbuf;

-	r = _stat64(infilename, &statbuf);

+    struct _stat64 statbuf;

+    r = _stat64(infilename, &statbuf);

 #else

-	struct stat statbuf;

-	r = stat(infilename, &statbuf);

+    struct stat statbuf;

+    r = stat(infilename, &statbuf);

 #endif

-	if (r || !S_ISREG(statbuf.st_mode)) return 0;   // No good...

-	return (U64)statbuf.st_size;

+    if (r || !S_ISREG(statbuf.st_mode)) return 0;   // No good...

+    return (U64)statbuf.st_size;

 }

 

 

@@ -274,156 +274,156 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel)
   // Loop for each file

   while (fileIdx<nbFiles)

   {

-	  // Check file existence

-	  infilename = fileNamesTable[fileIdx++];

-	  fileIn = fopen( infilename, "rb" );

-	  if (fileIn==NULL)

-	  {

-		DISPLAY( "Pb opening %s\n", infilename);

-		return 11;

-	  }

-

-	  // Memory allocation & restrictions

-	  largefilesize = BMK_GetFileSize(infilename);

-	  benchedSize = (size_t) BMK_findMaxMem(largefilesize) / 2;

-	  if ((U64)benchedSize > largefilesize) benchedSize = (size_t)largefilesize;

-	  if (benchedSize < largefilesize)

-	  {

-		  DISPLAY("Not enough memory for '%s' full size; testing %i MB only...\n", infilename, (int)(benchedSize>>20));

-	  }

-

-	  // Alloc

-	  chunkP = (struct chunkParameters*) malloc(((benchedSize / chunkSize)+1) * sizeof(struct chunkParameters));

-	  orig_buff = malloc((size_t )benchedSize);

-	  nbChunks = (int) (benchedSize / chunkSize) + 1;

-	  maxCChunkSize = LZ4_compressBound(chunkSize);

-	  compressed_buff_size = nbChunks * maxCChunkSize;

-	  compressed_buff = malloc((size_t )compressed_buff_size);

-

-

-	  if(!orig_buff || !compressed_buff)

-	  {

-		DISPLAY("\nError: not enough memory!\n");

-		free(orig_buff);

-		free(compressed_buff);

-		fclose(fileIn);

-		return 12;

-	  }

-

-	  // Init chunks data

-	  {

-		  int i;

-		  size_t remaining = benchedSize;

-		  char* in = orig_buff;

-		  char* out = compressed_buff;

-		  for (i=0; i<nbChunks; i++)

-		  {

-			  chunkP[i].id = i;

-			  chunkP[i].origBuffer = in; in += chunkSize;

-			  if ((int)remaining > chunkSize) { chunkP[i].origSize = chunkSize; remaining -= chunkSize; } else { chunkP[i].origSize = (int)remaining; remaining = 0; }

-			  chunkP[i].compressedBuffer = out; out += maxCChunkSize;

-			  chunkP[i].compressedSize = 0;

-		  }

-	  }

-

-	  // Fill input buffer

-	  DISPLAY("Loading %s...       \r", infilename);

-	  readSize = fread(orig_buff, 1, benchedSize, fileIn);

-	  fclose(fileIn);

-

-	  if(readSize != benchedSize)

-	  {

-		DISPLAY("\nError: problem reading file '%s' !!    \n", infilename);

-		free(orig_buff);

-		free(compressed_buff);

-		return 13;

-	  }

-

-	  // Calculating input Checksum

-	  crcc = XXH32(orig_buff, (unsigned int)benchedSize,0);

-

-

-	  // Bench

-	  {

-		int loopNb, nb_loops, chunkNb;

-		size_t cSize=0;

-	    int milliTime;

-		double fastestC = 100000000., fastestD = 100000000.;

-		double ratio=0.;

-

-		DISPLAY("\r%79s\r", "");

-		for (loopNb = 1; loopNb <= nbIterations; loopNb++)

-		{

-		  // Compression

-		  DISPLAY("%1i-%-14.14s : %9i ->\r", loopNb, infilename, (int)benchedSize);

-		  { size_t i; for (i=0; i<benchedSize; i++) compressed_buff[i]=(char)i; }     // warmimg up memory

-

-		  nb_loops = 0;

-		  milliTime = BMK_GetMilliStart();

-		  while(BMK_GetMilliStart() == milliTime);

-		  milliTime = BMK_GetMilliStart();

-		  while(BMK_GetMilliSpan(milliTime) < TIMELOOP)

-		  {

-			for (chunkNb=0; chunkNb<nbChunks; chunkNb++)

-				chunkP[chunkNb].compressedSize = compP.compressionFunction(chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origSize);

-			nb_loops++;

-		  }

-		  milliTime = BMK_GetMilliSpan(milliTime);

-

-		  if ((double)milliTime < fastestC*nb_loops) fastestC = (double)milliTime/nb_loops;

-		  cSize=0; for (chunkNb=0; chunkNb<nbChunks; chunkNb++) cSize += chunkP[chunkNb].compressedSize;

-		  ratio = (double)cSize/(double)benchedSize*100.;

-

-		  DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s\r", loopNb, infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000.);

-

-		  // Decompression

-		  { size_t i; for (i=0; i<benchedSize; i++) orig_buff[i]=0; }     // zeroing area, for CRC checking

-

-		  nb_loops = 0;

-		  milliTime = BMK_GetMilliStart();

-		  while(BMK_GetMilliStart() == milliTime);

-		  milliTime = BMK_GetMilliStart();

-		  while(BMK_GetMilliSpan(milliTime) < TIMELOOP)

-		  {

-			for (chunkNb=0; chunkNb<nbChunks; chunkNb++)

-				chunkP[chunkNb].origSize = LZ4_decompress_safe(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

-				//chunkP[chunkNb].compressedSize = LZ4_decompress_fast(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

-				//chunkP[chunkNb].compressedSize = LZ4_decompress_fast_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

-				//chunkP[chunkNb].origSize = LZ4_decompress_safe_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

-				//chunkP[chunkNb].compressedSize = LZ4_uncompress(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

-				//chunkP[chunkNb].origSize = LZ4_uncompress_unknownOutputSize(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

-			nb_loops++;

-		  }

-		  milliTime = BMK_GetMilliSpan(milliTime);

-

-		  if ((double)milliTime < fastestD*nb_loops) fastestD = (double)milliTime/nb_loops;

-		  DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\r", loopNb, infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

-

-		  // CRC Checking

-		  crcd = XXH32(orig_buff, (unsigned int)benchedSize,0);

-		  if (crcc!=crcd) { DISPLAY("\n!!! WARNING !!! %14s : Invalid Checksum : %x != %x\n", infilename, (unsigned)crcc, (unsigned)crcd); break; }

-		}

-

-	    if (crcc==crcd)

-		{

-			if (ratio<100.)

-				DISPLAY("%-16.16s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\n", infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

-			else

-				DISPLAY("%-16.16s : %9i -> %9i (%5.1f%%),%7.1f MB/s ,%7.1f MB/s \n", infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

-		}

-		totals += benchedSize;

-		totalz += cSize;

-		totalc += fastestC;

-		totald += fastestD;

-	  }

-

-	  free(orig_buff);

-	  free(compressed_buff);

-	  free(chunkP);

+      // Check file existence

+      infilename = fileNamesTable[fileIdx++];

+      fileIn = fopen( infilename, "rb" );

+      if (fileIn==NULL)

+      {

+        DISPLAY( "Pb opening %s\n", infilename);

+        return 11;

+      }

+

+      // Memory allocation & restrictions

+      largefilesize = BMK_GetFileSize(infilename);

+      benchedSize = (size_t) BMK_findMaxMem(largefilesize) / 2;

+      if ((U64)benchedSize > largefilesize) benchedSize = (size_t)largefilesize;

+      if (benchedSize < largefilesize)

+      {

+          DISPLAY("Not enough memory for '%s' full size; testing %i MB only...\n", infilename, (int)(benchedSize>>20));

+      }

+

+      // Alloc

+      chunkP = (struct chunkParameters*) malloc(((benchedSize / chunkSize)+1) * sizeof(struct chunkParameters));

+      orig_buff = malloc((size_t )benchedSize);

+      nbChunks = (int) (benchedSize / chunkSize) + 1;

+      maxCChunkSize = LZ4_compressBound(chunkSize);

+      compressed_buff_size = nbChunks * maxCChunkSize;

+      compressed_buff = malloc((size_t )compressed_buff_size);

+

+

+      if(!orig_buff || !compressed_buff)

+      {

+        DISPLAY("\nError: not enough memory!\n");

+        free(orig_buff);

+        free(compressed_buff);

+        fclose(fileIn);

+        return 12;

+      }

+

+      // Init chunks data

+      {

+          int i;

+          size_t remaining = benchedSize;

+          char* in = orig_buff;

+          char* out = compressed_buff;

+          for (i=0; i<nbChunks; i++)

+          {

+              chunkP[i].id = i;

+              chunkP[i].origBuffer = in; in += chunkSize;

+              if ((int)remaining > chunkSize) { chunkP[i].origSize = chunkSize; remaining -= chunkSize; } else { chunkP[i].origSize = (int)remaining; remaining = 0; }

+              chunkP[i].compressedBuffer = out; out += maxCChunkSize;

+              chunkP[i].compressedSize = 0;

+          }

+      }

+

+      // Fill input buffer

+      DISPLAY("Loading %s...       \r", infilename);

+      readSize = fread(orig_buff, 1, benchedSize, fileIn);

+      fclose(fileIn);

+

+      if(readSize != benchedSize)

+      {

+        DISPLAY("\nError: problem reading file '%s' !!    \n", infilename);

+        free(orig_buff);

+        free(compressed_buff);

+        return 13;

+      }

+

+      // Calculating input Checksum

+      crcc = XXH32(orig_buff, (unsigned int)benchedSize,0);

+

+

+      // Bench

+      {

+        int loopNb, nb_loops, chunkNb;

+        size_t cSize=0;

+        int milliTime;

+        double fastestC = 100000000., fastestD = 100000000.;

+        double ratio=0.;

+

+        DISPLAY("\r%79s\r", "");

+        for (loopNb = 1; loopNb <= nbIterations; loopNb++)

+        {

+          // Compression

+          DISPLAY("%1i-%-14.14s : %9i ->\r", loopNb, infilename, (int)benchedSize);

+          { size_t i; for (i=0; i<benchedSize; i++) compressed_buff[i]=(char)i; }     // warmimg up memory

+

+          nb_loops = 0;

+          milliTime = BMK_GetMilliStart();

+          while(BMK_GetMilliStart() == milliTime);

+          milliTime = BMK_GetMilliStart();

+          while(BMK_GetMilliSpan(milliTime) < TIMELOOP)

+          {

+            for (chunkNb=0; chunkNb<nbChunks; chunkNb++)

+                chunkP[chunkNb].compressedSize = compP.compressionFunction(chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origSize);

+            nb_loops++;

+          }

+          milliTime = BMK_GetMilliSpan(milliTime);

+

+          if ((double)milliTime < fastestC*nb_loops) fastestC = (double)milliTime/nb_loops;

+          cSize=0; for (chunkNb=0; chunkNb<nbChunks; chunkNb++) cSize += chunkP[chunkNb].compressedSize;

+          ratio = (double)cSize/(double)benchedSize*100.;

+

+          DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s\r", loopNb, infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000.);

+

+          // Decompression

+          { size_t i; for (i=0; i<benchedSize; i++) orig_buff[i]=0; }     // zeroing area, for CRC checking

+

+          nb_loops = 0;

+          milliTime = BMK_GetMilliStart();

+          while(BMK_GetMilliStart() == milliTime);

+          milliTime = BMK_GetMilliStart();

+          while(BMK_GetMilliSpan(milliTime) < TIMELOOP)

+          {

+            for (chunkNb=0; chunkNb<nbChunks; chunkNb++)

+                chunkP[chunkNb].origSize = LZ4_decompress_safe(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

+                //chunkP[chunkNb].compressedSize = LZ4_decompress_fast(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

+                //chunkP[chunkNb].compressedSize = LZ4_decompress_fast_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

+                //chunkP[chunkNb].origSize = LZ4_decompress_safe_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

+                //chunkP[chunkNb].compressedSize = LZ4_uncompress(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);

+                //chunkP[chunkNb].origSize = LZ4_uncompress_unknownOutputSize(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);

+            nb_loops++;

+          }

+          milliTime = BMK_GetMilliSpan(milliTime);

+

+          if ((double)milliTime < fastestD*nb_loops) fastestD = (double)milliTime/nb_loops;

+          DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\r", loopNb, infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

+

+          // CRC Checking

+          crcd = XXH32(orig_buff, (unsigned int)benchedSize,0);

+          if (crcc!=crcd) { DISPLAY("\n!!! WARNING !!! %14s : Invalid Checksum : %x != %x\n", infilename, (unsigned)crcc, (unsigned)crcd); break; }

+        }

+

+        if (crcc==crcd)

+        {

+            if (ratio<100.)

+                DISPLAY("%-16.16s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\n", infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

+            else

+                DISPLAY("%-16.16s : %9i -> %9i (%5.1f%%),%7.1f MB/s ,%7.1f MB/s \n", infilename, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.);

+        }

+        totals += benchedSize;

+        totalz += cSize;

+        totalc += fastestC;

+        totald += fastestD;

+      }

+

+      free(orig_buff);

+      free(compressed_buff);

+      free(chunkP);

   }

 

   if (nbFiles > 1)

-		printf("%-16.16s :%10llu ->%10llu (%5.2f%%), %6.1f MB/s , %6.1f MB/s\n", "  TOTAL", (long long unsigned int)totals, (long long unsigned int)totalz, (double)totalz/(double)totals*100., (double)totals/totalc/1000., (double)totals/totald/1000.);

+        printf("%-16.16s :%10llu ->%10llu (%5.2f%%), %6.1f MB/s , %6.1f MB/s\n", "  TOTAL", (long long unsigned int)totals, (long long unsigned int)totalz, (double)totalz/(double)totals*100., (double)totals/totalc/1000., (double)totals/totald/1000.);

 

   if (BMK_pause) { printf("press enter...\n"); getchar(); }