From d2845a69d0fae6df366eae2fcc71fb580b8bbc46 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Tue, 14 Apr 2020 07:05:38 +0200 Subject: [PATCH] Remove _hMutex from ZstdEncoder.cpp --- CPP/7zip/Compress/ZstdEncoder.cpp | 6 ------ CPP/7zip/Compress/ZstdEncoder.h | 1 - 2 files changed, 7 deletions(-) diff --git a/CPP/7zip/Compress/ZstdEncoder.cpp b/CPP/7zip/Compress/ZstdEncoder.cpp index 6ef8a0fb..7babd22a 100644 --- a/CPP/7zip/Compress/ZstdEncoder.cpp +++ b/CPP/7zip/Compress/ZstdEncoder.cpp @@ -39,7 +39,6 @@ CEncoder::CEncoder(): _LdmHashRateLog(-1) { _props.clear(); - _hMutex = CreateMutex(NULL, FALSE, NULL); } CEncoder::~CEncoder() @@ -48,7 +47,6 @@ CEncoder::~CEncoder() ZSTD_freeCCtx(_ctx); MyFree(_srcBuf); MyFree(_dstBuf); - CloseHandle(_hMutex); } } @@ -333,9 +331,7 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ZSTD_todo = ZSTD_e_end; /* compress data */ - WaitForSingleObject(_hMutex, INFINITE); _processedIn += srcSize; - ReleaseMutex(_hMutex); for (;;) { outBuff.dst = _dstBuf; @@ -369,10 +365,8 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, /* write output */ if (outBuff.pos) { RINOK(WriteStream(outStream, _dstBuf, outBuff.pos)); - WaitForSingleObject(_hMutex, INFINITE); _processedOut += outBuff.pos; RINOK(progress->SetRatioInfo(&_processedIn, &_processedOut)); - ReleaseMutex(_hMutex); } /* done */ diff --git a/CPP/7zip/Compress/ZstdEncoder.h b/CPP/7zip/Compress/ZstdEncoder.h index b2938fcb..56fe0671 100644 --- a/CPP/7zip/Compress/ZstdEncoder.h +++ b/CPP/7zip/Compress/ZstdEncoder.h @@ -49,7 +49,6 @@ class CEncoder: UInt64 _processedIn; UInt64 _processedOut; UInt32 _numThreads; - HANDLE _hMutex; /* zstd advanced compression options */ Int32 _Long;