mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-08 14:07:00 -06:00
ef790b5209
- Minor speed optimization for LZMA2 (xz and 7z) multi-threading compression.
7-Zip now uses additional memory buffers for multi-block LZMA2 compression.
CPU utilization was slightly improved.
- 7-zip now creates multi-block xz archives by default. Block size can be
specified with -ms[Size]{m|g} switch.
- xz decoder now can unpack random block from multi-block xz archives. 7-Zip
File Manager now can open nested multi-block xz archives (for example,
image.iso.xz) without full unpacking of xz archive.
- 7-Zip now can create zip archives from stdin to stdout.
- 7-Zip command line: @listfile now doesn't work after -- switch. Use
-i@listfile before -- switch instead.
fixed bugs:
- 7-Zip could add unrequired alternate file streams to WIM archives, for
commands that contain filename wildcards and -sns switch.
- 7-Zip 17.00 beta crashed for commands that write anti-item to 7z archive.
- 7-Zip 17.00 beta ignored "Use large memory pages" option.
152 lines
3.0 KiB
C
152 lines
3.0 KiB
C
/* MtCoder.h -- Multi-thread Coder
|
|
2017-06-18 : Igor Pavlov : Public domain */
|
|
|
|
#ifndef __MT_CODER_H
|
|
#define __MT_CODER_H
|
|
|
|
#include "Threads.h"
|
|
|
|
EXTERN_C_BEGIN
|
|
|
|
/*
|
|
if ( defined MTCODER__USE_WRITE_THREAD) : main thread writes all data blocks to output stream
|
|
if (not defined MTCODER__USE_WRITE_THREAD) : any coder thread can write data blocks to output stream
|
|
*/
|
|
/* #define MTCODER__USE_WRITE_THREAD */
|
|
|
|
#ifndef _7ZIP_ST
|
|
#define MTCODER__GET_NUM_BLOCKS_FROM_THREADS(numThreads) ((numThreads) + (numThreads) / 8 + 1)
|
|
#define MTCODER__THREADS_MAX 64
|
|
#define MTCODER__BLOCKS_MAX (MTCODER__GET_NUM_BLOCKS_FROM_THREADS(MTCODER__THREADS_MAX) + 3)
|
|
#else
|
|
#define MTCODER__THREADS_MAX 1
|
|
#define MTCODER__BLOCKS_MAX 1
|
|
#endif
|
|
|
|
|
|
typedef struct
|
|
{
|
|
UInt64 inSize;
|
|
UInt64 outSize;
|
|
} CMtProgressSizes;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
ICompressProgress *progress;
|
|
SRes res;
|
|
UInt64 totalInSize;
|
|
UInt64 totalOutSize;
|
|
CCriticalSection cs;
|
|
CMtProgressSizes sizes[MTCODER__THREADS_MAX];
|
|
} CMtProgress;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
ICompressProgress vt;
|
|
CMtProgress *mtProgress;
|
|
unsigned index;
|
|
} CMtProgressThunk;
|
|
|
|
void MtProgressThunk_CreateVTable(CMtProgressThunk *p);
|
|
|
|
|
|
|
|
struct _CMtCoder;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
struct _CMtCoder *mtCoder;
|
|
unsigned index;
|
|
int stop;
|
|
Byte *inBuf;
|
|
|
|
CAutoResetEvent startEvent;
|
|
CThread thread;
|
|
} CMtCoderThread;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
SRes (*Code)(void *p, unsigned coderIndex, unsigned outBufIndex,
|
|
const Byte *src, size_t srcSize, int finished);
|
|
SRes (*Write)(void *p, unsigned outBufIndex);
|
|
} IMtCoderCallback2;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
SRes res;
|
|
unsigned bufIndex;
|
|
Bool finished;
|
|
} CMtCoderBlock;
|
|
|
|
|
|
typedef struct _CMtCoder
|
|
{
|
|
/* input variables */
|
|
|
|
size_t blockSize; /* size of input block */
|
|
unsigned numThreadsMax;
|
|
UInt64 expectedDataSize;
|
|
|
|
ISeqInStream *inStream;
|
|
const Byte *inData;
|
|
size_t inDataSize;
|
|
|
|
ICompressProgress *progress;
|
|
ISzAllocPtr allocBig;
|
|
|
|
IMtCoderCallback2 *mtCallback;
|
|
void *mtCallbackObject;
|
|
|
|
|
|
/* internal variables */
|
|
|
|
size_t allocatedBufsSize;
|
|
|
|
CAutoResetEvent readEvent;
|
|
CSemaphore blocksSemaphore;
|
|
|
|
Bool stopReading;
|
|
SRes readRes;
|
|
|
|
#ifdef MTCODER__USE_WRITE_THREAD
|
|
CAutoResetEvent writeEvents[MTCODER__BLOCKS_MAX];
|
|
#else
|
|
CAutoResetEvent finishedEvent;
|
|
SRes writeRes;
|
|
unsigned writeIndex;
|
|
Byte ReadyBlocks[MTCODER__BLOCKS_MAX];
|
|
LONG numFinishedThreads;
|
|
#endif
|
|
|
|
unsigned numStartedThreadsLimit;
|
|
unsigned numStartedThreads;
|
|
|
|
unsigned numBlocksMax;
|
|
unsigned blockIndex;
|
|
UInt64 readProcessed;
|
|
|
|
CCriticalSection cs;
|
|
|
|
unsigned freeBlockHead;
|
|
unsigned freeBlockList[MTCODER__BLOCKS_MAX];
|
|
|
|
CMtProgress mtProgress;
|
|
CMtCoderBlock blocks[MTCODER__BLOCKS_MAX];
|
|
CMtCoderThread threads[MTCODER__THREADS_MAX];
|
|
} CMtCoder;
|
|
|
|
|
|
void MtCoder_Construct(CMtCoder *p);
|
|
void MtCoder_Destruct(CMtCoder *p);
|
|
SRes MtCoder_Code(CMtCoder *p);
|
|
|
|
|
|
EXTERN_C_END
|
|
|
|
#endif
|