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

No need to keep usable_ram as a rzip_control variable.

Browse source
This commit is contained in:
Con Kolivas 2011-03-13 22:28:28 +11:00
parent 66fe056f30
commit d9e9f0d71d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lrzip_private.h
View file

@ -174,7 +174,6 @@ struct rzip_control {
i64 window;
unsigned long flags;
i64 ramsize;
i64 usable_ram;
i64 max_chunk;
i64 max_mmap;
int threads;

15
main.c
View file

@ -634,12 +634,6 @@ int main(int argc, char *argv[])
} else if (ZPAQ_COMPRESS)
control.overhead = 112 * 1024 * 1024;
/* Decrease usable ram size on 32 bits due to kernel/userspace split */
if (BITS32)
control.usable_ram = MAX(control.ramsize - 900000000ll, 900000000ll);
else
control.usable_ram = control.ramsize;
/* Set the main nice value to half that of the backend threads since
* the rzip stage is usually the rate limiting step */
if (control.nice_val > 0 && !NO_COMPRESS) {
@ -710,7 +704,14 @@ int main(int argc, char *argv[])
else
control.maxram = control.ramsize / 3;
if (BITS32) {
control.maxram = MIN(control.maxram, control.usable_ram);
i64 usable_ram;
/* Decrease usable ram size on 32 bits due to kernel /
* userspace split. Cannot allocate larger than a 2
* gigabyte chunk due to 32 bit signed long being
* used in alloc */
usable_ram = MAX(control.ramsize - 900000000ll, 900000000ll);
control.maxram = MIN(control.maxram, usable_ram);
control.maxram = MIN(control.maxram, two_gig);
}
round_to_page(&control.maxram);