kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Fix 'core show sysinfo' function ordering.

Browse Source 
Handle CLI initialization before any processing occurs.

Change-Id: I598b911d2e409214bbdfd0ba0882be1d602d221c
This commit is contained in:
Corey Farrell
2017-12-09 01:35:12 -05:00
parent 60acbeb431
commit 4decf4e492
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main/asterisk.c
View File

@@ -801,6 +801,27 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
int totalswap = 0; int totalswap = 0;
#if defined(HAVE_SYSINFO) #if defined(HAVE_SYSINFO)
struct sysinfo sys_info; struct sysinfo sys_info;
#elif defined(HAVE_SYSCTL)
static int pageshift;
struct vmtotal vmtotal;
struct timeval boottime;
time_t now;
int mib[2], pagesize, usedswap = 0;
size_t len;
#endif
switch (cmd) {
case CLI_INIT:
e->command = "core show sysinfo";
e->usage =
"Usage: core show sysinfo\n"
" List current system information.\n";
return NULL;
case CLI_GENERATE:
return NULL;
}
#if defined(HAVE_SYSINFO)
sysinfo(&sys_info); sysinfo(&sys_info);
uptime = sys_info.uptime / 3600; uptime = sys_info.uptime / 3600;
physmem = sys_info.totalram * sys_info.mem_unit; physmem = sys_info.totalram * sys_info.mem_unit;
@@ -809,12 +830,6 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
freeswap = (sys_info.freeswap * sys_info.mem_unit) / 1024; freeswap = (sys_info.freeswap * sys_info.mem_unit) / 1024;
nprocs = sys_info.procs; nprocs = sys_info.procs;
#elif defined(HAVE_SYSCTL) #elif defined(HAVE_SYSCTL)
static int pageshift;
struct vmtotal vmtotal;
struct timeval boottime;
time_t now;
int mib[2], pagesize, usedswap = 0;
size_t len;
/* calculate the uptime by looking at boottime */ /* calculate the uptime by looking at boottime */
time(&now); time(&now);
mib[0] = CTL_KERN; mib[0] = CTL_KERN;
@@ -862,17 +877,6 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
#endif #endif
#endif #endif
switch (cmd) {
case CLI_INIT:
e->command = "core show sysinfo";
e->usage =
"Usage: core show sysinfo\n"
" List current system information.\n";
return NULL;
case CLI_GENERATE:
return NULL;
}
ast_cli(a->fd, "\nSystem Statistics\n"); ast_cli(a->fd, "\nSystem Statistics\n");
ast_cli(a->fd, "-----------------\n"); ast_cli(a->fd, "-----------------\n");
ast_cli(a->fd, " System Uptime: %ld hours\n", uptime); ast_cli(a->fd, " System Uptime: %ld hours\n", uptime);