diff options
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/memusagestat.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c index bf33175415..4d57f2cc23 100644 --- a/malloc/memusagestat.c +++ b/malloc/memusagestat.c @@ -191,13 +191,6 @@ main (int argc, char *argv[]) maxsize_heap = headent[1].heap; maxsize_stack = headent[1].stack; maxsize_total = headent[0].stack; - if (also_total) - { - /* We use one scale and since we also draw the total amount of - memory used we have to adapt the maximum. */ - maxsize_heap = maxsize_total; - maxsize_stack = maxsize_total; - } if (maxsize_heap == 0 && maxsize_stack == 0) { @@ -210,18 +203,31 @@ main (int argc, char *argv[]) { if (read (fd, &next, sizeof (next)) == 0) break; - if (next.heap > headent[1].heap) - headent[1].heap = next.heap; - if (next.stack > headent[1].stack) - headent[1].stack = next.stack; + if (next.heap > maxsize_heap) + maxsize_heap = next.heap; + if (next.stack > maxsize_stack) + maxsize_stack = next.stack; + if (maxsize_heap + maxsize_stack > maxsize_total) + maxsize_total = maxsize_heap + maxsize_stack; } + headent[0].stack = maxsize_total; + headent[1].heap = maxsize_heap; + headent[1].stack = maxsize_stack; headent[1].time_low = next.time_low; headent[1].time_high = next.time_high; /* Write the computed values in the file. */ - lseek (fd, sizeof (struct entry), SEEK_SET); - write (fd, &headent[1], sizeof (struct entry)); + lseek (fd, 0, SEEK_SET); + write (fd, headent, 2 * sizeof (struct entry)); + } + + if (also_total) + { + /* We use one scale and since we also draw the total amount of + memory used we have to adapt the maximum. */ + maxsize_heap = maxsize_total; + maxsize_stack = maxsize_total; } start_time = ((uint64_t) headent[0].time_high) << 32 | headent[0].time_low; |