Merge branch 'master' into 'master'

- Fixing incorrect memory usage assessment due to skipping vmflags parsing

- Sometimes occurs when calculating memory usage of program using virtual memory. Vmflags line not recognized and affects calculations, resulting in nonsense values. Raised in Red Hat Bugzilla #1262864, affecting upstream.

See merge request !15
This commit is contained in:
Craig Small
2016-06-17 11:56:40 +00:00

4
pmap.c
View File

@ -629,9 +629,9 @@ static int one_proc(proc_t * p)
diff = 0; diff = 0;
continue; continue;
} }
/* Other keys */
continue;
} }
/* Other keys or not a key-value pair */
continue;
} }
sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start, sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start,
&end, perms, &file_offset, &dev_major, &dev_minor, &end, perms, &file_offset, &dev_major, &dev_minor,