From c252f7f4ebed33f3ab938544cdb9dc15c1ffe943 Mon Sep 17 00:00:00 2001 From: Brett Bryant Date: Wed, 16 Jul 2008 21:26:13 +0000 Subject: [PATCH] Merged revisions 131445 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r131445 | bbryant | 2008-07-16 16:24:18 -0500 (Wed, 16 Jul 2008) | 9 lines Fixes an issue with "core show sysinfo" that used the wrong operator to calculate the number of bytes from a sysinfo structure. unsigned long. (closes issue #13057) Reported by: eliel Patches: asterisk.c.patch uploaded by eliel (license 64) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131455 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index 80102120f2..1f45b86bcd 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -502,11 +502,11 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl ast_cli(a->fd, "\nSystem Statistics\n"); ast_cli(a->fd, "-----------------\n"); ast_cli(a->fd, " System Uptime: %ld hours\n", sys_info.uptime/3600); - ast_cli(a->fd, " Total RAM: %ld KiB\n", (sys_info.totalram / sys_info.mem_unit)/1024); - ast_cli(a->fd, " Free RAM: %ld KiB\n", (sys_info.freeram / sys_info.mem_unit)/1024); - ast_cli(a->fd, " Buffer RAM: %ld KiB\n", (sys_info.bufferram / sys_info.mem_unit)/1024); - ast_cli(a->fd, " Total Swap Space: %ld KiB\n", (sys_info.totalswap / sys_info.mem_unit)/1024); - ast_cli(a->fd, " Free Swap Space: %ld KiB\n\n", (sys_info.freeswap / sys_info.mem_unit)/1024); + ast_cli(a->fd, " Total RAM: %ld KiB\n", (sys_info.totalram * sys_info.mem_unit)/1024); + ast_cli(a->fd, " Free RAM: %ld KiB\n", (sys_info.freeram * sys_info.mem_unit)/1024); + ast_cli(a->fd, " Buffer RAM: %ld KiB\n", (sys_info.bufferram * sys_info.mem_unit)/1024); + ast_cli(a->fd, " Total Swap Space: %ld KiB\n", (sys_info.totalswap * sys_info.mem_unit)/1024); + ast_cli(a->fd, " Free Swap Space: %ld KiB\n\n", (sys_info.freeswap * sys_info.mem_unit)/1024); ast_cli(a->fd, " Number of Processes: %d \n\n", sys_info.procs); return CLI_SUCCESS; }