greg/pcompress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update free memory computation to include cached buffers.

Browse source 
Fix a potential rare corner case.
This commit is contained in:
Moinak Ghosh 2013-08-17 11:31:44 +05:30
parent 413a2a2fb1
commit d31c6433c2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rabin/rabin_dedup.c
View file

@ -970,6 +970,7 @@ process_blocks:
for (j = 0; j < length && sub_i < cfg->sub_intervals;) { for (j = 0; j < length && sub_i < cfg->sub_intervals;) {
b = *((uint64_t *)tgt); b = *((uint64_t *)tgt);
tgt += sizeof (uint64_t); tgt += sizeof (uint64_t);
j += sizeof (uint64_t);
if (b != a) { if (b != a) {
*((uint64_t *)sim_ck) = b; *((uint64_t *)sim_ck) = b;
sim_ck += sizeof (uint64_t); sim_ck += sizeof (uint64_t);

8
utils/utils.c
View file

@ -397,10 +397,10 @@ get_sys_limits(my_sysinfo *msys_info)
if (rv == -1) { if (rv == -1) {
sys_info.freeram = 100 * 1024 * 1024; // 100M arbitrary sys_info.freeram = 100 * 1024 * 1024; // 100M arbitrary
} }
msys_info->totalram = sys_info.totalram; msys_info->totalram = sys_info.totalram * sys_info.mem_unit;
msys_info->freeram = sys_info.freeram; msys_info->freeram = sys_info.freeram * sys_info.mem_unit + sys_info.bufferram * sys_info.mem_unit;
msys_info->totalswap = sys_info.totalswap; msys_info->totalswap = sys_info.totalswap * sys_info.mem_unit;
msys_info->freeswap = sys_info.freeswap; msys_info->freeswap = sys_info.freeswap * sys_info.mem_unit;
msys_info->mem_unit = sys_info.mem_unit; msys_info->mem_unit = sys_info.mem_unit;
if ((val = getenv("PCOMPRESS_INDEX_MEM")) != NULL) { if ((val = getenv("PCOMPRESS_INDEX_MEM")) != NULL) {