seven-zip 1.4.2 → 1.7.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +49 -0
- data/.github/workflows/release.yml +21 -0
- data/README.md +13 -2
- data/Rakefile +2 -0
- data/ext/p7zip/C/7zBuf.h +4 -8
- data/ext/p7zip/C/7zBuf2.c +9 -3
- data/ext/p7zip/C/7zCrc.c +84 -32
- data/ext/p7zip/C/7zCrc.h +2 -2
- data/ext/p7zip/C/7zCrcOpt.c +89 -8
- data/ext/p7zip/C/7zStream.c +4 -2
- data/ext/p7zip/C/{Types.h → 7zTypes.h} +8 -6
- data/ext/p7zip/C/7zVersion.h +21 -6
- data/ext/p7zip/C/Aes.c +28 -15
- data/ext/p7zip/C/Aes.h +2 -2
- data/ext/p7zip/C/Alloc.c +60 -12
- data/ext/p7zip/C/Alloc.h +6 -7
- data/ext/p7zip/C/Bcj2.c +256 -0
- data/ext/p7zip/C/Bcj2.h +146 -0
- data/ext/p7zip/C/Bcj2Enc.c +312 -0
- data/ext/p7zip/C/Blake2.h +48 -0
- data/ext/p7zip/C/Blake2s.c +244 -0
- data/ext/p7zip/C/Bra.c +2 -0
- data/ext/p7zip/C/Bra.h +4 -8
- data/ext/p7zip/C/Bra86.c +48 -51
- data/ext/p7zip/C/BraIA64.c +3 -1
- data/ext/p7zip/C/BwtSort.c +3 -4
- data/ext/p7zip/C/BwtSort.h +4 -8
- data/ext/p7zip/C/Compiler.h +32 -0
- data/ext/p7zip/C/CpuArch.c +50 -7
- data/ext/p7zip/C/CpuArch.h +112 -41
- data/ext/p7zip/C/Delta.c +2 -0
- data/ext/p7zip/C/Delta.h +4 -8
- data/ext/p7zip/C/HuffEnc.c +8 -6
- data/ext/p7zip/C/HuffEnc.h +4 -8
- data/ext/p7zip/C/LzFind.c +391 -108
- data/ext/p7zip/C/LzFind.h +20 -18
- data/ext/p7zip/C/LzFindMt.c +100 -90
- data/ext/p7zip/C/LzFindMt.h +4 -8
- data/ext/p7zip/C/LzHash.h +23 -20
- data/ext/p7zip/C/Lzma2Dec.c +48 -26
- data/ext/p7zip/C/Lzma2Dec.h +4 -8
- data/ext/p7zip/C/Lzma2Enc.c +58 -15
- data/ext/p7zip/C/Lzma2Enc.h +3 -7
- data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.h → Lzma86.h} +47 -14
- data/ext/p7zip/C/{LzmaUtil/Lzma86Dec.c → Lzma86Dec.c} +6 -13
- data/ext/p7zip/C/{LzmaUtil/Lzma86Enc.c → Lzma86Enc.c} +8 -15
- data/ext/p7zip/C/LzmaDec.c +180 -79
- data/ext/p7zip/C/LzmaDec.h +4 -8
- data/ext/p7zip/C/LzmaEnc.c +230 -147
- data/ext/p7zip/C/LzmaEnc.h +6 -8
- data/ext/p7zip/C/MtCoder.c +3 -3
- data/ext/p7zip/C/Ppmd.h +5 -5
- data/ext/p7zip/C/Ppmd7.c +9 -7
- data/ext/p7zip/C/Ppmd7.h +3 -3
- data/ext/p7zip/C/Ppmd7Dec.c +2 -0
- data/ext/p7zip/C/Ppmd7Enc.c +4 -2
- data/ext/p7zip/C/Ppmd8.c +34 -31
- data/ext/p7zip/C/Ppmd8.h +5 -1
- data/ext/p7zip/C/Ppmd8Dec.c +2 -0
- data/ext/p7zip/C/Ppmd8Enc.c +2 -0
- data/ext/p7zip/C/Precomp.h +10 -0
- data/ext/p7zip/C/RotateDefs.h +11 -1
- data/ext/p7zip/C/Sha1.c +340 -0
- data/ext/p7zip/C/Sha1.h +38 -0
- data/ext/p7zip/C/Sha256.c +107 -63
- data/ext/p7zip/C/Sha256.h +2 -2
- data/ext/p7zip/C/Sort.c +59 -11
- data/ext/p7zip/C/Sort.h +8 -10
- data/ext/p7zip/C/Threads.h +1 -1
- data/ext/p7zip/C/Xz.c +7 -5
- data/ext/p7zip/C/Xz.h +40 -17
- data/ext/p7zip/C/XzCrc64.c +69 -16
- data/ext/p7zip/C/XzCrc64.h +2 -2
- data/ext/p7zip/C/XzCrc64Opt.c +69 -0
- data/ext/p7zip/C/XzDec.c +93 -55
- data/ext/p7zip/C/XzEnc.c +206 -165
- data/ext/p7zip/C/XzEnc.h +23 -9
- data/ext/p7zip/C/XzIn.c +50 -43
- data/ext/p7zip/CPP/7zip/Archive/7z/7zCompressionMode.h +37 -13
- data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.cpp +392 -181
- data/ext/p7zip/CPP/7zip/Archive/7z/7zDecode.h +29 -29
- data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.cpp +424 -212
- data/ext/p7zip/CPP/7zip/Archive/7z/7zEncode.h +53 -16
- data/ext/p7zip/CPP/7zip/Archive/7z/7zExtract.cpp +312 -174
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.cpp +74 -61
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderInStream.h +22 -19
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.cpp +505 -232
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandler.h +70 -16
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHandlerOut.cpp +602 -172
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.cpp +5 -0
- data/ext/p7zip/CPP/7zip/Archive/7z/7zHeader.h +54 -3
- data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.cpp +981 -616
- data/ext/p7zip/CPP/7zip/Archive/7z/7zIn.h +275 -89
- data/ext/p7zip/CPP/7zip/Archive/7z/7zItem.h +77 -162
- data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.cpp +288 -238
- data/ext/p7zip/CPP/7zip/Archive/7z/7zOut.h +189 -20
- data/ext/p7zip/CPP/7zip/Archive/7z/7zProperties.cpp +59 -49
- data/ext/p7zip/CPP/7zip/Archive/7z/7zRegister.cpp +12 -9
- data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.cpp +4 -6
- data/ext/p7zip/CPP/7zip/Archive/7z/7zSpecStream.h +5 -5
- data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.cpp +1743 -447
- data/ext/p7zip/CPP/7zip/Archive/7z/7zUpdate.h +61 -10
- data/ext/p7zip/CPP/7zip/Archive/ApmHandler.cpp +84 -120
- data/ext/p7zip/CPP/7zip/Archive/ArHandler.cpp +854 -0
- data/ext/p7zip/CPP/7zip/Archive/ArchiveExports.cpp +48 -32
- data/ext/p7zip/CPP/7zip/Archive/ArjHandler.cpp +519 -340
- data/ext/p7zip/CPP/7zip/Archive/Bz2Handler.cpp +223 -203
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.cpp +50 -139
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabBlockInStream.h +17 -18
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.cpp +566 -234
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHandler.h +10 -1
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabHeader.h +12 -15
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.cpp +341 -122
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.h +81 -66
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabItem.h +17 -14
- data/ext/p7zip/CPP/7zip/Archive/Cab/CabRegister.cpp +10 -4
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.cpp +190 -83
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHandler.h +7 -1
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.cpp +292 -174
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmIn.h +73 -47
- data/ext/p7zip/CPP/7zip/Archive/ComHandler.cpp +886 -0
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.cpp +994 -71
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2.h +364 -101
- data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.cpp +7 -12
- data/ext/p7zip/CPP/7zip/Archive/Common/DummyOutStream.h +4 -3
- data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.cpp +6 -6
- data/ext/p7zip/CPP/7zip/Archive/Common/FindSignature.h +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.cpp +77 -543
- data/ext/p7zip/CPP/7zip/Archive/Common/HandlerOut.h +31 -51
- data/ext/p7zip/CPP/7zip/Archive/Common/InStreamWithCRC.cpp +18 -14
- data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.cpp +34 -7
- data/ext/p7zip/CPP/7zip/Archive/Common/ItemNameUtils.h +5 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.cpp +25 -24
- data/ext/p7zip/CPP/7zip/Archive/Common/MultiStream.h +8 -3
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithCRC.h +1 -0
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Archive/Common/OutStreamWithSha1.h +5 -5
- data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.cpp +0 -174
- data/ext/p7zip/CPP/7zip/Archive/Common/ParseProperties.h +2 -14
- data/ext/p7zip/CPP/7zip/Archive/CpioHandler.cpp +506 -335
- data/ext/p7zip/CPP/7zip/Archive/CramfsHandler.cpp +227 -84
- data/ext/p7zip/CPP/7zip/Archive/DeflateProps.cpp +0 -115
- data/ext/p7zip/CPP/7zip/Archive/DeflateProps.h +0 -29
- data/ext/p7zip/CPP/7zip/Archive/DllExports2.cpp +63 -17
- data/ext/p7zip/CPP/7zip/Archive/DmgHandler.cpp +1007 -339
- data/ext/p7zip/CPP/7zip/Archive/ElfHandler.cpp +618 -177
- data/ext/p7zip/CPP/7zip/Archive/ExtHandler.cpp +2867 -0
- data/ext/p7zip/CPP/7zip/Archive/FatHandler.cpp +136 -76
- data/ext/p7zip/CPP/7zip/Archive/FlvHandler.cpp +132 -150
- data/ext/p7zip/CPP/7zip/Archive/GptHandler.cpp +405 -0
- data/ext/p7zip/CPP/7zip/Archive/GzHandler.cpp +560 -214
- data/ext/p7zip/CPP/7zip/Archive/HandlerCont.cpp +288 -0
- data/ext/p7zip/CPP/7zip/Archive/HandlerCont.h +116 -0
- data/ext/p7zip/CPP/7zip/Archive/HfsHandler.cpp +1880 -0
- data/ext/p7zip/CPP/7zip/Archive/IArchive.h +415 -51
- data/ext/p7zip/CPP/7zip/Archive/IhexHandler.cpp +497 -0
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.cpp +158 -71
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHandler.h +2 -1
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.cpp +0 -9
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoHeader.h +8 -5
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.cpp +311 -91
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.h +101 -83
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoItem.h +48 -39
- data/ext/p7zip/CPP/7zip/Archive/Iso/IsoRegister.cpp +12 -4
- data/ext/p7zip/CPP/7zip/Archive/LzhHandler.cpp +127 -114
- data/ext/p7zip/CPP/7zip/Archive/LzmaHandler.cpp +264 -121
- data/ext/p7zip/CPP/7zip/Archive/MachoHandler.cpp +402 -242
- data/ext/p7zip/CPP/7zip/Archive/MbrHandler.cpp +56 -114
- data/ext/p7zip/CPP/7zip/Archive/MslzHandler.cpp +230 -90
- data/ext/p7zip/CPP/7zip/Archive/MubHandler.cpp +129 -153
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.cpp +179 -58
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisDecode.h +36 -7
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.cpp +407 -237
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisHandler.h +9 -16
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.cpp +5535 -1098
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisIn.h +345 -81
- data/ext/p7zip/CPP/7zip/Archive/Nsis/NsisRegister.cpp +11 -4
- data/ext/p7zip/CPP/7zip/Archive/NtfsHandler.cpp +1424 -434
- data/ext/p7zip/CPP/7zip/Archive/PeHandler.cpp +1831 -521
- data/ext/p7zip/CPP/7zip/Archive/PpmdHandler.cpp +50 -35
- data/ext/p7zip/CPP/7zip/Archive/QcowHandler.cpp +615 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.cpp +2746 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/Rar5Handler.h +411 -0
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.cpp +1241 -355
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHandler.h +70 -20
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.h +38 -34
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.h +34 -16
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVol.h +129 -0
- data/ext/p7zip/CPP/7zip/Archive/RpmHandler.cpp +641 -194
- data/ext/p7zip/CPP/7zip/Archive/SplitHandler.cpp +174 -181
- data/ext/p7zip/CPP/7zip/Archive/SquashfsHandler.cpp +237 -174
- data/ext/p7zip/CPP/7zip/Archive/SwfHandler.cpp +471 -192
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.cpp +350 -59
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandler.h +24 -7
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandlerOut.cpp +79 -27
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.cpp +5 -7
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.h +20 -44
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.cpp +279 -64
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarIn.h +10 -1
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarItem.h +34 -8
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.cpp +145 -87
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarOut.h +13 -5
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarRegister.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.cpp +154 -27
- data/ext/p7zip/CPP/7zip/Archive/Tar/TarUpdate.h +10 -6
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.cpp +53 -128
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfHandler.h +6 -5
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.cpp +384 -119
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfIn.h +40 -21
- data/ext/p7zip/CPP/7zip/Archive/UefiHandler.cpp +1618 -0
- data/ext/p7zip/CPP/7zip/Archive/VdiHandler.cpp +362 -0
- data/ext/p7zip/CPP/7zip/Archive/VhdHandler.cpp +438 -247
- data/ext/p7zip/CPP/7zip/Archive/VmdkHandler.cpp +1518 -0
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.cpp +837 -249
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandler.h +73 -47
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimHandlerOut.cpp +1614 -351
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.cpp +1519 -513
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimIn.h +498 -139
- data/ext/p7zip/CPP/7zip/Archive/Wim/WimRegister.cpp +13 -9
- data/ext/p7zip/CPP/7zip/Archive/XarHandler.cpp +272 -128
- data/ext/p7zip/CPP/7zip/Archive/XzHandler.cpp +502 -253
- data/ext/p7zip/CPP/7zip/Archive/XzHandler.h +65 -0
- data/ext/p7zip/CPP/7zip/Archive/ZHandler.cpp +114 -39
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +118 -134
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipAddCommon.h +6 -0
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipCompressionMode.h +40 -20
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.cpp +541 -274
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandler.h +13 -40
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp +165 -254
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.h +70 -178
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.cpp +1934 -550
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipIn.h +294 -63
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.cpp +160 -86
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItem.h +139 -110
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.cpp +177 -154
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipOut.h +50 -18
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipRegister.cpp +18 -9
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.cpp +367 -201
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipUpdate.h +11 -10
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile +2 -319
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.depend +0 -4962
- data/ext/p7zip/CPP/7zip/Bundles/Format7zFree/makefile.list +1004 -259
- data/ext/p7zip/CPP/7zip/Common/CWrappers.cpp +26 -22
- data/ext/p7zip/CPP/7zip/Common/CWrappers.h +19 -14
- data/ext/p7zip/CPP/7zip/Common/CreateCoder.cpp +298 -130
- data/ext/p7zip/CPP/7zip/Common/CreateCoder.h +118 -34
- data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.cpp +24 -28
- data/ext/p7zip/CPP/7zip/Common/FilePathAutoRename.h +5 -5
- data/ext/p7zip/CPP/7zip/Common/FileStreams.cpp +268 -65
- data/ext/p7zip/CPP/7zip/Common/FileStreams.h +70 -33
- data/ext/p7zip/CPP/7zip/Common/FilterCoder.cpp +302 -131
- data/ext/p7zip/CPP/7zip/Common/FilterCoder.h +141 -43
- data/ext/p7zip/CPP/7zip/Common/InBuffer.cpp +87 -35
- data/ext/p7zip/CPP/7zip/Common/InBuffer.h +54 -45
- data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.cpp +22 -17
- data/ext/p7zip/CPP/7zip/Common/InOutTempBuffer.h +5 -5
- data/ext/p7zip/CPP/7zip/Common/LimitedStreams.cpp +256 -43
- data/ext/p7zip/CPP/7zip/Common/LimitedStreams.h +135 -8
- data/ext/p7zip/CPP/7zip/Common/MemBlocks.cpp +5 -5
- data/ext/p7zip/CPP/7zip/Common/MemBlocks.h +3 -3
- data/ext/p7zip/CPP/7zip/Common/MethodId.cpp +0 -24
- data/ext/p7zip/CPP/7zip/Common/MethodId.h +1 -1
- data/ext/p7zip/CPP/7zip/Common/MethodProps.cpp +430 -71
- data/ext/p7zip/CPP/7zip/Common/MethodProps.h +170 -17
- data/ext/p7zip/CPP/7zip/Common/OffsetStream.cpp +8 -4
- data/ext/p7zip/CPP/7zip/Common/OffsetStream.h +4 -3
- data/ext/p7zip/CPP/7zip/Common/OutBuffer.cpp +26 -31
- data/ext/p7zip/CPP/7zip/Common/OutBuffer.h +17 -18
- data/ext/p7zip/CPP/7zip/Common/OutMemStream.cpp +5 -5
- data/ext/p7zip/CPP/7zip/Common/OutMemStream.h +5 -4
- data/ext/p7zip/CPP/7zip/Common/ProgressUtils.cpp +22 -13
- data/ext/p7zip/CPP/7zip/Common/ProgressUtils.h +4 -3
- data/ext/p7zip/CPP/7zip/Common/PropId.cpp +108 -0
- data/ext/p7zip/CPP/7zip/Common/RegisterArc.h +63 -17
- data/ext/p7zip/CPP/7zip/Common/RegisterCodec.h +79 -6
- data/ext/p7zip/CPP/7zip/Common/StreamBinder.cpp +95 -90
- data/ext/p7zip/CPP/7zip/Common/StreamBinder.h +46 -23
- data/ext/p7zip/CPP/7zip/Common/StreamObjects.cpp +88 -24
- data/ext/p7zip/CPP/7zip/Common/StreamObjects.h +36 -14
- data/ext/p7zip/CPP/7zip/Common/StreamUtils.cpp +4 -4
- data/ext/p7zip/CPP/7zip/Common/StreamUtils.h +6 -6
- data/ext/p7zip/CPP/7zip/Common/UniqBlocks.cpp +57 -0
- data/ext/p7zip/CPP/7zip/Common/UniqBlocks.h +26 -0
- data/ext/p7zip/CPP/7zip/Common/VirtThread.cpp +8 -6
- data/ext/p7zip/CPP/7zip/Common/VirtThread.h +6 -5
- data/ext/p7zip/CPP/7zip/Compress/BZip2Const.h +13 -12
- data/ext/p7zip/CPP/7zip/Compress/BZip2Crc.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.cpp +198 -147
- data/ext/p7zip/CPP/7zip/Compress/BZip2Decoder.h +60 -27
- data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.cpp +111 -116
- data/ext/p7zip/CPP/7zip/Compress/BZip2Encoder.h +53 -59
- data/ext/p7zip/CPP/7zip/Compress/BZip2Register.cpp +12 -7
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.cpp +554 -282
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Coder.h +73 -71
- data/ext/p7zip/CPP/7zip/Compress/Bcj2Register.cpp +10 -5
- data/ext/p7zip/CPP/7zip/Compress/BcjCoder.cpp +13 -4
- data/ext/p7zip/CPP/7zip/Compress/BcjCoder.h +17 -5
- data/ext/p7zip/CPP/7zip/Compress/BcjRegister.cpp +7 -9
- data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.cpp +2 -2
- data/ext/p7zip/CPP/7zip/Compress/BitlDecoder.h +58 -61
- data/ext/p7zip/CPP/7zip/Compress/BitlEncoder.h +24 -25
- data/ext/p7zip/CPP/7zip/Compress/BitmDecoder.h +46 -17
- data/ext/p7zip/CPP/7zip/Compress/BitmEncoder.h +18 -19
- data/ext/p7zip/CPP/7zip/Compress/BranchMisc.cpp +14 -28
- data/ext/p7zip/CPP/7zip/Compress/BranchMisc.h +27 -6
- data/ext/p7zip/CPP/7zip/Compress/BranchRegister.cpp +26 -15
- data/ext/p7zip/CPP/7zip/Compress/ByteSwap.cpp +45 -26
- data/ext/p7zip/CPP/7zip/Compress/CodecExports.cpp +254 -70
- data/ext/p7zip/CPP/7zip/Compress/CopyCoder.cpp +65 -17
- data/ext/p7zip/CPP/7zip/Compress/CopyCoder.h +15 -3
- data/ext/p7zip/CPP/7zip/Compress/CopyRegister.cpp +5 -4
- data/ext/p7zip/CPP/7zip/Compress/Deflate64Register.cpp +12 -6
- data/ext/p7zip/CPP/7zip/Compress/DeflateConst.h +43 -46
- data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.cpp +145 -81
- data/ext/p7zip/CPP/7zip/Compress/DeflateDecoder.h +31 -33
- data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.cpp +179 -162
- data/ext/p7zip/CPP/7zip/Compress/DeflateEncoder.h +35 -30
- data/ext/p7zip/CPP/7zip/Compress/DeflateRegister.cpp +11 -7
- data/ext/p7zip/CPP/7zip/Compress/DeltaFilter.cpp +55 -39
- data/ext/p7zip/CPP/7zip/Compress/{DllExports2.cpp → DllExports2Compress.cpp} +8 -8
- data/ext/p7zip/CPP/7zip/Compress/DllExportsCompress.cpp +48 -0
- data/ext/p7zip/CPP/7zip/Compress/HuffmanDecoder.h +220 -49
- data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Compress/ImplodeDecoder.h +2 -3
- data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp +7 -7
- data/ext/p7zip/CPP/7zip/Compress/ImplodeHuffmanDecoder.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.cpp +1 -1
- data/ext/p7zip/CPP/7zip/Compress/LzOutWindow.h +21 -18
- data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.cpp +171 -141
- data/ext/p7zip/CPP/7zip/Compress/LzhDecoder.h +32 -64
- data/ext/p7zip/CPP/7zip/Compress/Lzham/LICENSE +22 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/LzhamRegister.cpp +783 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/README.md +211 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham.h +803 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_dynamic_lib.h +156 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_exports.inc +31 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/lzham_static_lib.h +59 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/include/zlib.h +2 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/CMakeLists.txt +69 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_comp.h +38 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp +244 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.h +46 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp +750 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp +2240 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.h +503 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp +1684 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp +947 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.h +164 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_null_threading.h +98 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp +214 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.h +535 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_threading.h +12 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.cpp +232 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzham_win32_threading.h +387 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamcomp/lzhamcomp.vcxproj +208 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/CMakeLists.txt +86 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp +80 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.h +58 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp +73 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.h +13 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_config.h +25 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_core.h +303 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_decomp.h +37 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_helpers.h +54 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp +286 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.h +32 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp +1586 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp +131 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.h +89 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_math.h +142 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp +463 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.h +115 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp +159 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.h +284 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp +431 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.h +157 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp +1527 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.h +494 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp +147 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.h +99 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_traits.h +141 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_types.h +72 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_utils.h +58 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp +83 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.h +628 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamdecomp/lzhamdecomp.vcxproj +224 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp +179 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/lzhamlib/lzhamlib.vcxproj +187 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile +10 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.depend +0 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.list +129 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.cpp +123 -46
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.h +29 -14
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.cpp +14 -9
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.h +1 -1
- data/ext/p7zip/CPP/7zip/Compress/Lzma2Register.cpp +9 -7
- data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.cpp +24 -8
- data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.h +8 -1
- data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.cpp +30 -27
- data/ext/p7zip/CPP/7zip/Compress/LzmaEncoder.h +3 -1
- data/ext/p7zip/CPP/7zip/Compress/LzmaRegister.cpp +9 -7
- data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.cpp +576 -0
- data/ext/p7zip/CPP/7zip/Compress/LzmsDecoder.h +271 -0
- data/ext/p7zip/CPP/7zip/Compress/Lzx.h +32 -36
- data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.cpp +380 -238
- data/ext/p7zip/CPP/7zip/Compress/LzxDecoder.h +170 -83
- data/ext/p7zip/CPP/7zip/Compress/Mtf8.h +7 -9
- data/ext/p7zip/CPP/7zip/Compress/PpmdDecoder.cpp +1 -5
- data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.cpp +51 -18
- data/ext/p7zip/CPP/7zip/Compress/PpmdEncoder.h +18 -8
- data/ext/p7zip/CPP/7zip/Compress/PpmdRegister.cpp +9 -8
- data/ext/p7zip/CPP/7zip/Compress/PpmdZip.cpp +61 -25
- data/ext/p7zip/CPP/7zip/Compress/PpmdZip.h +21 -6
- data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.cpp +122 -102
- data/ext/p7zip/CPP/7zip/Compress/QuantumDecoder.h +68 -157
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile +33 -18
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.depend +0 -158
- data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.list +105 -56
- data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.cpp +34 -21
- data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.h +2 -0
- data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.cpp +77 -67
- data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.h +12 -10
- data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.cpp +139 -118
- data/ext/p7zip/CPP/7zip/Compress/Rar3Decoder.h +48 -33
- data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.cpp +148 -113
- data/ext/p7zip/CPP/7zip/Compress/Rar3Vm.h +35 -19
- data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.cpp +961 -0
- data/ext/p7zip/CPP/7zip/Compress/Rar5Decoder.h +335 -0
- data/ext/p7zip/CPP/7zip/Compress/RarCodecsRegister.cpp +13 -6
- data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.cpp +91 -71
- data/ext/p7zip/CPP/7zip/Compress/ShrinkDecoder.h +2 -4
- data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.cpp +129 -0
- data/ext/p7zip/CPP/7zip/Compress/XpressDecoder.h +13 -0
- data/ext/p7zip/CPP/7zip/Compress/ZDecoder.cpp +98 -20
- data/ext/p7zip/CPP/7zip/Compress/ZDecoder.h +19 -7
- data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.cpp +14 -11
- data/ext/p7zip/CPP/7zip/Compress/ZlibDecoder.h +32 -1
- data/ext/p7zip/CPP/7zip/Crypto/7zAes.cpp +137 -101
- data/ext/p7zip/CPP/7zip/Crypto/7zAes.h +31 -30
- data/ext/p7zip/CPP/7zip/Crypto/7zAesRegister.cpp +8 -9
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.cpp +39 -28
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha1.h +3 -3
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.cpp +62 -0
- data/ext/p7zip/CPP/7zip/Crypto/HmacSha256.h +27 -0
- data/ext/p7zip/CPP/7zip/Crypto/MyAes.cpp +73 -7
- data/ext/p7zip/CPP/7zip/Crypto/MyAes.h +25 -8
- data/ext/p7zip/CPP/7zip/Crypto/MyAesReg.cpp +16 -0
- data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp +29 -15
- data/ext/p7zip/CPP/7zip/Crypto/Pbkdf2HmacSha1.h +2 -1
- data/ext/p7zip/CPP/7zip/Crypto/RandGen.cpp +49 -34
- data/ext/p7zip/CPP/7zip/Crypto/RandGen.h +2 -2
- data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.cpp +36 -39
- data/ext/p7zip/CPP/7zip/Crypto/Rar20Crypto.h +15 -17
- data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.cpp +257 -0
- data/ext/p7zip/CPP/7zip/Crypto/Rar5Aes.h +84 -0
- data/ext/p7zip/CPP/7zip/Crypto/RarAes.cpp +70 -71
- data/ext/p7zip/CPP/7zip/Crypto/RarAes.h +24 -19
- data/ext/p7zip/CPP/7zip/Crypto/Sha1Cls.h +51 -0
- data/ext/p7zip/CPP/7zip/Crypto/WzAes.cpp +68 -54
- data/ext/p7zip/CPP/7zip/Crypto/WzAes.h +37 -27
- data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.cpp +60 -34
- data/ext/p7zip/CPP/7zip/Crypto/ZipCrypto.h +28 -11
- data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.cpp +90 -28
- data/ext/p7zip/CPP/7zip/Crypto/ZipStrong.h +13 -2
- data/ext/p7zip/CPP/7zip/Guid.txt +57 -11
- data/ext/p7zip/CPP/7zip/ICoder.h +202 -17
- data/ext/p7zip/CPP/7zip/IDecl.h +16 -3
- data/ext/p7zip/CPP/7zip/IPassword.h +1 -2
- data/ext/p7zip/CPP/7zip/IProgress.h +2 -16
- data/ext/p7zip/CPP/7zip/IStream.h +82 -13
- data/ext/p7zip/CPP/7zip/MyVersion.h +2 -11
- data/ext/p7zip/CPP/7zip/PropID.h +60 -9
- data/ext/p7zip/CPP/Common/C_FileIO.cpp +5 -1
- data/ext/p7zip/CPP/Common/C_FileIO.h +7 -1
- data/ext/p7zip/CPP/Common/CommandLineParser.cpp +122 -148
- data/ext/p7zip/CPP/Common/CommandLineParser.h +20 -29
- data/ext/p7zip/CPP/Common/Common.h +13 -0
- data/ext/p7zip/CPP/Common/CrcReg.cpp +98 -0
- data/ext/p7zip/CPP/Common/Defs.h +5 -10
- data/ext/p7zip/CPP/Common/DynLimBuf.cpp +93 -0
- data/ext/p7zip/CPP/Common/DynLimBuf.h +40 -0
- data/ext/p7zip/CPP/Common/DynamicBuffer.h +45 -31
- data/ext/p7zip/CPP/Common/IntToString.cpp +109 -40
- data/ext/p7zip/CPP/Common/IntToString.h +14 -9
- data/ext/p7zip/CPP/Common/Lang.cpp +120 -87
- data/ext/p7zip/CPP/Common/Lang.h +10 -15
- data/ext/p7zip/CPP/Common/ListFileUtils.cpp +82 -40
- data/ext/p7zip/CPP/Common/ListFileUtils.h +7 -4
- data/ext/p7zip/CPP/Common/MyBuffer.h +244 -0
- data/ext/p7zip/CPP/Common/MyCom.h +65 -28
- data/ext/p7zip/CPP/Common/MyGuidDef.h +1 -1
- data/ext/p7zip/CPP/Common/MyInitGuid.h +23 -0
- data/ext/p7zip/CPP/Common/MyLinux.h +42 -0
- data/ext/p7zip/CPP/Common/MyMap.cpp +8 -8
- data/ext/p7zip/CPP/Common/MyMap.h +2 -2
- data/ext/p7zip/CPP/Common/MyString.cpp +1643 -117
- data/ext/p7zip/CPP/Common/MyString.h +677 -486
- data/ext/p7zip/CPP/Common/MyTypes.h +38 -0
- data/ext/p7zip/CPP/Common/MyUnknown.h +4 -0
- data/ext/p7zip/CPP/Common/MyVector.cpp +0 -84
- data/ext/p7zip/CPP/Common/MyVector.h +472 -112
- data/ext/p7zip/CPP/Common/MyWindows.cpp +18 -1
- data/ext/p7zip/CPP/Common/MyWindows.h +8 -0
- data/ext/p7zip/CPP/Common/MyXml.cpp +169 -118
- data/ext/p7zip/CPP/Common/MyXml.h +14 -11
- data/ext/p7zip/CPP/Common/NewHandler.cpp +39 -0
- data/ext/p7zip/CPP/Common/NewHandler.h +55 -2
- data/ext/p7zip/CPP/Common/Random.h +14 -0
- data/ext/p7zip/CPP/Common/Sha1Reg.cpp +40 -0
- data/ext/p7zip/CPP/Common/Sha256Reg.cpp +40 -0
- data/ext/p7zip/CPP/Common/StdInStream.cpp +46 -27
- data/ext/p7zip/CPP/Common/StdInStream.h +11 -10
- data/ext/p7zip/CPP/Common/StdOutStream.cpp +48 -35
- data/ext/p7zip/CPP/Common/StdOutStream.h +44 -17
- data/ext/p7zip/CPP/Common/StringConvert.cpp +56 -17
- data/ext/p7zip/CPP/Common/StringConvert.h +7 -3
- data/ext/p7zip/CPP/Common/StringToInt.cpp +102 -48
- data/ext/p7zip/CPP/Common/StringToInt.h +13 -10
- data/ext/p7zip/CPP/Common/TextConfig.cpp +33 -47
- data/ext/p7zip/CPP/Common/TextConfig.h +3 -6
- data/ext/p7zip/CPP/Common/UTFConvert.cpp +218 -75
- data/ext/p7zip/CPP/Common/UTFConvert.h +4 -3
- data/ext/p7zip/CPP/Common/Wildcard.cpp +345 -125
- data/ext/p7zip/CPP/Common/Wildcard.h +82 -13
- data/ext/p7zip/CPP/Common/XzCrc64Reg.cpp +42 -0
- data/ext/p7zip/CPP/Windows/FileDir.cpp +427 -475
- data/ext/p7zip/CPP/Windows/FileDir.h +94 -72
- data/ext/p7zip/CPP/Windows/FileFind.cpp +235 -244
- data/ext/p7zip/CPP/Windows/FileFind.h +63 -59
- data/ext/p7zip/CPP/Windows/FileIO.cpp +29 -46
- data/ext/p7zip/CPP/Windows/FileIO.h +40 -42
- data/ext/p7zip/CPP/Windows/FileName.cpp +696 -17
- data/ext/p7zip/CPP/Windows/FileName.h +11 -3
- data/ext/p7zip/CPP/Windows/NtCheck.h +2 -0
- data/ext/p7zip/CPP/Windows/PropVariant.cpp +134 -30
- data/ext/p7zip/CPP/Windows/PropVariant.h +80 -24
- data/ext/p7zip/CPP/Windows/PropVariantUtils.cpp +89 -18
- data/ext/p7zip/CPP/Windows/PropVariantUtils.h +12 -7
- data/ext/p7zip/CPP/Windows/System.cpp +20 -15
- data/ext/p7zip/CPP/Windows/System.h +3 -2
- data/ext/p7zip/CPP/Windows/TimeUtils.cpp +203 -0
- data/ext/p7zip/CPP/Windows/TimeUtils.h +24 -0
- data/ext/p7zip/CPP/include_windows/basetyps.h +4 -4
- data/ext/p7zip/CPP/include_windows/windows.h +17 -11
- data/ext/p7zip/CPP/myWindows/StdAfx.h +97 -5
- data/ext/p7zip/CPP/myWindows/config.h +20 -5
- data/ext/p7zip/CPP/myWindows/myPrivate.h +8 -0
- data/ext/p7zip/CPP/myWindows/wine_date_and_time.cpp +34 -0
- data/ext/p7zip/ChangeLog +283 -35
- data/ext/p7zip/{DOCS → DOC}/7zC.txt +6 -13
- data/ext/p7zip/{DOCS → DOC}/License.txt +3 -2
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/add.htm +93 -87
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/bench.htm +88 -79
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/delete.htm +62 -59
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract.htm +96 -91
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/extract_full.htm +73 -68
- data/ext/p7zip/DOC/MANUAL/cmdline/commands/hash.htm +65 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/index.htm +36 -33
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/list.htm +78 -77
- data/ext/p7zip/DOC/MANUAL/cmdline/commands/rename.htm +51 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/test.htm +47 -46
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/commands/update.htm +71 -66
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/exit_codes.htm +27 -27
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/index.htm +29 -29
- data/ext/p7zip/{DOCS/MANUAL/switches → DOC/MANUAL/cmdline}/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_exclude.htm +56 -56
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_include.htm +80 -83
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ar_no.htm +52 -52
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/bb.htm +61 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/bs.htm +67 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/charset.htm +61 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/exclude.htm +71 -60
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/include.htm +89 -87
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/index.htm +95 -64
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/large_pages.htm +59 -50
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/list_tech.htm +36 -36
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/method.htm +738 -625
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/output_dir.htm +53 -53
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/overwrite.htm +56 -56
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/password.htm +55 -54
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/recurse.htm +85 -83
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sa.htm +58 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/scc.htm +42 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm +53 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm +39 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/sfx.htm +153 -156
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/shared.htm +40 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sni.htm +56 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/sns.htm +77 -0
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/spf.htm +80 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/ssc.htm +50 -50
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdin.htm +56 -55
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stdout.htm +54 -50
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/stl.htm +39 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/stop_switch.htm +31 -31
- data/ext/p7zip/DOC/MANUAL/cmdline/switches/stx.htm +50 -0
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline/switches}/style.css +232 -232
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/type.htm +121 -83
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/update.htm +177 -176
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/volume.htm +49 -49
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/working_dir.htm +56 -55
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/switches/yes.htm +48 -48
- data/ext/p7zip/{DOCS/MANUAL → DOC/MANUAL/cmdline}/syntax.htm +120 -120
- data/ext/p7zip/DOC/MANUAL/fm/about.htm +21 -0
- data/ext/p7zip/DOC/MANUAL/fm/benchmark.htm +56 -0
- data/ext/p7zip/DOC/MANUAL/fm/index.htm +54 -0
- data/ext/p7zip/DOC/MANUAL/fm/menu.htm +154 -0
- data/ext/p7zip/DOC/MANUAL/fm/options.htm +152 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm +311 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm +78 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm +63 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/index.htm +22 -0
- data/ext/p7zip/DOC/MANUAL/fm/plugins/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/fm/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/general/7z.htm +117 -0
- data/ext/p7zip/DOC/MANUAL/general/faq.htm +125 -0
- data/ext/p7zip/DOC/MANUAL/general/formats.htm +100 -0
- data/ext/p7zip/DOC/MANUAL/general/index.htm +27 -0
- data/ext/p7zip/DOC/MANUAL/general/license.htm +30 -0
- data/ext/p7zip/DOC/MANUAL/general/performance.htm +98 -0
- data/ext/p7zip/DOC/MANUAL/general/style.css +232 -0
- data/ext/p7zip/DOC/MANUAL/general/thanks.htm +43 -0
- data/ext/p7zip/DOC/MANUAL/start.htm +37 -0
- data/ext/p7zip/DOC/MANUAL/style.css +232 -0
- data/ext/p7zip/DOC/Methods.txt +158 -0
- data/ext/p7zip/{DOCS → DOC}/copying.txt +9 -11
- data/ext/p7zip/DOC/lzma.txt +328 -0
- data/ext/p7zip/{DOCS → DOC}/readme.txt +42 -65
- data/ext/p7zip/{DOCS/history.txt → DOC/src-history.txt} +88 -2
- data/ext/p7zip/README +117 -91
- data/ext/p7zip/TODO +0 -2
- data/ext/p7zip/install.sh +31 -29
- data/ext/p7zip/last_error +1 -0
- data/ext/p7zip/makefile +29 -125
- data/ext/p7zip/makefile.afl +23 -0
- data/ext/p7zip/makefile.aix_gcc +5 -4
- data/ext/p7zip/makefile.android_arm +49 -0
- data/ext/p7zip/makefile.beos +5 -4
- data/ext/p7zip/makefile.common +150 -0
- data/ext/p7zip/makefile.crc32 +3 -3
- data/ext/p7zip/makefile.cygwin +5 -4
- data/ext/p7zip/makefile.cygwin64 +21 -0
- data/ext/p7zip/makefile.cygwin64_asm +22 -0
- data/ext/p7zip/makefile.cygwin_asm +6 -4
- data/ext/p7zip/makefile.cygwin_clang +21 -0
- data/ext/p7zip/makefile.cygwin_clang_asm +23 -0
- data/ext/p7zip/{makefile.djgpp_old → makefile.djgpp} +5 -4
- data/ext/p7zip/makefile.djgpp_watt +7 -5
- data/ext/p7zip/makefile.freebsd5 +5 -4
- data/ext/p7zip/{makefile.freebsd6 → makefile.freebsd6+} +6 -5
- data/ext/p7zip/makefile.glb +27 -18
- data/ext/p7zip/makefile.gprof +3 -2
- data/ext/p7zip/makefile.haiku +19 -0
- data/ext/p7zip/makefile.hpux-acc +3 -2
- data/ext/p7zip/makefile.hpux-acc_64 +3 -2
- data/ext/p7zip/makefile.hpux-gcc +5 -4
- data/ext/p7zip/makefile.linux_amd64 +5 -4
- data/ext/p7zip/makefile.linux_amd64_asm +12 -5
- data/ext/p7zip/makefile.linux_amd64_asm_icc +5 -3
- data/ext/p7zip/makefile.linux_amd64_sanitizer +26 -0
- data/ext/p7zip/makefile.linux_any_cpu +5 -4
- data/ext/p7zip/makefile.linux_any_cpu_gcc_4.X +7 -4
- data/ext/p7zip/makefile.linux_clang_amd64_asm +25 -0
- data/ext/p7zip/makefile.linux_clang_amd64_asm_sanitize +27 -0
- data/ext/p7zip/makefile.linux_cross_aarch64 +25 -0
- data/ext/p7zip/makefile.linux_cross_arm +7 -4
- data/ext/p7zip/makefile.linux_cross_djgpp +27 -0
- data/ext/p7zip/makefile.linux_cross_m68k +26 -0
- data/ext/p7zip/makefile.linux_cross_mipsel +27 -0
- data/ext/p7zip/makefile.linux_cross_ppc +25 -0
- data/ext/p7zip/makefile.linux_cross_ppc64 +25 -0
- data/ext/p7zip/makefile.linux_cross_ppc64le +25 -0
- data/ext/p7zip/makefile.linux_cross_s390x +25 -0
- data/ext/p7zip/makefile.linux_cross_sparc64 +25 -0
- data/ext/p7zip/makefile.linux_gcc6_sanitize +23 -0
- data/ext/p7zip/makefile.linux_gcc_2.95_no_need_for_libstdc +6 -4
- data/ext/p7zip/makefile.linux_other +6 -5
- data/ext/p7zip/makefile.linux_s390x +5 -4
- data/ext/p7zip/{makefile.machine_base → makefile.linux_scan-build} +5 -4
- data/ext/p7zip/makefile.linux_valgrind +25 -0
- data/ext/p7zip/{makefile.linux_clang_amd64 → makefile.linux_x32} +6 -5
- data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X +10 -5
- data/ext/p7zip/makefile.linux_x86_asm_gcc_4.X_fltk +8 -4
- data/ext/p7zip/makefile.linux_x86_asm_gcc_mudflap_4.X +4 -2
- data/ext/p7zip/makefile.linux_x86_asm_icc +4 -2
- data/ext/p7zip/makefile.linux_x86_icc +3 -2
- data/ext/p7zip/makefile.macosx_arm64 +17 -0
- data/ext/p7zip/{makefile.macosx_32bits → makefile.macosx_gcc_32bits} +3 -2
- data/ext/p7zip/{makefile.macosx_32bits_asm → makefile.macosx_gcc_32bits_asm} +5 -3
- data/ext/p7zip/{makefile.macosx_32bits_ppc → makefile.macosx_gcc_32bits_ppc} +3 -2
- data/ext/p7zip/{makefile.macosx_64bits → makefile.macosx_gcc_64bits} +3 -2
- data/ext/p7zip/makefile.macosx_llvm_64bits +9 -3
- data/ext/p7zip/makefile.netbsd +5 -4
- data/ext/p7zip/makefile.netware_asm_gcc_3.X +6 -4
- data/ext/p7zip/makefile.oldmake +41 -130
- data/ext/p7zip/makefile.openbsd +7 -3
- data/ext/p7zip/makefile.openbsd_no_port +9 -5
- data/ext/p7zip/makefile.qnx_shared.bin +5 -4
- data/ext/p7zip/makefile.qnx_static +5 -4
- data/ext/p7zip/makefile.solaris_sparc_CC_32 +5 -4
- data/ext/p7zip/makefile.solaris_sparc_CC_64 +6 -4
- data/ext/p7zip/makefile.solaris_sparc_gcc +7 -6
- data/ext/p7zip/makefile.solaris_x86 +5 -4
- data/ext/p7zip/makefile.tru64 +5 -4
- data/ext/seven_zip_ruby/extconf.rb +92 -6
- data/ext/seven_zip_ruby/seven_zip_archive.cpp +40 -17
- data/ext/seven_zip_ruby/seven_zip_archive.h +1 -1
- data/ext/seven_zip_ruby/utils.cpp +267 -124
- data/ext/seven_zip_ruby/utils.h +2 -0
- data/lib/seven_zip_ruby/7z.dll +0 -0
- data/lib/seven_zip_ruby/7z.sfx +0 -0
- data/lib/seven_zip_ruby/7z64.dll +0 -0
- data/lib/seven_zip_ruby/7zCon.sfx +0 -0
- data/lib/seven_zip_ruby/seven_zip_reader.rb +16 -1
- data/lib/seven_zip_ruby/version.rb +1 -1
- data/p7zip/.gitignore +7 -0
- data/p7zip/README.txt +29 -0
- data/p7zip/extract.sh +134 -0
- data/spec/seven_zip_ruby_spec.rb +22 -13
- data/test/res/The Flying Spaghetti Monster.txt +3 -0
- data/test/res/The Three Little Pigs.txt +5 -0
- data/test/res/UTF_content.txt +3 -0
- data/test/res/test_reader_data.7z +0 -0
- data/test/res/test_reader_filename_cp932.7z +0 -0
- data/test/res/test_reader_files.7z +0 -0
- data/test/test_seven_zip_reader.rb +187 -0
- data/test/test_seven_zip_writer.rb +184 -0
- metadata +267 -219
- data/.github/workflows/test-and-release.yml +0 -43
- data/ext/C/Types.h +0 -254
- data/ext/CPP/7zip/Archive/IArchive.h +0 -234
- data/ext/CPP/7zip/IDecl.h +0 -15
- data/ext/CPP/7zip/IPassword.h +0 -24
- data/ext/CPP/7zip/IProgress.h +0 -33
- data/ext/CPP/7zip/IStream.h +0 -58
- data/ext/CPP/7zip/PropID.h +0 -76
- data/ext/CPP/Common/MyCom.h +0 -225
- data/ext/CPP/Common/MyGuidDef.h +0 -54
- data/ext/CPP/Common/MyInitGuid.h +0 -22
- data/ext/CPP/Common/MyUnknown.h +0 -13
- data/ext/CPP/Common/MyWindows.h +0 -204
- data/ext/CPP/Common/Types.h +0 -11
- data/ext/CPP/Windows/PropVariant.h +0 -56
- data/ext/CPP/include_windows/basetyps.h +0 -19
- data/ext/CPP/include_windows/tchar.h +0 -89
- data/ext/CPP/include_windows/windows.h +0 -194
- data/ext/p7zip/Asm/x64/7zCrcT8U.asm +0 -103
- data/ext/p7zip/Asm/x86/7zCrcT8U.asm +0 -101
- data/ext/p7zip/C/7zCrcT8.c +0 -43
- data/ext/p7zip/C/Alloc.back3 +0 -238
- data/ext/p7zip/C/Alloc.c.back +0 -243
- data/ext/p7zip/C/Alloc.c.back2 +0 -222
- data/ext/p7zip/C/LzmaUtil/Lzma86Dec.h +0 -51
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.cpp +0 -149
- data/ext/p7zip/CPP/7zip/Archive/7z/7zFolderOutStream.h +0 -58
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.cpp +0 -24
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmHeader.h +0 -28
- data/ext/p7zip/CPP/7zip/Archive/Chm/ChmRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.cpp +0 -239
- data/ext/p7zip/CPP/7zip/Archive/Com/ComHandler.h +0 -28
- data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.cpp +0 -389
- data/ext/p7zip/CPP/7zip/Archive/Com/ComIn.h +0 -119
- data/ext/p7zip/CPP/7zip/Archive/Com/ComRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.cpp +0 -240
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2MT.h +0 -80
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.cpp +0 -239
- data/ext/p7zip/CPP/7zip/Archive/Common/CoderMixer2ST.h +0 -88
- data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.cpp +0 -15
- data/ext/p7zip/CPP/7zip/Archive/Common/CrossThreadProgress.h +0 -37
- data/ext/p7zip/CPP/7zip/Archive/DebHandler.cpp +0 -413
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.cpp +0 -243
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsHandler.h +0 -26
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.cpp +0 -480
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsIn.h +0 -154
- data/ext/p7zip/CPP/7zip/Archive/Hfs/HfsRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarHeader.cpp +0 -21
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.cpp +0 -478
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarIn.h +0 -123
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarItem.cpp +0 -55
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp +0 -78
- data/ext/p7zip/CPP/7zip/Archive/Rar/RarVolumeInStream.h +0 -49
- data/ext/p7zip/CPP/7zip/Archive/Udf/UdfRegister.cpp +0 -13
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipHeader.cpp +0 -36
- data/ext/p7zip/CPP/7zip/Archive/Zip/ZipItemEx.h +0 -34
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zFM.txt +0 -163
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7zG.txt +0 -131
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_7za.txt +0 -253
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt +0 -32
- data/ext/p7zip/CPP/7zip/CMAKE/CMakeLists_Format7zFree.txt +0 -290
- data/ext/p7zip/CPP/7zip/CMAKE/generate.sh +0 -37
- data/ext/p7zip/CPP/7zip/CMAKE/generate_xcode.sh +0 -32
- data/ext/p7zip/CPP/7zip/Common/LockedStream.cpp +0 -23
- data/ext/p7zip/CPP/7zip/Common/LockedStream.h +0 -38
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.cpp +0 -309
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder1.h +0 -98
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.cpp +0 -90
- data/ext/p7zip/CPP/7zip/Compress/ArjDecoder2.h +0 -59
- data/ext/p7zip/CPP/7zip/Compress/BranchCoder.cpp +0 -19
- data/ext/p7zip/CPP/7zip/Compress/BranchCoder.h +0 -44
- data/ext/p7zip/CPP/7zip/Compress/DllExports.cpp +0 -39
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp +0 -531
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp +0 -1018
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h +0 -48
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp +0 -311
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h +0 -20
- data/ext/p7zip/CPP/7zip/Compress/LZMA_Alone/makefile +0 -173
- data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.cpp +0 -90
- data/ext/p7zip/CPP/7zip/Compress/Lzx86Converter.h +0 -46
- data/ext/p7zip/CPP/7zip/Compress/RangeCoder.h +0 -205
- data/ext/p7zip/CPP/7zip/Compress/RangeCoderBit.h +0 -114
- data/ext/p7zip/CPP/7zip/Crypto/Sha1.cpp +0 -229
- data/ext/p7zip/CPP/7zip/Crypto/Sha1.h +0 -68
- data/ext/p7zip/CPP/7zip/PREMAKE/generate.sh +0 -18
- data/ext/p7zip/CPP/7zip/PREMAKE/premake4.lua +0 -263
- data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA.pro +0 -228
- data/ext/p7zip/CPP/7zip/QMAKE/7ZA/7ZA_osx.pro +0 -228
- data/ext/p7zip/CPP/7zip/QMAKE/test_emul/test_emul.pro +0 -26
- data/ext/p7zip/CPP/7zip/TEST/TestUI/TestUI.cpp +0 -560
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile +0 -33
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.depend +0 -577
- data/ext/p7zip/CPP/7zip/TEST/TestUI/makefile.list +0 -16
- data/ext/p7zip/CPP/Common/Buffer.h +0 -77
- data/ext/p7zip/CPP/Common/Types.h +0 -11
- data/ext/p7zip/CPP/Windows/COM.cpp +0 -37
- data/ext/p7zip/CPP/Windows/COM.h +0 -69
- data/ext/p7zip/CPP/Windows/Clipboard.cpp +0 -160
- data/ext/p7zip/CPP/Windows/Clipboard.h +0 -28
- data/ext/p7zip/CPP/Windows/CommonDialog.h +0 -19
- data/ext/p7zip/CPP/Windows/Control/ComboBox.h +0 -82
- data/ext/p7zip/CPP/Windows/Control/Controls.cpp +0 -515
- data/ext/p7zip/CPP/Windows/Control/Dialog.cpp +0 -560
- data/ext/p7zip/CPP/Windows/Control/Dialog.h +0 -179
- data/ext/p7zip/CPP/Windows/Control/DialogImpl.h +0 -73
- data/ext/p7zip/CPP/Windows/Control/Edit.h +0 -24
- data/ext/p7zip/CPP/Windows/Control/ListView.h +0 -164
- data/ext/p7zip/CPP/Windows/Control/ProgressBar.h +0 -34
- data/ext/p7zip/CPP/Windows/Control/Static.h +0 -23
- data/ext/p7zip/CPP/Windows/Control/StatusBar.h +0 -56
- data/ext/p7zip/CPP/Windows/Control/Window2.cpp +0 -211
- data/ext/p7zip/CPP/Windows/Control/Window2.h +0 -111
- data/ext/p7zip/CPP/Windows/DLL.cpp +0 -193
- data/ext/p7zip/CPP/Windows/DLL.h +0 -48
- data/ext/p7zip/CPP/Windows/Error.cpp +0 -58
- data/ext/p7zip/CPP/Windows/Error.h +0 -33
- data/ext/p7zip/CPP/Windows/Menu.h +0 -4
- data/ext/p7zip/CPP/Windows/PropVariantConversions.cpp +0 -142
- data/ext/p7zip/CPP/Windows/PropVariantConversions.h +0 -14
- data/ext/p7zip/CPP/Windows/Registry.cpp +0 -313
- data/ext/p7zip/CPP/Windows/Registry.h +0 -113
- data/ext/p7zip/CPP/Windows/ResourceString.h +0 -22
- data/ext/p7zip/CPP/Windows/Shell.h +0 -21
- data/ext/p7zip/CPP/Windows/Time.cpp +0 -88
- data/ext/p7zip/CPP/Windows/Time.h +0 -21
- data/ext/p7zip/CPP/Windows/Window.cpp +0 -101
- data/ext/p7zip/CPP/Windows/Window.h +0 -43
- data/ext/p7zip/CPP/myWindows/initguid.h +0 -4
- data/ext/p7zip/CPP/myWindows/makefile +0 -21
- data/ext/p7zip/CPP/myWindows/makefile.depend +0 -32
- data/ext/p7zip/CPP/myWindows/makefile.list +0 -28
- data/ext/p7zip/CPP/myWindows/myAddExeFlag.cpp +0 -20
- data/ext/p7zip/CPP/myWindows/myGetTickCount.cpp +0 -8
- data/ext/p7zip/CPP/myWindows/mySplitCommandLine.cpp +0 -82
- data/ext/p7zip/CPP/myWindows/test_emul.cpp +0 -745
- data/ext/p7zip/CPP/myWindows/wine_GetXXXDefaultLangID.cpp +0 -741
- data/ext/p7zip/DOCS/MANUAL/switches/charset.htm +0 -49
- data/ext/p7zip/DOCS/Methods.txt +0 -152
- data/ext/p7zip/DOCS/lzma.txt +0 -598
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/ChangeLog +0 -41
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme +0 -21
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/readme.u7z +0 -30
- data/ext/p7zip/contrib/VirtualFileSystemForMidnightCommander/u7z +0 -133
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/README +0 -21
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/check.sh +0 -117
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/check/files.tar +0 -0
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 +0 -33
- data/ext/p7zip/contrib/gzip-like_CLI_wrapper_for_7z/p7zip +0 -144
- data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-shared +0 -14
- data/ext/p7zip/contrib/qnx630sp3/qnx630sp3-static +0 -10
- data/ext/p7zip/integration_context_menu.txt +0 -51
- data/ext/p7zip/makefile.rules +0 -661
- /data/ext/p7zip/{DOCS → DOC}/7zFormat.txt +0 -0
- /data/ext/p7zip/{DOCS → DOC}/unRarLicense.txt +0 -0
@@ -1,1018 +0,0 @@
|
|
1
|
-
// LzmaBench.cpp
|
2
|
-
|
3
|
-
#include "StdAfx.h"
|
4
|
-
|
5
|
-
#include "LzmaBench.h"
|
6
|
-
|
7
|
-
#ifndef _WIN32
|
8
|
-
#define USE_POSIX_TIME
|
9
|
-
#define USE_POSIX_TIME2
|
10
|
-
#endif
|
11
|
-
|
12
|
-
#ifdef USE_POSIX_TIME
|
13
|
-
#include <time.h>
|
14
|
-
#ifdef USE_POSIX_TIME2
|
15
|
-
#include <sys/time.h>
|
16
|
-
#endif
|
17
|
-
#endif
|
18
|
-
|
19
|
-
#ifdef _WIN32
|
20
|
-
#define USE_ALLOCA
|
21
|
-
#endif
|
22
|
-
|
23
|
-
#ifdef USE_ALLOCA
|
24
|
-
#ifdef _WIN32
|
25
|
-
#include <malloc.h>
|
26
|
-
#else
|
27
|
-
#include <stdlib.h>
|
28
|
-
#endif
|
29
|
-
#endif
|
30
|
-
|
31
|
-
#include "../../../../C/7zCrc.h"
|
32
|
-
#include "../../../../C/Alloc.h"
|
33
|
-
|
34
|
-
#include "../../../Common/MyCom.h"
|
35
|
-
|
36
|
-
#ifdef BENCH_MT
|
37
|
-
#include "../../../Windows/Synchronization.h"
|
38
|
-
#include "../../../Windows/Thread.h"
|
39
|
-
#endif
|
40
|
-
|
41
|
-
#ifdef EXTERNAL_LZMA
|
42
|
-
#include "../../../Windows/PropVariant.h"
|
43
|
-
#include "../../ICoder.h"
|
44
|
-
#else
|
45
|
-
#include "../LzmaDecoder.h"
|
46
|
-
#include "../LzmaEncoder.h"
|
47
|
-
#endif
|
48
|
-
|
49
|
-
static const UInt32 kUncompressMinBlockSize = 1 << 26;
|
50
|
-
static const UInt32 kAdditionalSize = (1 << 16);
|
51
|
-
static const UInt32 kCompressedAdditionalSize = (1 << 10);
|
52
|
-
static const UInt32 kMaxLzmaPropSize = 5;
|
53
|
-
|
54
|
-
class CBaseRandomGenerator
|
55
|
-
{
|
56
|
-
UInt32 A1;
|
57
|
-
UInt32 A2;
|
58
|
-
public:
|
59
|
-
CBaseRandomGenerator() { Init(); }
|
60
|
-
void Init() { A1 = 362436069; A2 = 521288629;}
|
61
|
-
UInt32 GetRnd()
|
62
|
-
{
|
63
|
-
return
|
64
|
-
((A1 = 36969 * (A1 & 0xffff) + (A1 >> 16)) << 16) +
|
65
|
-
((A2 = 18000 * (A2 & 0xffff) + (A2 >> 16)) );
|
66
|
-
}
|
67
|
-
};
|
68
|
-
|
69
|
-
class CBenchBuffer
|
70
|
-
{
|
71
|
-
public:
|
72
|
-
size_t BufferSize;
|
73
|
-
Byte *Buffer;
|
74
|
-
CBenchBuffer(): Buffer(0) {}
|
75
|
-
virtual ~CBenchBuffer() { Free(); }
|
76
|
-
void Free()
|
77
|
-
{
|
78
|
-
::MidFree(Buffer);
|
79
|
-
Buffer = 0;
|
80
|
-
}
|
81
|
-
bool Alloc(size_t bufferSize)
|
82
|
-
{
|
83
|
-
if (Buffer != 0 && BufferSize == bufferSize)
|
84
|
-
return true;
|
85
|
-
Free();
|
86
|
-
Buffer = (Byte *)::MidAlloc(bufferSize);
|
87
|
-
BufferSize = bufferSize;
|
88
|
-
return (Buffer != 0);
|
89
|
-
}
|
90
|
-
};
|
91
|
-
|
92
|
-
class CBenchRandomGenerator: public CBenchBuffer
|
93
|
-
{
|
94
|
-
CBaseRandomGenerator *RG;
|
95
|
-
public:
|
96
|
-
void Set(CBaseRandomGenerator *rg) { RG = rg; }
|
97
|
-
UInt32 GetVal(UInt32 &res, int numBits)
|
98
|
-
{
|
99
|
-
UInt32 val = res & (((UInt32)1 << numBits) - 1);
|
100
|
-
res >>= numBits;
|
101
|
-
return val;
|
102
|
-
}
|
103
|
-
UInt32 GetLen(UInt32 &res)
|
104
|
-
{
|
105
|
-
UInt32 len = GetVal(res, 2);
|
106
|
-
return GetVal(res, 1 + len);
|
107
|
-
}
|
108
|
-
void Generate()
|
109
|
-
{
|
110
|
-
UInt32 pos = 0;
|
111
|
-
UInt32 rep0 = 1;
|
112
|
-
while (pos < BufferSize)
|
113
|
-
{
|
114
|
-
UInt32 res = RG->GetRnd();
|
115
|
-
res >>= 1;
|
116
|
-
if (GetVal(res, 1) == 0 || pos < 1024)
|
117
|
-
Buffer[pos++] = (Byte)(res & 0xFF);
|
118
|
-
else
|
119
|
-
{
|
120
|
-
UInt32 len;
|
121
|
-
len = 1 + GetLen(res);
|
122
|
-
if (GetVal(res, 3) != 0)
|
123
|
-
{
|
124
|
-
len += GetLen(res);
|
125
|
-
do
|
126
|
-
{
|
127
|
-
UInt32 ppp = GetVal(res, 5) + 6;
|
128
|
-
res = RG->GetRnd();
|
129
|
-
if (ppp > 30)
|
130
|
-
continue;
|
131
|
-
rep0 = /* (1 << ppp) +*/ GetVal(res, ppp);
|
132
|
-
res = RG->GetRnd();
|
133
|
-
}
|
134
|
-
while (rep0 >= pos);
|
135
|
-
rep0++;
|
136
|
-
}
|
137
|
-
|
138
|
-
for (UInt32 i = 0; i < len && pos < BufferSize; i++, pos++)
|
139
|
-
Buffer[pos] = Buffer[pos - rep0];
|
140
|
-
}
|
141
|
-
}
|
142
|
-
}
|
143
|
-
};
|
144
|
-
|
145
|
-
|
146
|
-
class CBenchmarkInStream:
|
147
|
-
public ISequentialInStream,
|
148
|
-
public CMyUnknownImp
|
149
|
-
{
|
150
|
-
const Byte *Data;
|
151
|
-
size_t Pos;
|
152
|
-
size_t Size;
|
153
|
-
public:
|
154
|
-
MY_UNKNOWN_IMP
|
155
|
-
void Init(const Byte *data, size_t size)
|
156
|
-
{
|
157
|
-
Data = data;
|
158
|
-
Size = size;
|
159
|
-
Pos = 0;
|
160
|
-
}
|
161
|
-
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
162
|
-
};
|
163
|
-
|
164
|
-
STDMETHODIMP CBenchmarkInStream::Read(void *data, UInt32 size, UInt32 *processedSize)
|
165
|
-
{
|
166
|
-
size_t remain = Size - Pos;
|
167
|
-
UInt32 kMaxBlockSize = (1 << 20);
|
168
|
-
if (size > kMaxBlockSize)
|
169
|
-
size = kMaxBlockSize;
|
170
|
-
if (size > remain)
|
171
|
-
size = (UInt32)remain;
|
172
|
-
for (UInt32 i = 0; i < size; i++)
|
173
|
-
((Byte *)data)[i] = Data[Pos + i];
|
174
|
-
Pos += size;
|
175
|
-
if(processedSize != NULL)
|
176
|
-
*processedSize = size;
|
177
|
-
return S_OK;
|
178
|
-
}
|
179
|
-
|
180
|
-
class CBenchmarkOutStream:
|
181
|
-
public ISequentialOutStream,
|
182
|
-
public CBenchBuffer,
|
183
|
-
public CMyUnknownImp
|
184
|
-
{
|
185
|
-
// bool _overflow;
|
186
|
-
public:
|
187
|
-
UInt32 Pos;
|
188
|
-
// CBenchmarkOutStream(): _overflow(false) {}
|
189
|
-
void Init()
|
190
|
-
{
|
191
|
-
// _overflow = false;
|
192
|
-
Pos = 0;
|
193
|
-
}
|
194
|
-
MY_UNKNOWN_IMP
|
195
|
-
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
|
196
|
-
};
|
197
|
-
|
198
|
-
STDMETHODIMP CBenchmarkOutStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
|
199
|
-
{
|
200
|
-
size_t curSize = BufferSize - Pos;
|
201
|
-
if (curSize > size)
|
202
|
-
curSize = size;
|
203
|
-
memcpy(Buffer + Pos, data, curSize);
|
204
|
-
Pos += (UInt32)curSize;
|
205
|
-
if(processedSize != NULL)
|
206
|
-
*processedSize = (UInt32)curSize;
|
207
|
-
if (curSize != size)
|
208
|
-
{
|
209
|
-
// _overflow = true;
|
210
|
-
return E_FAIL;
|
211
|
-
}
|
212
|
-
return S_OK;
|
213
|
-
}
|
214
|
-
|
215
|
-
class CCrcOutStream:
|
216
|
-
public ISequentialOutStream,
|
217
|
-
public CMyUnknownImp
|
218
|
-
{
|
219
|
-
public:
|
220
|
-
UInt32 Crc;
|
221
|
-
MY_UNKNOWN_IMP
|
222
|
-
void Init() { Crc = CRC_INIT_VAL; }
|
223
|
-
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
|
224
|
-
};
|
225
|
-
|
226
|
-
STDMETHODIMP CCrcOutStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
|
227
|
-
{
|
228
|
-
Crc = CrcUpdate(Crc, data, size);
|
229
|
-
if (processedSize != NULL)
|
230
|
-
*processedSize = size;
|
231
|
-
return S_OK;
|
232
|
-
}
|
233
|
-
|
234
|
-
static UInt64 GetTimeCount()
|
235
|
-
{
|
236
|
-
#ifdef USE_POSIX_TIME
|
237
|
-
#ifdef USE_POSIX_TIME2
|
238
|
-
timeval v;
|
239
|
-
if (gettimeofday(&v, 0) == 0)
|
240
|
-
return (UInt64)(v.tv_sec) * 1000000 + v.tv_usec;
|
241
|
-
return (UInt64)time(NULL) * 1000000;
|
242
|
-
#else
|
243
|
-
return time(NULL);
|
244
|
-
#endif
|
245
|
-
#else
|
246
|
-
/*
|
247
|
-
LARGE_INTEGER value;
|
248
|
-
if (::QueryPerformanceCounter(&value))
|
249
|
-
return value.QuadPart;
|
250
|
-
*/
|
251
|
-
return GetTickCount();
|
252
|
-
#endif
|
253
|
-
}
|
254
|
-
|
255
|
-
static UInt64 GetFreq()
|
256
|
-
{
|
257
|
-
#ifdef USE_POSIX_TIME
|
258
|
-
#ifdef USE_POSIX_TIME2
|
259
|
-
return 1000000;
|
260
|
-
#else
|
261
|
-
return 1;
|
262
|
-
#endif
|
263
|
-
#else
|
264
|
-
/*
|
265
|
-
LARGE_INTEGER value;
|
266
|
-
if (::QueryPerformanceFrequency(&value))
|
267
|
-
return value.QuadPart;
|
268
|
-
*/
|
269
|
-
return 1000;
|
270
|
-
#endif
|
271
|
-
}
|
272
|
-
|
273
|
-
#ifndef USE_POSIX_TIME
|
274
|
-
static inline UInt64 GetTime64(const FILETIME &t) { return ((UInt64)t.dwHighDateTime << 32) | t.dwLowDateTime; }
|
275
|
-
#endif
|
276
|
-
static UInt64 GetUserTime()
|
277
|
-
{
|
278
|
-
#ifdef USE_POSIX_TIME
|
279
|
-
return clock();
|
280
|
-
#else
|
281
|
-
FILETIME creationTime, exitTime, kernelTime, userTime;
|
282
|
-
if (::GetProcessTimes(::GetCurrentProcess(), &creationTime, &exitTime, &kernelTime, &userTime) != 0)
|
283
|
-
return GetTime64(userTime) + GetTime64(kernelTime);
|
284
|
-
return (UInt64)GetTickCount() * 10000;
|
285
|
-
#endif
|
286
|
-
}
|
287
|
-
|
288
|
-
static UInt64 GetUserFreq()
|
289
|
-
{
|
290
|
-
#ifdef USE_POSIX_TIME
|
291
|
-
return CLOCKS_PER_SEC;
|
292
|
-
#else
|
293
|
-
return 10000000;
|
294
|
-
#endif
|
295
|
-
}
|
296
|
-
|
297
|
-
class CBenchProgressStatus
|
298
|
-
{
|
299
|
-
#ifdef BENCH_MT
|
300
|
-
NWindows::NSynchronization::CCriticalSection CS;
|
301
|
-
#endif
|
302
|
-
public:
|
303
|
-
HRESULT Res;
|
304
|
-
bool EncodeMode;
|
305
|
-
void SetResult(HRESULT res)
|
306
|
-
{
|
307
|
-
#ifdef BENCH_MT
|
308
|
-
NWindows::NSynchronization::CCriticalSectionLock lock(CS);
|
309
|
-
#endif
|
310
|
-
Res = res;
|
311
|
-
}
|
312
|
-
HRESULT GetResult()
|
313
|
-
{
|
314
|
-
#ifdef BENCH_MT
|
315
|
-
NWindows::NSynchronization::CCriticalSectionLock lock(CS);
|
316
|
-
#endif
|
317
|
-
return Res;
|
318
|
-
}
|
319
|
-
};
|
320
|
-
|
321
|
-
class CBenchProgressInfo:
|
322
|
-
public ICompressProgressInfo,
|
323
|
-
public CMyUnknownImp
|
324
|
-
{
|
325
|
-
public:
|
326
|
-
CBenchProgressStatus *Status;
|
327
|
-
CBenchInfo BenchInfo;
|
328
|
-
HRESULT Res;
|
329
|
-
IBenchCallback *callback;
|
330
|
-
CBenchProgressInfo(): callback(0) {}
|
331
|
-
MY_UNKNOWN_IMP
|
332
|
-
STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
|
333
|
-
};
|
334
|
-
|
335
|
-
void SetStartTime(CBenchInfo &bi)
|
336
|
-
{
|
337
|
-
bi.GlobalFreq = GetFreq();
|
338
|
-
bi.UserFreq = GetUserFreq();
|
339
|
-
bi.GlobalTime = ::GetTimeCount();
|
340
|
-
bi.UserTime = ::GetUserTime();
|
341
|
-
}
|
342
|
-
|
343
|
-
void SetFinishTime(const CBenchInfo &biStart, CBenchInfo &dest)
|
344
|
-
{
|
345
|
-
dest.GlobalFreq = GetFreq();
|
346
|
-
dest.UserFreq = GetUserFreq();
|
347
|
-
dest.GlobalTime = ::GetTimeCount() - biStart.GlobalTime;
|
348
|
-
dest.UserTime = ::GetUserTime() - biStart.UserTime;
|
349
|
-
}
|
350
|
-
|
351
|
-
STDMETHODIMP CBenchProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
|
352
|
-
{
|
353
|
-
HRESULT res = Status->GetResult();
|
354
|
-
if (res != S_OK)
|
355
|
-
return res;
|
356
|
-
if (!callback)
|
357
|
-
return res;
|
358
|
-
CBenchInfo info = BenchInfo;
|
359
|
-
SetFinishTime(BenchInfo, info);
|
360
|
-
if (Status->EncodeMode)
|
361
|
-
{
|
362
|
-
info.UnpackSize = *inSize;
|
363
|
-
info.PackSize = *outSize;
|
364
|
-
res = callback->SetEncodeResult(info, false);
|
365
|
-
}
|
366
|
-
else
|
367
|
-
{
|
368
|
-
info.PackSize = BenchInfo.PackSize + *inSize;
|
369
|
-
info.UnpackSize = BenchInfo.UnpackSize + *outSize;
|
370
|
-
res = callback->SetDecodeResult(info, false);
|
371
|
-
}
|
372
|
-
if (res != S_OK)
|
373
|
-
Status->SetResult(res);
|
374
|
-
return res;
|
375
|
-
}
|
376
|
-
|
377
|
-
static const int kSubBits = 8;
|
378
|
-
|
379
|
-
static UInt32 GetLogSize(UInt32 size)
|
380
|
-
{
|
381
|
-
for (int i = kSubBits; i < 32; i++)
|
382
|
-
for (UInt32 j = 0; j < (1 << kSubBits); j++)
|
383
|
-
if (size <= (((UInt32)1) << i) + (j << (i - kSubBits)))
|
384
|
-
return (i << kSubBits) + j;
|
385
|
-
return (32 << kSubBits);
|
386
|
-
}
|
387
|
-
|
388
|
-
static void NormalizeVals(UInt64 &v1, UInt64 &v2)
|
389
|
-
{
|
390
|
-
while (v1 > 1000000)
|
391
|
-
{
|
392
|
-
v1 >>= 1;
|
393
|
-
v2 >>= 1;
|
394
|
-
}
|
395
|
-
}
|
396
|
-
|
397
|
-
UInt64 GetUsage(const CBenchInfo &info)
|
398
|
-
{
|
399
|
-
UInt64 userTime = info.UserTime;
|
400
|
-
UInt64 userFreq = info.UserFreq;
|
401
|
-
UInt64 globalTime = info.GlobalTime;
|
402
|
-
UInt64 globalFreq = info.GlobalFreq;
|
403
|
-
NormalizeVals(userTime, userFreq);
|
404
|
-
NormalizeVals(globalFreq, globalTime);
|
405
|
-
if (userFreq == 0)
|
406
|
-
userFreq = 1;
|
407
|
-
if (globalTime == 0)
|
408
|
-
globalTime = 1;
|
409
|
-
return userTime * globalFreq * 1000000 / userFreq / globalTime;
|
410
|
-
}
|
411
|
-
|
412
|
-
UInt64 GetRatingPerUsage(const CBenchInfo &info, UInt64 rating)
|
413
|
-
{
|
414
|
-
UInt64 userTime = info.UserTime;
|
415
|
-
UInt64 userFreq = info.UserFreq;
|
416
|
-
UInt64 globalTime = info.GlobalTime;
|
417
|
-
UInt64 globalFreq = info.GlobalFreq;
|
418
|
-
NormalizeVals(userFreq, userTime);
|
419
|
-
NormalizeVals(globalTime, globalFreq);
|
420
|
-
if (globalFreq == 0)
|
421
|
-
globalFreq = 1;
|
422
|
-
if (userTime == 0)
|
423
|
-
userTime = 1;
|
424
|
-
return userFreq * globalTime / globalFreq * rating / userTime;
|
425
|
-
}
|
426
|
-
|
427
|
-
static UInt64 MyMultDiv64(UInt64 value, UInt64 elapsedTime, UInt64 freq)
|
428
|
-
{
|
429
|
-
UInt64 elTime = elapsedTime;
|
430
|
-
NormalizeVals(freq, elTime);
|
431
|
-
if (elTime == 0)
|
432
|
-
elTime = 1;
|
433
|
-
return value * freq / elTime;
|
434
|
-
}
|
435
|
-
|
436
|
-
UInt64 GetCompressRating(UInt32 dictionarySize, UInt64 elapsedTime, UInt64 freq, UInt64 size)
|
437
|
-
{
|
438
|
-
UInt64 t = GetLogSize(dictionarySize) - (kBenchMinDicLogSize << kSubBits);
|
439
|
-
UInt64 numCommandsForOne = 870 + ((t * t * 5) >> (2 * kSubBits));
|
440
|
-
UInt64 numCommands = (UInt64)(size) * numCommandsForOne;
|
441
|
-
return MyMultDiv64(numCommands, elapsedTime, freq);
|
442
|
-
}
|
443
|
-
|
444
|
-
UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt32 numIterations)
|
445
|
-
{
|
446
|
-
UInt64 numCommands = (inSize * 200 + outSize * 4) * numIterations;
|
447
|
-
return MyMultDiv64(numCommands, elapsedTime, freq);
|
448
|
-
}
|
449
|
-
|
450
|
-
#ifdef EXTERNAL_LZMA
|
451
|
-
typedef UInt32 (WINAPI * CreateObjectPointer)(const GUID *clsID,
|
452
|
-
const GUID *interfaceID, void **outObject);
|
453
|
-
#endif
|
454
|
-
|
455
|
-
struct CEncoderInfo;
|
456
|
-
|
457
|
-
struct CEncoderInfo
|
458
|
-
{
|
459
|
-
#ifdef BENCH_MT
|
460
|
-
NWindows::CThread thread[2];
|
461
|
-
#endif
|
462
|
-
CMyComPtr<ICompressCoder> encoder;
|
463
|
-
CBenchProgressInfo *progressInfoSpec[2];
|
464
|
-
CMyComPtr<ICompressProgressInfo> progressInfo[2];
|
465
|
-
UInt32 NumIterations;
|
466
|
-
#ifdef USE_ALLOCA
|
467
|
-
size_t AllocaSize;
|
468
|
-
#endif
|
469
|
-
|
470
|
-
struct CDecoderInfo
|
471
|
-
{
|
472
|
-
CEncoderInfo *Encoder;
|
473
|
-
UInt32 DecoderIndex;
|
474
|
-
#ifdef USE_ALLOCA
|
475
|
-
size_t AllocaSize;
|
476
|
-
#endif
|
477
|
-
bool CallbackMode;
|
478
|
-
};
|
479
|
-
CDecoderInfo decodersInfo[2];
|
480
|
-
|
481
|
-
CMyComPtr<ICompressCoder> decoders[2];
|
482
|
-
HRESULT Results[2];
|
483
|
-
CBenchmarkOutStream *outStreamSpec;
|
484
|
-
CMyComPtr<ISequentialOutStream> outStream;
|
485
|
-
IBenchCallback *callback;
|
486
|
-
UInt32 crc;
|
487
|
-
UInt32 kBufferSize;
|
488
|
-
UInt32 compressedSize;
|
489
|
-
CBenchRandomGenerator rg;
|
490
|
-
CBenchmarkOutStream *propStreamSpec;
|
491
|
-
CMyComPtr<ISequentialOutStream> propStream;
|
492
|
-
HRESULT Init(UInt32 dictionarySize, UInt32 numThreads, CBaseRandomGenerator *rg);
|
493
|
-
HRESULT Encode();
|
494
|
-
HRESULT Decode(UInt32 decoderIndex);
|
495
|
-
|
496
|
-
CEncoderInfo(): outStreamSpec(0), callback(0), propStreamSpec(0) {}
|
497
|
-
|
498
|
-
#ifdef BENCH_MT
|
499
|
-
static THREAD_FUNC_DECL EncodeThreadFunction(void *param)
|
500
|
-
{
|
501
|
-
CEncoderInfo *encoder = (CEncoderInfo *)param;
|
502
|
-
#ifdef USE_ALLOCA
|
503
|
-
alloca(encoder->AllocaSize);
|
504
|
-
#endif
|
505
|
-
HRESULT res = encoder->Encode();
|
506
|
-
encoder->Results[0] = res;
|
507
|
-
if (res != S_OK)
|
508
|
-
encoder->progressInfoSpec[0]->Status->SetResult(res);
|
509
|
-
|
510
|
-
return 0;
|
511
|
-
}
|
512
|
-
static THREAD_FUNC_DECL DecodeThreadFunction(void *param)
|
513
|
-
{
|
514
|
-
CDecoderInfo *decoder = (CDecoderInfo *)param;
|
515
|
-
#ifdef USE_ALLOCA
|
516
|
-
alloca(decoder->AllocaSize);
|
517
|
-
#endif
|
518
|
-
CEncoderInfo *encoder = decoder->Encoder;
|
519
|
-
encoder->Results[decoder->DecoderIndex] = encoder->Decode(decoder->DecoderIndex);
|
520
|
-
return 0;
|
521
|
-
}
|
522
|
-
|
523
|
-
HRESULT CreateEncoderThread()
|
524
|
-
{
|
525
|
-
return thread[0].Create(EncodeThreadFunction, this);
|
526
|
-
}
|
527
|
-
|
528
|
-
HRESULT CreateDecoderThread(int index, bool callbackMode
|
529
|
-
#ifdef USE_ALLOCA
|
530
|
-
, size_t allocaSize
|
531
|
-
#endif
|
532
|
-
)
|
533
|
-
{
|
534
|
-
CDecoderInfo &decoder = decodersInfo[index];
|
535
|
-
decoder.DecoderIndex = index;
|
536
|
-
decoder.Encoder = this;
|
537
|
-
#ifdef USE_ALLOCA
|
538
|
-
decoder.AllocaSize = allocaSize;
|
539
|
-
#endif
|
540
|
-
decoder.CallbackMode = callbackMode;
|
541
|
-
return thread[index].Create(DecodeThreadFunction, &decoder);
|
542
|
-
}
|
543
|
-
#endif
|
544
|
-
};
|
545
|
-
|
546
|
-
HRESULT CEncoderInfo::Init(UInt32 dictionarySize, UInt32 numThreads, CBaseRandomGenerator *rgLoc)
|
547
|
-
{
|
548
|
-
rg.Set(rgLoc);
|
549
|
-
kBufferSize = dictionarySize + kAdditionalSize;
|
550
|
-
UInt32 kCompressedBufferSize = (kBufferSize / 2) + kCompressedAdditionalSize;
|
551
|
-
if (!rg.Alloc(kBufferSize))
|
552
|
-
return E_OUTOFMEMORY;
|
553
|
-
rg.Generate();
|
554
|
-
crc = CrcCalc(rg.Buffer, rg.BufferSize);
|
555
|
-
|
556
|
-
outStreamSpec = new CBenchmarkOutStream;
|
557
|
-
if (!outStreamSpec->Alloc(kCompressedBufferSize))
|
558
|
-
return E_OUTOFMEMORY;
|
559
|
-
|
560
|
-
outStream = outStreamSpec;
|
561
|
-
|
562
|
-
propStreamSpec = 0;
|
563
|
-
if (!propStream)
|
564
|
-
{
|
565
|
-
propStreamSpec = new CBenchmarkOutStream;
|
566
|
-
propStream = propStreamSpec;
|
567
|
-
}
|
568
|
-
if (!propStreamSpec->Alloc(kMaxLzmaPropSize))
|
569
|
-
return E_OUTOFMEMORY;
|
570
|
-
propStreamSpec->Init();
|
571
|
-
|
572
|
-
PROPID propIDs[] =
|
573
|
-
{
|
574
|
-
NCoderPropID::kDictionarySize,
|
575
|
-
NCoderPropID::kNumThreads
|
576
|
-
};
|
577
|
-
const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]);
|
578
|
-
PROPVARIANT props[kNumProps];
|
579
|
-
props[0].vt = VT_UI4;
|
580
|
-
props[0].ulVal = dictionarySize;
|
581
|
-
|
582
|
-
props[1].vt = VT_UI4;
|
583
|
-
props[1].ulVal = numThreads;
|
584
|
-
|
585
|
-
{
|
586
|
-
CMyComPtr<ICompressSetCoderProperties> setCoderProperties;
|
587
|
-
RINOK(encoder.QueryInterface(IID_ICompressSetCoderProperties, &setCoderProperties));
|
588
|
-
if (!setCoderProperties)
|
589
|
-
return E_FAIL;
|
590
|
-
RINOK(setCoderProperties->SetCoderProperties(propIDs, props, kNumProps));
|
591
|
-
|
592
|
-
CMyComPtr<ICompressWriteCoderProperties> writeCoderProperties;
|
593
|
-
encoder.QueryInterface(IID_ICompressWriteCoderProperties, &writeCoderProperties);
|
594
|
-
if (writeCoderProperties)
|
595
|
-
{
|
596
|
-
RINOK(writeCoderProperties->WriteCoderProperties(propStream));
|
597
|
-
}
|
598
|
-
}
|
599
|
-
return S_OK;
|
600
|
-
}
|
601
|
-
|
602
|
-
HRESULT CEncoderInfo::Encode()
|
603
|
-
{
|
604
|
-
CBenchmarkInStream *inStreamSpec = new CBenchmarkInStream;
|
605
|
-
CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
|
606
|
-
inStreamSpec->Init(rg.Buffer, rg.BufferSize);
|
607
|
-
outStreamSpec->Init();
|
608
|
-
|
609
|
-
RINOK(encoder->Code(inStream, outStream, 0, 0, progressInfo[0]));
|
610
|
-
compressedSize = outStreamSpec->Pos;
|
611
|
-
encoder.Release();
|
612
|
-
return S_OK;
|
613
|
-
}
|
614
|
-
|
615
|
-
HRESULT CEncoderInfo::Decode(UInt32 decoderIndex)
|
616
|
-
{
|
617
|
-
CBenchmarkInStream *inStreamSpec = new CBenchmarkInStream;
|
618
|
-
CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
|
619
|
-
CMyComPtr<ICompressCoder> &decoder = decoders[decoderIndex];
|
620
|
-
|
621
|
-
CMyComPtr<ICompressSetDecoderProperties2> compressSetDecoderProperties;
|
622
|
-
decoder.QueryInterface(IID_ICompressSetDecoderProperties2, &compressSetDecoderProperties);
|
623
|
-
if (!compressSetDecoderProperties)
|
624
|
-
return E_FAIL;
|
625
|
-
|
626
|
-
CCrcOutStream *crcOutStreamSpec = new CCrcOutStream;
|
627
|
-
CMyComPtr<ISequentialOutStream> crcOutStream = crcOutStreamSpec;
|
628
|
-
|
629
|
-
CBenchProgressInfo *pi = progressInfoSpec[decoderIndex];
|
630
|
-
pi->BenchInfo.UnpackSize = 0;
|
631
|
-
pi->BenchInfo.PackSize = 0;
|
632
|
-
|
633
|
-
for (UInt32 j = 0; j < NumIterations; j++)
|
634
|
-
{
|
635
|
-
inStreamSpec->Init(outStreamSpec->Buffer, compressedSize);
|
636
|
-
crcOutStreamSpec->Init();
|
637
|
-
|
638
|
-
RINOK(compressSetDecoderProperties->SetDecoderProperties2(propStreamSpec->Buffer, propStreamSpec->Pos));
|
639
|
-
UInt64 outSize = kBufferSize;
|
640
|
-
RINOK(decoder->Code(inStream, crcOutStream, 0, &outSize, progressInfo[decoderIndex]));
|
641
|
-
if (CRC_GET_DIGEST(crcOutStreamSpec->Crc) != crc)
|
642
|
-
return S_FALSE;
|
643
|
-
pi->BenchInfo.UnpackSize += kBufferSize;
|
644
|
-
pi->BenchInfo.PackSize += compressedSize;
|
645
|
-
}
|
646
|
-
decoder.Release();
|
647
|
-
return S_OK;
|
648
|
-
}
|
649
|
-
|
650
|
-
static const UInt32 kNumThreadsMax = (1 << 16);
|
651
|
-
|
652
|
-
struct CBenchEncoders
|
653
|
-
{
|
654
|
-
CEncoderInfo *encoders;
|
655
|
-
CBenchEncoders(UInt32 num): encoders(0) { encoders = new CEncoderInfo[num]; }
|
656
|
-
~CBenchEncoders() { delete []encoders; }
|
657
|
-
};
|
658
|
-
|
659
|
-
HRESULT LzmaBench(
|
660
|
-
#ifdef EXTERNAL_LZMA
|
661
|
-
CCodecs *codecs,
|
662
|
-
#endif
|
663
|
-
UInt32 numThreads, UInt32 dictionarySize, IBenchCallback *callback)
|
664
|
-
{
|
665
|
-
UInt32 numEncoderThreads =
|
666
|
-
#ifdef BENCH_MT
|
667
|
-
(numThreads > 1 ? numThreads / 2 : 1);
|
668
|
-
#else
|
669
|
-
1;
|
670
|
-
#endif
|
671
|
-
UInt32 numSubDecoderThreads =
|
672
|
-
#ifdef BENCH_MT
|
673
|
-
(numThreads > 1 ? 2 : 1);
|
674
|
-
#else
|
675
|
-
1;
|
676
|
-
#endif
|
677
|
-
if (dictionarySize < (1 << kBenchMinDicLogSize) || numThreads < 1 || numEncoderThreads > kNumThreadsMax)
|
678
|
-
{
|
679
|
-
return E_INVALIDARG;
|
680
|
-
}
|
681
|
-
|
682
|
-
CBenchEncoders encodersSpec(numEncoderThreads);
|
683
|
-
CEncoderInfo *encoders = encodersSpec.encoders;
|
684
|
-
|
685
|
-
#ifdef EXTERNAL_LZMA
|
686
|
-
UString name = L"LZMA";
|
687
|
-
#endif
|
688
|
-
|
689
|
-
UInt32 i;
|
690
|
-
for (i = 0; i < numEncoderThreads; i++)
|
691
|
-
{
|
692
|
-
CEncoderInfo &encoder = encoders[i];
|
693
|
-
encoder.callback = (i == 0) ? callback : 0;
|
694
|
-
|
695
|
-
#ifdef EXTERNAL_LZMA
|
696
|
-
RINOK(codecs->CreateCoder(name, true, encoder.encoder));
|
697
|
-
#else
|
698
|
-
encoder.encoder = new NCompress::NLzma::CEncoder;
|
699
|
-
#endif
|
700
|
-
for (UInt32 j = 0; j < numSubDecoderThreads; j++)
|
701
|
-
{
|
702
|
-
#ifdef EXTERNAL_LZMA
|
703
|
-
RINOK(codecs->CreateCoder(name, false, encoder.decoders[j]));
|
704
|
-
#else
|
705
|
-
encoder.decoders[j] = new NCompress::NLzma::CDecoder;
|
706
|
-
#endif
|
707
|
-
}
|
708
|
-
}
|
709
|
-
|
710
|
-
CBaseRandomGenerator rg;
|
711
|
-
rg.Init();
|
712
|
-
for (i = 0; i < numEncoderThreads; i++)
|
713
|
-
{
|
714
|
-
RINOK(encoders[i].Init(dictionarySize, numThreads, &rg));
|
715
|
-
}
|
716
|
-
|
717
|
-
CBenchProgressStatus status;
|
718
|
-
status.Res = S_OK;
|
719
|
-
status.EncodeMode = true;
|
720
|
-
|
721
|
-
for (i = 0; i < numEncoderThreads; i++)
|
722
|
-
{
|
723
|
-
CEncoderInfo &encoder = encoders[i];
|
724
|
-
for (int j = 0; j < 2; j++)
|
725
|
-
{
|
726
|
-
encoder.progressInfo[j] = encoder.progressInfoSpec[j] = new CBenchProgressInfo;
|
727
|
-
encoder.progressInfoSpec[j]->Status = &status;
|
728
|
-
}
|
729
|
-
if (i == 0)
|
730
|
-
{
|
731
|
-
encoder.progressInfoSpec[0]->callback = callback;
|
732
|
-
encoder.progressInfoSpec[0]->BenchInfo.NumIterations = numEncoderThreads;
|
733
|
-
SetStartTime(encoder.progressInfoSpec[0]->BenchInfo);
|
734
|
-
}
|
735
|
-
|
736
|
-
#ifdef BENCH_MT
|
737
|
-
if (numEncoderThreads > 1)
|
738
|
-
{
|
739
|
-
#ifdef USE_ALLOCA
|
740
|
-
encoder.AllocaSize = (i * 16 * 21) & 0x7FF;
|
741
|
-
#endif
|
742
|
-
RINOK(encoder.CreateEncoderThread())
|
743
|
-
}
|
744
|
-
else
|
745
|
-
#endif
|
746
|
-
{
|
747
|
-
RINOK(encoder.Encode());
|
748
|
-
}
|
749
|
-
}
|
750
|
-
#ifdef BENCH_MT
|
751
|
-
if (numEncoderThreads > 1)
|
752
|
-
for (i = 0; i < numEncoderThreads; i++)
|
753
|
-
encoders[i].thread[0].Wait();
|
754
|
-
#endif
|
755
|
-
|
756
|
-
RINOK(status.Res);
|
757
|
-
|
758
|
-
CBenchInfo info;
|
759
|
-
|
760
|
-
SetFinishTime(encoders[0].progressInfoSpec[0]->BenchInfo, info);
|
761
|
-
info.UnpackSize = 0;
|
762
|
-
info.PackSize = 0;
|
763
|
-
info.NumIterations = 1; // progressInfoSpec->NumIterations;
|
764
|
-
for (i = 0; i < numEncoderThreads; i++)
|
765
|
-
{
|
766
|
-
CEncoderInfo &encoder = encoders[i];
|
767
|
-
info.UnpackSize += encoder.kBufferSize;
|
768
|
-
info.PackSize += encoder.compressedSize;
|
769
|
-
}
|
770
|
-
RINOK(callback->SetEncodeResult(info, true));
|
771
|
-
|
772
|
-
|
773
|
-
status.Res = S_OK;
|
774
|
-
status.EncodeMode = false;
|
775
|
-
|
776
|
-
UInt32 numDecoderThreads = numEncoderThreads * numSubDecoderThreads;
|
777
|
-
for (i = 0; i < numEncoderThreads; i++)
|
778
|
-
{
|
779
|
-
CEncoderInfo &encoder = encoders[i];
|
780
|
-
encoder.NumIterations = 2 + kUncompressMinBlockSize / encoder.kBufferSize;
|
781
|
-
|
782
|
-
if (i == 0)
|
783
|
-
{
|
784
|
-
encoder.progressInfoSpec[0]->callback = callback;
|
785
|
-
encoder.progressInfoSpec[0]->BenchInfo.NumIterations = numDecoderThreads;
|
786
|
-
SetStartTime(encoder.progressInfoSpec[0]->BenchInfo);
|
787
|
-
}
|
788
|
-
|
789
|
-
#ifdef BENCH_MT
|
790
|
-
if (numDecoderThreads > 1)
|
791
|
-
{
|
792
|
-
for (UInt32 j = 0; j < numSubDecoderThreads; j++)
|
793
|
-
{
|
794
|
-
HRESULT res = encoder.CreateDecoderThread(j, (i == 0 && j == 0)
|
795
|
-
#ifdef USE_ALLOCA
|
796
|
-
, ((i * numSubDecoderThreads + j) * 16 * 21) & 0x7FF
|
797
|
-
#endif
|
798
|
-
);
|
799
|
-
RINOK(res);
|
800
|
-
}
|
801
|
-
}
|
802
|
-
else
|
803
|
-
#endif
|
804
|
-
{
|
805
|
-
RINOK(encoder.Decode(0));
|
806
|
-
}
|
807
|
-
}
|
808
|
-
#ifdef BENCH_MT
|
809
|
-
HRESULT res = S_OK;
|
810
|
-
if (numDecoderThreads > 1)
|
811
|
-
for (i = 0; i < numEncoderThreads; i++)
|
812
|
-
for (UInt32 j = 0; j < numSubDecoderThreads; j++)
|
813
|
-
{
|
814
|
-
CEncoderInfo &encoder = encoders[i];
|
815
|
-
encoder.thread[j].Wait();
|
816
|
-
if (encoder.Results[j] != S_OK)
|
817
|
-
res = encoder.Results[j];
|
818
|
-
}
|
819
|
-
RINOK(res);
|
820
|
-
#endif
|
821
|
-
RINOK(status.Res);
|
822
|
-
SetFinishTime(encoders[0].progressInfoSpec[0]->BenchInfo, info);
|
823
|
-
info.UnpackSize = 0;
|
824
|
-
info.PackSize = 0;
|
825
|
-
info.NumIterations = numSubDecoderThreads * encoders[0].NumIterations;
|
826
|
-
for (i = 0; i < numEncoderThreads; i++)
|
827
|
-
{
|
828
|
-
CEncoderInfo &encoder = encoders[i];
|
829
|
-
info.UnpackSize += encoder.kBufferSize;
|
830
|
-
info.PackSize += encoder.compressedSize;
|
831
|
-
}
|
832
|
-
RINOK(callback->SetDecodeResult(info, false));
|
833
|
-
RINOK(callback->SetDecodeResult(info, true));
|
834
|
-
return S_OK;
|
835
|
-
}
|
836
|
-
|
837
|
-
|
838
|
-
inline UInt64 GetLZMAUsage(bool multiThread, UInt32 dictionary)
|
839
|
-
{
|
840
|
-
UInt32 hs = dictionary - 1;
|
841
|
-
hs |= (hs >> 1);
|
842
|
-
hs |= (hs >> 2);
|
843
|
-
hs |= (hs >> 4);
|
844
|
-
hs |= (hs >> 8);
|
845
|
-
hs >>= 1;
|
846
|
-
hs |= 0xFFFF;
|
847
|
-
if (hs > (1 << 24))
|
848
|
-
hs >>= 1;
|
849
|
-
hs++;
|
850
|
-
return ((hs + (1 << 16)) + (UInt64)dictionary * 2) * 4 + (UInt64)dictionary * 3 / 2 +
|
851
|
-
(1 << 20) + (multiThread ? (6 << 20) : 0);
|
852
|
-
}
|
853
|
-
|
854
|
-
UInt64 GetBenchMemoryUsage(UInt32 numThreads, UInt32 dictionary)
|
855
|
-
{
|
856
|
-
const UInt32 kBufferSize = dictionary;
|
857
|
-
const UInt32 kCompressedBufferSize = (kBufferSize / 2);
|
858
|
-
UInt32 numSubThreads = (numThreads > 1) ? 2 : 1;
|
859
|
-
UInt32 numBigThreads = numThreads / numSubThreads;
|
860
|
-
return (kBufferSize + kCompressedBufferSize +
|
861
|
-
GetLZMAUsage((numThreads > 1), dictionary) + (2 << 20)) * numBigThreads;
|
862
|
-
}
|
863
|
-
|
864
|
-
static bool CrcBig(const void *data, UInt32 size, UInt32 numCycles, UInt32 crcBase)
|
865
|
-
{
|
866
|
-
for (UInt32 i = 0; i < numCycles; i++)
|
867
|
-
if (CrcCalc(data, size) != crcBase)
|
868
|
-
return false;
|
869
|
-
return true;
|
870
|
-
}
|
871
|
-
|
872
|
-
#ifdef BENCH_MT
|
873
|
-
struct CCrcInfo
|
874
|
-
{
|
875
|
-
NWindows::CThread Thread;
|
876
|
-
const Byte *Data;
|
877
|
-
UInt32 Size;
|
878
|
-
UInt32 NumCycles;
|
879
|
-
UInt32 Crc;
|
880
|
-
bool Res;
|
881
|
-
void Wait()
|
882
|
-
{
|
883
|
-
Thread.Wait();
|
884
|
-
Thread.Close();
|
885
|
-
}
|
886
|
-
};
|
887
|
-
|
888
|
-
static THREAD_FUNC_DECL CrcThreadFunction(void *param)
|
889
|
-
{
|
890
|
-
CCrcInfo *p = (CCrcInfo *)param;
|
891
|
-
p->Res = CrcBig(p->Data, p->Size, p->NumCycles, p->Crc);
|
892
|
-
return 0;
|
893
|
-
}
|
894
|
-
|
895
|
-
struct CCrcThreads
|
896
|
-
{
|
897
|
-
UInt32 NumThreads;
|
898
|
-
CCrcInfo *Items;
|
899
|
-
CCrcThreads(): Items(0), NumThreads(0) {}
|
900
|
-
void WaitAll()
|
901
|
-
{
|
902
|
-
for (UInt32 i = 0; i < NumThreads; i++)
|
903
|
-
Items[i].Wait();
|
904
|
-
NumThreads = 0;
|
905
|
-
}
|
906
|
-
~CCrcThreads()
|
907
|
-
{
|
908
|
-
WaitAll();
|
909
|
-
delete []Items;
|
910
|
-
}
|
911
|
-
};
|
912
|
-
#endif
|
913
|
-
|
914
|
-
static UInt32 CrcCalc1(const Byte *buf, UInt32 size)
|
915
|
-
{
|
916
|
-
UInt32 crc = CRC_INIT_VAL;;
|
917
|
-
for (UInt32 i = 0; i < size; i++)
|
918
|
-
crc = CRC_UPDATE_BYTE(crc, buf[i]);
|
919
|
-
return CRC_GET_DIGEST(crc);
|
920
|
-
}
|
921
|
-
|
922
|
-
static void RandGen(Byte *buf, UInt32 size, CBaseRandomGenerator &RG)
|
923
|
-
{
|
924
|
-
for (UInt32 i = 0; i < size; i++)
|
925
|
-
buf[i] = (Byte)RG.GetRnd();
|
926
|
-
}
|
927
|
-
|
928
|
-
static UInt32 RandGenCrc(Byte *buf, UInt32 size, CBaseRandomGenerator &RG)
|
929
|
-
{
|
930
|
-
RandGen(buf, size, RG);
|
931
|
-
return CrcCalc1(buf, size);
|
932
|
-
}
|
933
|
-
|
934
|
-
bool CrcInternalTest()
|
935
|
-
{
|
936
|
-
CBenchBuffer buffer;
|
937
|
-
const UInt32 kBufferSize0 = (1 << 8);
|
938
|
-
const UInt32 kBufferSize1 = (1 << 10);
|
939
|
-
const UInt32 kCheckSize = (1 << 5);
|
940
|
-
if (!buffer.Alloc(kBufferSize0 + kBufferSize1))
|
941
|
-
return false;
|
942
|
-
Byte *buf = buffer.Buffer;
|
943
|
-
UInt32 i;
|
944
|
-
for (i = 0; i < kBufferSize0; i++)
|
945
|
-
buf[i] = (Byte)i;
|
946
|
-
UInt32 crc1 = CrcCalc1(buf, kBufferSize0);
|
947
|
-
if (crc1 != 0x29058C73)
|
948
|
-
return false;
|
949
|
-
CBaseRandomGenerator RG;
|
950
|
-
RandGen(buf + kBufferSize0, kBufferSize1, RG);
|
951
|
-
for (i = 0; i < kBufferSize0 + kBufferSize1 - kCheckSize; i++)
|
952
|
-
for (UInt32 j = 0; j < kCheckSize; j++)
|
953
|
-
if (CrcCalc1(buf + i, j) != CrcCalc(buf + i, j))
|
954
|
-
return false;
|
955
|
-
return true;
|
956
|
-
}
|
957
|
-
|
958
|
-
HRESULT CrcBench(UInt32 numThreads, UInt32 bufferSize, UInt64 &speed)
|
959
|
-
{
|
960
|
-
if (numThreads == 0)
|
961
|
-
numThreads = 1;
|
962
|
-
|
963
|
-
CBenchBuffer buffer;
|
964
|
-
size_t totalSize = (size_t)bufferSize * numThreads;
|
965
|
-
if (totalSize / numThreads != bufferSize)
|
966
|
-
return E_OUTOFMEMORY;
|
967
|
-
if (!buffer.Alloc(totalSize))
|
968
|
-
return E_OUTOFMEMORY;
|
969
|
-
|
970
|
-
Byte *buf = buffer.Buffer;
|
971
|
-
CBaseRandomGenerator RG;
|
972
|
-
UInt32 numCycles = ((UInt32)1 << 30) / ((bufferSize >> 2) + 1) + 1;
|
973
|
-
|
974
|
-
UInt64 timeVal;
|
975
|
-
#ifdef BENCH_MT
|
976
|
-
CCrcThreads threads;
|
977
|
-
if (numThreads > 1)
|
978
|
-
{
|
979
|
-
threads.Items = new CCrcInfo[numThreads];
|
980
|
-
UInt32 i;
|
981
|
-
for (i = 0; i < numThreads; i++)
|
982
|
-
{
|
983
|
-
CCrcInfo &info = threads.Items[i];
|
984
|
-
Byte *data = buf + (size_t)bufferSize * i;
|
985
|
-
info.Data = data;
|
986
|
-
info.NumCycles = numCycles;
|
987
|
-
info.Size = bufferSize;
|
988
|
-
info.Crc = RandGenCrc(data, bufferSize, RG);
|
989
|
-
}
|
990
|
-
timeVal = GetTimeCount();
|
991
|
-
for (i = 0; i < numThreads; i++)
|
992
|
-
{
|
993
|
-
CCrcInfo &info = threads.Items[i];
|
994
|
-
RINOK(info.Thread.Create(CrcThreadFunction, &info));
|
995
|
-
threads.NumThreads++;
|
996
|
-
}
|
997
|
-
threads.WaitAll();
|
998
|
-
for (i = 0; i < numThreads; i++)
|
999
|
-
if (!threads.Items[i].Res)
|
1000
|
-
return S_FALSE;
|
1001
|
-
}
|
1002
|
-
else
|
1003
|
-
#endif
|
1004
|
-
{
|
1005
|
-
UInt32 crc = RandGenCrc(buf, bufferSize, RG);
|
1006
|
-
timeVal = GetTimeCount();
|
1007
|
-
if (!CrcBig(buf, bufferSize, numCycles, crc))
|
1008
|
-
return S_FALSE;
|
1009
|
-
}
|
1010
|
-
timeVal = GetTimeCount() - timeVal;
|
1011
|
-
if (timeVal == 0)
|
1012
|
-
timeVal = 1;
|
1013
|
-
|
1014
|
-
UInt64 size = (UInt64)numCycles * totalSize;
|
1015
|
-
speed = MyMultDiv64(size, timeVal, GetFreq());
|
1016
|
-
return S_OK;
|
1017
|
-
}
|
1018
|
-
|