ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-02-10 09:24:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rationalise the testing now that the default lzma settings use a lot less ram by default.

Browse source
This commit is contained in:
Con Kolivas 2010-12-11 01:07:43 +11:00
parent a6ab7c875b
commit 6c33071118
2 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rzip.c
View file

@ -760,16 +760,16 @@ void rzip_fd(int fd_in, int fd_out)
} else
control.st_size = 0;
/* Optimal use of ram involves no more than 2/3 of it, but 32 bit
* kernels struggle to dish out enough ram */
if (BITS32)
control.max_mmap = control.ramsize / 6;
else
control.max_mmap = control.ramsize / 3 * 2;
/* Optimal use of ram involves using no more than 2/3 of it, so we
* allocate 1/3 of it to the main buffer and use a sliding mmap
* buffer to work on 2/3 ram size, leaving enough ram for the
* compression backends */
control.max_mmap = control.ramsize / 3;
/* On 32 bits we can have a big window with sliding mmap, but can
* not enable much per mmap/malloc */
if (BITS32)
control.max_mmap = MIN(control.max_mmap, two_gig / 2);
control.max_mmap = MIN(control.max_mmap, two_gig);
round_to_page(&control.max_mmap);
/* Set maximum chunk size to proportion of ram according to mode */

22
stream.c
View file

@ -716,7 +716,7 @@ void *open_stream_out(int f, int n, i64 limit, char cbytes)
/* Serious limits imposed on 32 bit capabilities */
if (BITS32)
limit = MIN(limit, two_gig / 6);
limit = MIN(limit, two_gig / 3);
sinfo->s = calloc(sizeof(struct stream), n);
if (unlikely(!sinfo->s)) {
@ -728,10 +728,7 @@ void *open_stream_out(int f, int n, i64 limit, char cbytes)
* ram. We need enough for the 2 streams and for the compression
* backend at most, being conservative. */
retest_malloc:
if (BITS32)
testsize = limit * n * 3;
else
testsize = limit * (n + 1);
testsize = limit * (n + 1);
testmalloc = malloc(testsize);
if (!testmalloc) {
limit = limit / 10 * 9;
@ -747,10 +744,6 @@ retest_malloc:
sinfo->bufsize = MIN(sinfo->bufsize,
MAX((sinfo->bufsize + control.threads - 1) / control.threads, STREAM_BUFSIZE));
/* Largest window supported by lzma on 32 bits is 300MB */
if (BITS32 && LZMA_COMPRESS)
sinfo->bufsize = MIN(sinfo->bufsize, 3 * STREAM_BUFSIZE * 10);
if (control.threads > 1)
print_maxverbose("Using %d threads to compress up to %lld bytes each.\n",
control.threads, sinfo->bufsize);
@ -764,17 +757,6 @@ retest_malloc:
fatal("Unable to malloc buffer of size %lld in open_stream_out\n", sinfo->bufsize);
}
#if 0
/* write the initial headers */
for (i = 0; i < n; i++) {
sinfo->s[i].last_head = sinfo->cur_pos + 17;
write_u8(sinfo->fd, CTYPE_NONE);
write_i64(sinfo->fd, 0);
write_i64(sinfo->fd, 0);
write_i64(sinfo->fd, 0);
sinfo->cur_pos += 25;
}
#endif
return (void *)sinfo;
}