Commit ee1fd80f authored by Craig Small's avatar Craig Small

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
parents 8a198e3e f6abbb00
......@@ -629,9 +629,9 @@ static int one_proc(proc_t * p)
diff = 0;
/* Other keys */
/* Other keys or not a key-value pair */
sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start,
&end, perms, &file_offset, &dev_major, &dev_minor,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment