Partial reverse of commit 2bc7edf due to perf regression. Reintroduce the one file branch

Author: flanglet

src/app/BlockCompressor.cpp

@@ -314,7 +314,45 @@ int BlockCompressor::compress(uint64& outputSize)
     _ctx.putInt("verbosity", _verbosity);
 
     // Run the task(s)
-    {
+    if (nbFiles == 1) {
+        string oName = formattedOutName;
+        string iName = "STDIN";
+
+        if (isStdIn == true) {
+            if (oName.length() == 0) {
+               oName = "STDOUT";
+            }
+         } else {
+            iName = files[0].fullPath();
+            _ctx.putLong("fileSize", files[0]._size);
+
+            // Set the block size to optimize compression ratio when possible
+            if ((_autoBlockSize == true) && (_jobs > 0)) {
+                const int64 bl = files[0]._size / _jobs;
+                _blockSize = int(max(min((bl + 63) & ~63, int64(MAX_BLOCK_SIZE)), int64(MIN_BLOCK_SIZE)));
+            }
+
+            if (oName.length() == 0) {
+                oName = iName + ".knz";
+            }
+            else if ((inputIsDir == true) && (specialOutput == false)) {
+                oName = formattedOutName + iName.substr(formattedInName.size()) + ".knz";
+            }
+        }
+
+        _ctx.putString("inputName", iName);
+        _ctx.putString("outputName", oName);
+        FileCompressTask<FileCompressResult> task(_ctx, _listeners);
+        FileCompressResult fcr = task.run();
+        res = fcr._code;
+        read = fcr._read;
+        written = fcr._written;
+
+        if (res != 0) {
+            cerr << fcr._errMsg << endl;
+        }
+    }
+    else {
         vector<FileCompressTask<FileCompressResult>*> tasks;
         vector<int> jobsPerTask(nbFiles);
         Global::computeJobsPerTask(jobsPerTask.data(), _jobs, nbFiles);

src/app/BlockDecompressor.cpp

@@ -204,7 +204,49 @@ int BlockDecompressor::decompress(uint64& inputSize)
     _ctx.putInt("verbosity", _verbosity);
 
     // Run the task(s)
-    {
+    if (nbFiles == 1) {
+        string oName = formattedOutName;
+        string iName = "STDIN";
+
+        if (isStdIn == true) {
+            if (oName.length() == 0) {
+                oName = "STDOUT";
+            }
+        }
+        else {
+            iName = files[0].fullPath();
+            _ctx.putLong("fileSize", files[0]._size);
+
+            if (oName.length() == 0) {
+                oName = iName;
+
+                if ((upperInputName.length() >= 4) && (upperInputName.substr(upperInputName.length() - 4) == ".KNZ"))
+                    oName.resize(oName.length() - 4);
+                else
+                    oName = oName + ".bak";
+            }
+            else if ((inputIsDir == true) && (specialOutput == false)) {
+                oName = formattedOutName + iName.substr(formattedInName.size());
+
+                if ((upperInputName.length() >= 4) && (upperInputName.substr(upperInputName.length() - 4) == ".KNZ"))
+                    oName.resize(oName.length() - 4);
+                else
+                    oName = oName + ".bak";
+            }
+        }
+
+         _ctx.putString("inputName", iName);
+         _ctx.putString("outputName", oName);
+         FileDecompressTask<FileDecompressResult> task(_ctx, _listeners);
+         FileDecompressResult fdr = task.run();
+         res = fdr._code;
+         read = fdr._read;
+
+         if (res != 0) {
+            cerr << fdr._errMsg << endl;
+         }
+    }
+    else {
         vector<FileDecompressTask<FileDecompressResult>*> tasks;
         vector<int> jobsPerTask(nbFiles);
         Global::computeJobsPerTask(jobsPerTask.data(), _jobs, nbFiles);