xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-13 16:11:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to 7-Zip Version 21.02

Browse Source
This commit is contained in:
Tino Reichardt
2021-05-13 16:39:14 +02:00
parent 3724ecfedc
commit 48fa49f76c
620 changed files with 35032 additions and 10925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
CPP/7zip/Compress/LzmaEncoder.cpp
View File

@@ -9,6 +9,20 @@
#include "LzmaEncoder.h"
#include "../../Common/IntToString.h"
#include "../../Windows/TimeUtils.h"
// #define LOG_LZMA_THREADS
#ifdef LOG_LZMA_THREADS
#include <stdio.h>
EXTERN_C_BEGIN
void LzmaEnc_GetLzThreads(CLzmaEncHandle pp, HANDLE lz_threads[2]);
EXTERN_C_END
#endif
namespace NCompress {
namespace NLzma {
@@ -26,46 +40,48 @@ CEncoder::~CEncoder()
LzmaEnc_Destroy(_encoder, &g_AlignedAlloc, &g_BigAlloc);
}
static inline wchar_t GetUpperChar(wchar_t c)
static inline wchar_t GetLowCharFast(wchar_t c)
{
if (c >= 'a' && c <= 'z')
c -= 0x20;
return c;
return c |= 0x20;
}
static int ParseMatchFinder(const wchar_t *s, int *btMode, int *numHashBytes)
{
wchar_t c = GetUpperChar(*s++);
if (c == L'H')
wchar_t c = GetLowCharFast(*s++);
if (c == 'h')
{
if (GetUpperChar(*s++) != L'C')
if (GetLowCharFast(*s++) != 'c')
return 0;
int numHashBytesLoc = (int)(*s++ - L'0');
if (numHashBytesLoc < 4 || numHashBytesLoc > 4)
int num = (int)(*s++ - L'0');
if (num < 4 || num > 5)
return 0;
if (*s != 0)
return 0;
*btMode = 0;
*numHashBytes = numHashBytesLoc;
*numHashBytes = num;
return 1;
}
if (c != L'B')
if (c != 'b')
return 0;
if (GetUpperChar(*s++) != L'T')
return 0;
int numHashBytesLoc = (int)(*s++ - L'0');
if (numHashBytesLoc < 2 || numHashBytesLoc > 4)
return 0;
if (*s != 0)
return 0;
*btMode = 1;
*numHashBytes = numHashBytesLoc;
return 1;
{
if (GetLowCharFast(*s++) != 't')
return 0;
int num = (int)(*s++ - L'0');
if (num < 2 || num > 5)
return 0;
if (*s != 0)
return 0;
*btMode = 1;
*numHashBytes = num;
return 1;
}
}
#define SET_PROP_32(_id_, _dest_) case NCoderPropID::_id_: ep._dest_ = v; break;
#define SET_PROP_32(_id_, _dest_) case NCoderPropID::_id_: ep._dest_ = (int)v; break;
#define SET_PROP_32U(_id_, _dest_) case NCoderPropID::_id_: ep._dest_ = v; break;
HRESULT SetLzmaProp(PROPID propID, const PROPVARIANT &prop, CLzmaEncProps &ep);
HRESULT SetLzmaProp(PROPID propID, const PROPVARIANT &prop, CLzmaEncProps &ep)
{
if (propID == NCoderPropID::kMatchFinder)
@@ -74,7 +90,16 @@ HRESULT SetLzmaProp(PROPID propID, const PROPVARIANT &prop, CLzmaEncProps &ep)
return E_INVALIDARG;
return ParseMatchFinder(prop.bstrVal, &ep.btMode, &ep.numHashBytes) ? S_OK : E_INVALIDARG;
}
if (propID == NCoderPropID::kAffinity)
{
if (prop.vt == VT_UI8)
ep.affinity = prop.uhVal.QuadPart;
else
return E_INVALIDARG;
return S_OK;
}
if (propID > NCoderPropID::kReduceSize)
return S_OK;
@@ -95,9 +120,9 @@ HRESULT SetLzmaProp(PROPID propID, const PROPVARIANT &prop, CLzmaEncProps &ep)
case NCoderPropID::kDefaultProp: if (v > 31) return E_INVALIDARG; ep.dictSize = (UInt32)1 << (unsigned)v; break;
SET_PROP_32(kLevel, level)
SET_PROP_32(kNumFastBytes, fb)
SET_PROP_32(kMatchFinderCycles, mc)
SET_PROP_32U(kMatchFinderCycles, mc)
SET_PROP_32(kAlgorithm, algo)
SET_PROP_32(kDictionarySize, dictSize)
SET_PROP_32U(kDictionarySize, dictSize)
SET_PROP_32(kPosStateBits, pb)
SET_PROP_32(kLitPosBits, lp)
SET_PROP_32(kLitContextBits, lc)
@@ -120,7 +145,10 @@ STDMETHODIMP CEncoder::SetCoderProperties(const PROPID *propIDs,
switch (propID)
{
case NCoderPropID::kEndMarker:
if (prop.vt != VT_BOOL) return E_INVALIDARG; props.writeEndMark = (prop.boolVal != VARIANT_FALSE); break;
if (prop.vt != VT_BOOL)
return E_INVALIDARG;
props.writeEndMark = (prop.boolVal != VARIANT_FALSE);
break;
default:
RINOK(SetLzmaProp(propID, prop, props));
}
@@ -156,6 +184,92 @@ STDMETHODIMP CEncoder::WriteCoderProperties(ISequentialOutStream *outStream)
#define RET_IF_WRAP_ERROR(wrapRes, sRes, sResErrorCode) \
if (wrapRes != S_OK /* && (sRes == SZ_OK || sRes == sResErrorCode) */) return wrapRes;
#ifdef LOG_LZMA_THREADS
static inline UInt64 GetTime64(const FILETIME &t) { return ((UInt64)t.dwHighDateTime << 32) | t.dwLowDateTime; }
static void PrintNum(UInt64 val, unsigned numDigits, char c = ' ')
{
char temp[64];
char *p = temp + 32;
ConvertUInt64ToString(val, p);
unsigned len = (unsigned)strlen(p);
for (; len < numDigits; len++)
*--p = c;
printf("%s", p);
}
static void PrintTime(const char *s, UInt64 val, UInt64 total)
{
printf(" %s :", s);
const UInt32 kFreq = 10000000;
UInt64 sec = val / kFreq;
PrintNum(sec, 6);
printf(" .");
UInt32 ms = (UInt32)(val - (sec * kFreq)) / (kFreq / 1000);
PrintNum(ms, 3, '0');
while (val > ((UInt64)1 << 56))
{
val >>= 1;
total >>= 1;
}
UInt64 percent = 0;
if (total != 0)
percent = val * 100 / total;
printf(" =");
PrintNum(percent, 4);
printf("%%");
}
struct CBaseStat
{
UInt64 kernelTime, userTime;
BOOL Get(HANDLE thread, const CBaseStat *prevStat)
{
FILETIME creationTimeFT, exitTimeFT, kernelTimeFT, userTimeFT;
BOOL res = GetThreadTimes(thread
, &creationTimeFT, &exitTimeFT, &kernelTimeFT, &userTimeFT);
if (res)
{
kernelTime = GetTime64(kernelTimeFT);
userTime = GetTime64(userTimeFT);
if (prevStat)
{
kernelTime -= prevStat->kernelTime;
userTime -= prevStat->userTime;
}
}
return res;
}
};
static void PrintStat(HANDLE thread, UInt64 totalTime, const CBaseStat *prevStat)
{
CBaseStat newStat;
if (!newStat.Get(thread, prevStat))
return;
PrintTime("K", newStat.kernelTime, totalTime);
const UInt64 processTime = newStat.kernelTime + newStat.userTime;
PrintTime("U", newStat.userTime, totalTime);
PrintTime("S", processTime, totalTime);
printf("\n");
// PrintTime("G ", totalTime, totalTime);
}
#endif
STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 * /* outSize */, ICompressProgressInfo *progress)
{
@@ -167,6 +281,18 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream
outWrap.Init(outStream);
progressWrap.Init(progress);
#ifdef LOG_LZMA_THREADS
FILETIME startTimeFT;
NWindows::NTime::GetCurUtcFileTime(startTimeFT);
UInt64 totalTime = GetTime64(startTimeFT);
CBaseStat oldStat;
if (!oldStat.Get(GetCurrentThread(), NULL))
return E_FAIL;
#endif
SRes res = LzmaEnc_Encode(_encoder, &outWrap.vt, &inWrap.vt,
progress ? &progressWrap.vt : NULL, &g_AlignedAlloc, &g_BigAlloc);
@@ -175,7 +301,23 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream
RET_IF_WRAP_ERROR(inWrap.Res, res, SZ_ERROR_READ)
RET_IF_WRAP_ERROR(outWrap.Res, res, SZ_ERROR_WRITE)
RET_IF_WRAP_ERROR(progressWrap.Res, res, SZ_ERROR_PROGRESS)
#ifdef LOG_LZMA_THREADS
NWindows::NTime::GetCurUtcFileTime(startTimeFT);
totalTime = GetTime64(startTimeFT) - totalTime;
HANDLE lz_threads[2];
LzmaEnc_GetLzThreads(_encoder, lz_threads);
printf("\n");
printf("Main: "); PrintStat(GetCurrentThread(), totalTime, &oldStat);
printf("Hash: "); PrintStat(lz_threads[0], totalTime, NULL);
printf("BinT: "); PrintStat(lz_threads[1], totalTime, NULL);
// PrintTime("Total: ", totalTime, totalTime);
printf("\n");
#endif
return SResToHRESULT(res);
}