merge multi threading to master branch

- updated zstd to latest devel release - lz4, lz5 and zstd is included now - all three support threading
2025-12-06 19:14:56 -06:00 · 2016-10-16 23:38:46 +02:00
parent f3f39b74b0
commit 58069903d0
108 changed files with 21091 additions and 609 deletions
--- a/CPP/7zip/Compress/Lz5Encoder.cpp
+++ b/CPP/7zip/Compress/Lz5Encoder.cpp
@@ -0,0 +1,138 @@
+// (C) 2016 Tino Reichardt
+
+#include "StdAfx.h"
+#include "Lz5Encoder.h"
+#include "Lz5Decoder.h"
+
+#ifndef EXTRACT_ONLY
+namespace NCompress {
+namespace NLZ5 {
+
+CEncoder::CEncoder():
+  _processedIn(0),
+  _processedOut(0),
+  _inputSize(0),
+  _ctx(NULL),
+  _numThreads(NWindows::NSystem::GetNumberOfProcessors())
+{
+  _props.clear();
+}
+
+CEncoder::~CEncoder()
+{
+  if (_ctx)
+    LZ5MT_freeCCtx(_ctx);
+}
+
+STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARIANT * coderProps, UInt32 numProps)
+{
+  _props.clear();
+
+  for (UInt32 i = 0; i < numProps; i++)
+  {
+    const PROPVARIANT & prop = coderProps[i];
+    PROPID propID = propIDs[i];
+    UInt32 v = (UInt32)prop.ulVal;
+    switch (propID)
+    {
+    case NCoderPropID::kLevel:
+      {
+        if (prop.vt != VT_UI4)
+          return E_INVALIDARG;
+
+        _props._level = static_cast < Byte > (prop.ulVal);
+        Byte lz5_level = static_cast < Byte > (LZ5MT_LEVEL_MAX);
+        if (_props._level > lz5_level)
+          _props._level = lz5_level;
+
+        break;
+      }
+    case NCoderPropID::kNumThreads:
+      {
+        SetNumberOfThreads(v);
+        break;
+      }
+    default:
+      {
+        break;
+      }
+    }
+  }
+
+  return S_OK;
+}
+
+STDMETHODIMP CEncoder::WriteCoderProperties(ISequentialOutStream * outStream)
+{
+  return WriteStream(outStream, &_props, sizeof (_props));
+}
+
+STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
+  ISequentialOutStream *outStream, const UInt64 * /*inSize*/ ,
+  const UInt64 * /*outSize */, ICompressProgressInfo *progress)
+{
+  LZ5MT_RdWr_t rdwr;
+  size_t result;
+  HRESULT res = S_OK;
+
+  struct Lz5Stream Rd;
+  Rd.inStream = inStream;
+  Rd.outStream = outStream;
+  Rd.processedIn = &_processedIn;
+  Rd.processedOut = &_processedOut;
+
+  struct Lz5Stream Wr;
+  if (_processedIn == 0)
+    Wr.progress = progress;
+  else
+    Wr.progress = 0;
+  Wr.inStream = inStream;
+  Wr.outStream = outStream;
+  Wr.processedIn = &_processedIn;
+  Wr.processedOut = &_processedOut;
+
+  /* 1) setup read/write functions */
+  rdwr.fn_read = ::Lz5Read;
+  rdwr.fn_write = ::Lz5Write;
+  rdwr.arg_read = (void *)&Rd;
+  rdwr.arg_write = (void *)&Wr;
+
+  /* 2) create compression context, if needed */
+  if (!_ctx)
+    _ctx = LZ5MT_createCCtx(_numThreads, _props._level, _inputSize);
+  if (!_ctx)
+    return S_FALSE;
+
+  /* 3) compress */
+  result = LZ5MT_CompressCCtx(_ctx, &rdwr);
+  if (result == (size_t)-LZ5MT_error_read_fail)
+    res = E_ABORT;
+  if (LZ5MT_isError(result))
+    return ErrorOut(result);
+
+  return res;
+}
+
+STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads)
+{
+  const UInt32 kNumThreadsMax = LZ5MT_THREAD_MAX;
+  if (numThreads < 1) numThreads = 1;
+  if (numThreads > kNumThreadsMax) numThreads = kNumThreadsMax;
+  _numThreads = numThreads;
+  return S_OK;
+}
+
+HRESULT CEncoder::ErrorOut(size_t code)
+{
+  const char *strError = LZ5MT_getErrorString(code);
+  wchar_t wstrError[200+5]; /* no malloc here, /TR */
+
+  mbstowcs(wstrError, strError, 200);
+  MessageBoxW(0, wstrError, L"7-Zip ZStandard", MB_ICONERROR | MB_OK);
+  MyFree(wstrError);
+
+  return S_FALSE;
+}
+
+}}
+#endif