[asterisk-commits] file: trunk r77878 - in /trunk: ./ main/

[SVN commits to the Asterisk project]

Author: file
Date: Wed Aug  1 14:37:59 2007
New Revision: 77878

URL: http://svn.digium.com/view/asterisk?view=rev&rev=77878
Log:
Instead of adding the SOLARIS check to each HAVE_SYSINFO check let's just make the sysinfo autoconf logic a bit pickier about what it considers a usable sysinfo.

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/main/asterisk.c
    trunk/main/pbx.c

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=77878&r1=77877&r2=77878
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Aug  1 14:37:59 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 77866 .
+# From configure.ac Revision: 77875 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -16120,7 +16120,7 @@
 int
 main ()
 {
-struct sysinfo sys_info;
+struct sysinfo sys_info; int uptime = sys_info.uptime
   ;
   return 0;
 }

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=77878&r1=77877&r2=77878
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Aug  1 14:37:59 2007
@@ -382,7 +382,7 @@
 AC_MSG_CHECKING(for sysinfo)
 AC_LINK_IFELSE(
         AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
-                        [struct sysinfo sys_info;]),
+                        [struct sysinfo sys_info; int uptime = sys_info.uptime]),
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_SYSINFO], 1, [Define to 1 if your system has sysinfo support]),
         AC_MSG_RESULT(no)

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=77878&r1=77877&r2=77878
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Aug  1 14:37:59 2007
@@ -80,7 +80,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
 #ifdef linux
@@ -166,7 +166,7 @@
 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 defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 long option_minmemfree;				/*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
 #endif
 
@@ -360,7 +360,7 @@
 	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 defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 	ast_cli(fd, "  Min Free Memory:             %ld MB\n", option_minmemfree);
 #endif
 	if (ast_localtime(&ast_startuptime, &tm, NULL)) {
@@ -416,7 +416,7 @@
 	return 0;
 }
 
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 static const char show_sysinfo_help[] =
 "Usage: core show sysinfo\n"
 "       List current system information.\n";
@@ -1647,7 +1647,7 @@
 	handle_show_threads, "Show running threads",
 	show_threads_help },
 
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 	{ { "core", "show", "sysinfo", NULL },
 	handle_show_sysinfo, "Show System Information",
 	show_sysinfo_help },
@@ -2452,7 +2452,7 @@
 			}
 		} else if (!strcasecmp(v->name, "languageprefix")) {
 			ast_language_is_prefix = ast_true(v->value);
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(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 */
@@ -2533,7 +2533,7 @@
 	/* Check for options */
 	while ((c = getopt(argc, argv, "mtThfFdvVqprRgciInx:U:G:C:L:M:e:")) != -1) {
 		switch (c) {
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 		case 'e':
 			if ((sscanf(&optarg[1], "%ld", &option_minmemfree) != 1) || (option_minmemfree < 0)) {
 				option_minmemfree = 0;

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=77878&r1=77877&r2=77878
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Aug  1 14:37:59 2007
@@ -37,7 +37,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <limits.h>
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
 
@@ -2536,7 +2536,7 @@
 {
 	int failed = 0;
 	double curloadavg;
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 	long curfreemem;
 	struct sysinfo sys_info;
 #endif
@@ -2555,7 +2555,7 @@
 			failed = -1;
 		}
 	}
-#if defined(HAVE_SYSINFO) && !defined(SOLARIS)
+#if defined(HAVE_SYSINFO)
 	if (option_minmemfree) {
 		if (!sysinfo(&sys_info)) {
 			/* make sure that the free system memory is above the configured low watermark