Improved decoding speed

1 files changed, 18 insertions, 2 deletions

diff --git a/programs/fullbench.c b/programs/fullbench.c
index cdf1d1d..647a458 100644
--- a/programs/fullbench.c
+++ b/programs/fullbench.c
@@ -454,7 +454,7 @@ int fullSpeedBench(char** fileNamesTable, int nbFiles)
       // Alloc
       chunkP = (struct chunkParameters*) malloc(((benchedSize / (size_t)chunkSize)+1) * sizeof(struct chunkParameters));
       orig_buff = (char*) malloc((size_t)benchedSize);
-      nbChunks = (int) ((int)benchedSize / chunkSize) + 1;
+      nbChunks = (int) (((int)benchedSize + (chunkSize-1))/ chunkSize);
       maxCompressedChunkSize = LZ4_compressBound(chunkSize);
       compressedBuffSize = nbChunks * maxCompressedChunkSize;
       compressed_buff = (char*)malloc((size_t)compressedBuffSize);
@@ -511,7 +511,7 @@ int fullSpeedBench(char** fileNamesTable, int nbFiles)
               size_t remaining = benchedSize;
               char* in = orig_buff;
               char* out = compressed_buff;
-              nbChunks = (int) ((int)benchedSize / chunkSize) + 1;
+                nbChunks = (int) (((int)benchedSize + (chunkSize-1))/ chunkSize);
               for (i=0; i<nbChunks; i++)
               {
                   chunkP[i].id = i;
@@ -593,6 +593,22 @@ int fullSpeedBench(char** fileNamesTable, int nbFiles)
         }
 
         // Prepare layout for decompression
+        // Init data chunks
+        {
+          int i;
+          size_t remaining = benchedSize;
+          char* in = orig_buff;
+          char* out = compressed_buff;
+            nbChunks = (int) (((int)benchedSize + (chunkSize-1))/ chunkSize);
+          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 += maxCompressedChunkSize;
+              chunkP[i].compressedSize = 0;
+          }
+        }
         for (chunkNb=0; chunkNb<nbChunks; chunkNb++)
         {
             chunkP[chunkNb].compressedSize = LZ4_compress(chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origSize);