Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

added option_minmemfree for use in asterisk.conf to specify the amount of minimum free memory prior to accepting calls. added CLI 'core show sysinfo' to display system information

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Dwayne M. Hubbard 20 years ago
parent 6fc5c73f78
commit 62256ee410
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
include/asterisk/options.h
Unescape View File

@ -113,6 +113,7 @@ extern int option_verbose;
extern int option_debug; /*!< Debugging */
extern int option_maxcalls; /*!< Maximum number of simultaneous channels */
extern double option_maxload;
extern long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
extern char defaultlanguage[];
extern time_t ast_startuptime;

43
main/asterisk.c
Unescape View File

@ -80,6 +80,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <grp.h>
#include <pwd.h>
#include <sys/stat.h>
#include <sys/sysinfo.h>
#ifdef linux
#include <sys/prctl.h>
#ifdef HAVE_CAP
@ -163,6 +164,7 @@ int option_debug; /*!< Debug level */
double option_maxload; /*!< Max load avg on system */
int option_maxcalls; /*!< Max number of active calls */
int option_maxfiles; /*!< Max number of open file handles (files, sockets) */
long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
/*! @} */
@ -354,6 +356,7 @@ static int handle_show_settings(int fd, int argc, char *argv[])
ast_cli(fd, " Verbosity: %d\n", option_verbose);
ast_cli(fd, " Debug level: %d\n", option_debug);
ast_cli(fd, " Max load avg: %lf\n", option_maxload);
ast_cli(fd, " Min Free Memory: %ld MB\n", option_minmemfree);
if (localtime_r(&ast_startuptime, &tm)) {
strftime(buf, sizeof(buf), "%H:%M:%S", &tm);
ast_cli(fd, " Startup time: %s\n", buf);
@ -407,6 +410,31 @@ static int handle_show_threads(int fd, int argc, char *argv[])
return 0;
}
static const char show_sysinfo_help[] =
"Usage: core show sysinfo\n"
" List current system information.\n";
/*! \brief Give an overview of system statistics */
static int handle_show_sysinfo(int fd, int argc, char *argv[])
{
struct sysinfo sys_info;
if (sysinfo(&sys_info)) {
ast_cli(fd, "FAILED to retrieve system information\n\n");
return 0;
}
ast_cli(fd, "\nSystem Statistics\n");
ast_cli(fd, "-----------------\n");
ast_cli(fd, " System Uptime: %ld hours\n", sys_info.uptime/3600);
ast_cli(fd, " Total RAM: %ld KiB\n", (sys_info.totalram / sys_info.mem_unit)/1024);
ast_cli(fd, " Free RAM: %ld KiB\n", (sys_info.freeram / sys_info.mem_unit)/1024);
ast_cli(fd, " Buffer RAM: %ld KiB\n", (sys_info.bufferram / sys_info.mem_unit)/1024);
ast_cli(fd, " Total Swap Space: %ld KiB\n", (sys_info.totalswap / sys_info.mem_unit)/1024);
ast_cli(fd, " Free Swap Space: %ld KiB\n\n", (sys_info.freeswap / sys_info.mem_unit)/1024);
ast_cli(fd, " Number of Processes: %d \n\n", sys_info.procs);
return 0;
}
struct profile_entry {
const char *name;
uint64_t scale; /* if non-zero, values are scaled by this */
@ -1691,6 +1719,10 @@ static struct ast_cli_entry cli_asterisk[] = {
handle_show_threads, "Show running threads",
show_threads_help },
{ { "core", "show", "sysinfo", NULL },
handle_show_sysinfo, "Show System Information",
show_sysinfo_help },
{ { "core", "show", "profile", NULL },
handle_show_profile, "Display profiling info",
NULL },
@ -2483,6 +2515,12 @@ static void ast_readconfig(void)
ast_copy_string(ast_config_AST_SYSTEM_NAME, v->value, sizeof(ast_config_AST_SYSTEM_NAME));
} else if (!strcasecmp(v->name, "languageprefix")) {
ast_language_is_prefix = ast_true(v->value);
} else if (!strcasecmp(v->name, "minmemfree")) {
/* specify the minimum amount of free memory to retain. Asterisk should stop accepting new calls
* if the amount of free memory falls below this watermark */
if ((sscanf(v->value, "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
option_minmemfree = 0;
}
}
}
ast_config_destroy(cfg);
@ -2555,6 +2593,11 @@ int main(int argc, char *argv[])
/* Check for options */
while ((c = getopt(argc, argv, "mtThfFdvVqprRgciInx:U:G:C:L:M:")) != -1) {
switch (c) {
case 'e':
if ((sscanf(optarg, "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
option_minmemfree = 0;
}
break;
#if HAVE_WORKING_FORK
case 'F':
ast_set_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK);

19
main/pbx.c
Unescape View File

@ -37,6 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <time.h>
#include <sys/time.h>
#include <limits.h>
#include <sys/sysinfo.h>
#include "asterisk/lock.h"
#include "asterisk/cli.h"
@ -2447,11 +2448,14 @@ static int __ast_pbx_run(struct ast_channel *c)
return 0;
}
/* Returns 0 on success, non-zero if call limit was reached */
/* Returns 0 on success, non-zero if a configured limit (maxcalls, maxload, minmemfree) was reached */
static int increase_call_count(const struct ast_channel *c)
{
int failed = 0;
double curloadavg;
long curfreemem;
struct sysinfo sys_info;
ast_mutex_lock(&maxcalllock);
if (option_maxcalls) {
if (countcalls >= option_maxcalls) {
@ -2466,6 +2470,19 @@ static int increase_call_count(const struct ast_channel *c)
failed = -1;
}
}
if (option_minmemfree) {
if (!sysinfo(&sys_info)) {
/* make sure that the free system memory is above the configured low watermark
* convert the amount of freeram from mem_units to MB */
curfreemem = sys_info.freeram / sys_info.mem_unit;
curfreemem /= 1024*1024;
if (curfreemem < option_minmemfree) {
ast_log(LOG_WARNING, "Available system memory (~%ldMB) is below the configured low watermark (%ldMB)\n", curfreemem, option_minmemfree);
failed = -1;
}
}
}
if (!failed)
countcalls++;
ast_mutex_unlock(&maxcalllock);

Write Preview
Loading…
Cancel
Save