|
@@ -17,14 +17,17 @@ public:
|
17
|
17
|
DKLogD("%s", DKGL_FUNCTION_NAME);
|
18
|
18
|
|
19
|
19
|
DKTimer timer;
|
20
|
|
- for (auto format : { DKCompressor::Deflate, DKCompressor::LZ4, DKCompressor::LZ4HC })
|
|
20
|
+ for (auto format : { DKCompressor::Deflate, DKCompressor::Deflate9, DKCompressor::Zstd, DKCompressor::ZstdMax, DKCompressor::LZ4, DKCompressor::LZ4HC })
|
21
|
21
|
{
|
22
|
22
|
const char* fmt = [](DKCompressor::Method m) {
|
23
|
23
|
switch (m)
|
24
|
24
|
{
|
25
|
|
- case DKCompressor::Deflate: return "DEFLATE";
|
26
|
|
- case DKCompressor::LZ4: return "LZ4";
|
27
|
|
- case DKCompressor::LZ4HC: return "LZ4HC";
|
|
25
|
+ case DKCompressor::Deflate: return "DEFLATE";
|
|
26
|
+ case DKCompressor::Deflate9: return "DEFLATE(9)";
|
|
27
|
+ case DKCompressor::Zstd: return "Zstd";
|
|
28
|
+ case DKCompressor::ZstdMax: return "ZstdMax";
|
|
29
|
+ case DKCompressor::LZ4: return "LZ4";
|
|
30
|
+ case DKCompressor::LZ4HC: return "LZ4HC";
|
28
|
31
|
}
|
29
|
32
|
return "Unknown";
|
30
|
33
|
}(format);
|
|
@@ -80,8 +83,9 @@ public:
|
80
|
83
|
double elapsed = timer.Elapsed();
|
81
|
84
|
|
82
|
85
|
if (result)
|
83
|
|
- DKLog("File Compressed (%s): %ls -> %ls (%fsec)", fmt,
|
84
|
|
- (const wchar_t*)GetFileSizeStr(f1), (const wchar_t*)GetFileSizeStr(f2), elapsed);
|
|
86
|
+ DKLog("File Compressed (%s): %ls -> %ls (ratio:%f, %fsec)", fmt,
|
|
87
|
+ (const wchar_t*)GetFileSizeStr(f1), (const wchar_t*)GetFileSizeStr(f2),
|
|
88
|
+ double(f1->TotalLength()) / double(f2->TotalLength()), elapsed);
|
85
|
89
|
else
|
86
|
90
|
{
|
87
|
91
|
DKLog("File Compression failed");
|