ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the control lzma properties only once.

Browse source
This commit is contained in:
Con Kolivas 2013-09-01 12:17:51 +10:00
parent 4db4641dae
commit b076dbb59d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lrzip_private.h
View file

@ -377,6 +377,7 @@ struct rzip_control {
pthread_mutex_t control_lock; pthread_mutex_t control_lock;
unsigned char eof; unsigned char eof;
unsigned char magic_written; unsigned char magic_written;
bool lzma_prop_set;
pthread_mutex_t cksumlock; pthread_mutex_t cksumlock;
md5_ctx ctx; md5_ctx ctx;

13
stream.c
View file

@ -304,6 +304,7 @@ static int gzip_compress_buf(rzip_control *control, struct compress_thread *cthr
static int lzma_compress_buf(rzip_control *control, struct compress_thread *cthread) static int lzma_compress_buf(rzip_control *control, struct compress_thread *cthread)
{ {
unsigned char lzma_properties[5]; /* lzma properties, encoded */
int lzma_level, lzma_ret; int lzma_level, lzma_ret;
size_t prop_size = 5; /* return value for lzma_properties */ size_t prop_size = 5; /* return value for lzma_properties */
uchar *c_buf; uchar *c_buf;
@ -325,10 +326,10 @@ retry:
} }
/* with LZMA SDK 4.63, we pass compression level and threads only /* with LZMA SDK 4.63, we pass compression level and threads only
* and receive properties in control->lzma_properties */ * and receive properties in lzma_properties */
lzma_ret = LzmaCompress(c_buf, &dlen, cthread->s_buf, lzma_ret = LzmaCompress(c_buf, &dlen, cthread->s_buf,
(size_t)cthread->s_len, control->lzma_properties, &prop_size, (size_t)cthread->s_len, lzma_properties, &prop_size,
lzma_level, lzma_level,
0, /* dict size. set default, choose by level */ 0, /* dict size. set default, choose by level */
-1, -1, -1, -1, /* lc, lp, pb, fb */ -1, -1, -1, -1, /* lc, lp, pb, fb */
@ -375,6 +376,14 @@ retry:
return 0; return 0;
} }
/* Make sure multiple threads don't race on writing lzma_properties */
lock_mutex(control, &control->control_lock);
if (!control->lzma_prop_set) {
memcpy(control->lzma_properties, lzma_properties, 5);
control->lzma_prop_set = true;
}
unlock_mutex(control, &control->control_lock);
cthread->c_len = dlen; cthread->c_len = dlen;
free(cthread->s_buf); free(cthread->s_buf);
cthread->s_buf = c_buf; cthread->s_buf = c_buf;