[svn-commits] dhubbard: trunk r61575 - in /trunk: include/asterisk/ main/

[svn-commits at lists.digium.com]

Author: dhubbard
Date: Wed Apr 11 15:59:08 2007
New Revision: 61575

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61575
Log:
added HAVE_SYSINFO preprocessor directives for portability and general happiness

Modified:
    trunk/include/asterisk/options.h
    trunk/main/asterisk.c
    trunk/main/pbx.c

Modified: trunk/include/asterisk/options.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/options.h?view=diff&rev=61575&r1=61574&r2=61575
==============================================================================
--- trunk/include/asterisk/options.h (original)
+++ trunk/include/asterisk/options.h Wed Apr 11 15:59:08 2007
@@ -113,7 +113,9 @@
 extern int option_debug;		/*!< Debugging */
 extern int option_maxcalls;		/*!< Maximum number of simultaneous channels */
 extern double option_maxload;
+#if HAVE_SYSINFO
 extern long option_minmemfree;		/*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
+#endif
 extern char defaultlanguage[];
 
 extern time_t ast_startuptime;

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=61575&r1=61574&r2=61575
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Apr 11 15:59:08 2007
@@ -80,7 +80,9 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
+#if HAVE_SYSINFO
 #include <sys/sysinfo.h>
+#endif
 #ifdef linux
 #include <sys/prctl.h>
 #ifdef HAVE_CAP
@@ -164,7 +166,9 @@
 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) */
+#if HAVE_SYSINFO
 long option_minmemfree;				/*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
+#endif
 
 /*! @} */
 
@@ -356,7 +360,9 @@
 	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);
+#if HAVE_SYSINFO
 	ast_cli(fd, "  Min Free Memory:             %ld MB\n", option_minmemfree);
+#endif
 	if (localtime_r(&ast_startuptime, &tm)) {
 		strftime(buf, sizeof(buf), "%H:%M:%S", &tm);
 		ast_cli(fd, "  Startup time:                %s\n", buf);
@@ -410,6 +416,7 @@
 	return 0;
 }
 
+#if HAVE_SYSINFO
 static const char show_sysinfo_help[] =
 "Usage: core show sysinfo\n"
 "       List current system information.\n";
@@ -434,6 +441,7 @@
 	ast_cli(fd, "  Number of Processes:       %d \n\n", sys_info.procs);
 	return 0;
 }
+#endif
 
 struct profile_entry {
 	const char *name;
@@ -1719,9 +1727,11 @@
 	handle_show_threads, "Show running threads",
 	show_threads_help },
 
+#if HAVE_SYSINFO
 	{ { "core", "show", "sysinfo", NULL },
 	handle_show_sysinfo, "Show System Information",
 	show_sysinfo_help },
+#endif
 
 	{ { "core", "show", "profile", NULL },
 	handle_show_profile, "Display profiling info",
@@ -2515,12 +2525,14 @@
 			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);
+#if HAVE_SYSINFO
 		} 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;
 			}
+#endif
 		}
 	}
 	ast_config_destroy(cfg);
@@ -2591,13 +2603,15 @@
 	if (getenv("HOME")) 
 		snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
 	/* Check for options */
-	while ((c = getopt(argc, argv, "mtThfFdvVqprRgciInx:U:G:C:L:M:")) != -1) {
+	while ((c = getopt(argc, argv, "mtThfFdvVqprRgciInx:U:G:C:L:M:e:")) != -1) {
 		switch (c) {
+#if HAVE_SYSINFO
 		case 'e':
 			if ((sscanf(optarg, "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
 				option_minmemfree = 0;
 			}
 			break;
+#endif
 #if HAVE_WORKING_FORK
 		case 'F':
 			ast_set_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK);

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=61575&r1=61574&r2=61575
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Apr 11 15:59:08 2007
@@ -37,7 +37,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <limits.h>
+#if HAVE_SYSINFO
 #include <sys/sysinfo.h>
+#endif
 
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
@@ -2453,8 +2455,10 @@
 {
 	int failed = 0;
 	double curloadavg;
+#if HAVE_SYSINFO
 	long curfreemem;
 	struct sysinfo sys_info;
+#endif
 
 	ast_mutex_lock(&maxcalllock);
 	if (option_maxcalls) {
@@ -2470,6 +2474,7 @@
 			failed = -1;
 		}
 	}
+#if HAVE_SYSINFO
 	if (option_minmemfree) {
 		if (!sysinfo(&sys_info)) {
 			/* make sure that the free system memory is above the configured low watermark
@@ -2482,6 +2487,7 @@
 			}
 		}
 	}
+#endif
 		
 	if (!failed)
 		countcalls++;