From 5497369a670e928362bafa74970a782745ce5324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= Date: Tue, 29 Jun 2010 12:06:23 +0300 Subject: [PATCH] Fix display of sizes (off by 1000/1024). Sizes were read, multiplied by 1000, then displayed as /1024. Obviously that is wrong, fix it. --- ChangeLog | 4 ++++ clamdtop/clamdtop.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index be3fac97b..2ab7da3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 29 12:05:59 EEST 2010 (edwin) +------------------------------------- + * clamdtop/clamdtop.c: fix display of sizes (off by 1000/1024). + Mon Jun 28 18:42:48 CEST 2010 (tk) ---------------------------------- * sigtool/sigtool.c: drop compatibility limit diff --git a/clamdtop/clamdtop.c b/clamdtop/clamdtop.c index 5ebdb2b08..786e1fcfb 100644 --- a/clamdtop/clamdtop.c +++ b/clamdtop/clamdtop.c @@ -755,7 +755,7 @@ static void output_memstats(struct stats *stats) if (stats->mem > 0) snprintf(buf, sizeof(buf),"heap %4luM mmap %4luM unused %3luM", - stats->lheapu/1024, stats->lmmapu/1024, stats->lreleasable/1024); + stats->lheapu/1000, stats->lmmapu/1000, stats->lreleasable/1000); else snprintf(buf, sizeof(buf), "heap N/A mmap N/A unused N/A"); mvwprintw(mem_window, 1, 1, "Mem: "); @@ -764,14 +764,14 @@ static void output_memstats(struct stats *stats) mvwprintw(mem_window, 2, 1, "Libc: "); if (stats->mem > 0) snprintf(buf, sizeof(buf),"used %4luM free %4luM total %4luM", - stats->ltotalu/1024, stats->ltotalf/1024, (stats->ltotalu+stats->ltotalf)/1024); + stats->ltotalu/1000, stats->ltotalf/1000, (stats->ltotalu+stats->ltotalf)/1000); else snprintf(buf, sizeof(buf), "used N/A free N/A total N/A"); print_colored(mem_window, buf); mvwprintw(mem_window, 3, 1, "Pool: "); snprintf(buf, sizeof(buf), "count %4u used %4luM total %4luM", - stats->pools_cnt, stats->lpoolu/1024, stats->lpoolt/1024); + stats->pools_cnt, stats->lpoolu/1000, stats->lpoolt/1000); print_colored(mem_window, buf); totalmem = stats->lheapu + stats->lmmapu + stats->lpoolt;