[netperf-dev] netperf2 commit notice r223 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2008-02-08 17:03:09 -0800 (Fri, 08 Feb 2008)
New Revision: 223

Modified:
   trunk/configure
   trunk/configure.ac
   trunk/src/netlib.c
Log:
make the uname support based on HAVE_UNAME

Modified: trunk/configure
===================================================================
--- trunk/configure	2008-02-08 19:56:17 UTC (rev 222)
+++ trunk/configure	2008-02-09 01:03:09 UTC (rev 223)
@@ -7534,6 +7534,101 @@
 done
 
 
+
+for ac_func in uname
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 # check for the various CPU binding calls
 
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-02-08 19:56:17 UTC (rev 222)
+++ trunk/configure.ac	2008-02-09 01:03:09 UTC (rev 223)
@@ -92,6 +92,8 @@
 
 AC_CHECK_FUNCS(sendfile)
 
+AC_CHECK_FUNCS(uname)
+
 # check for the various CPU binding calls
 AC_CHECK_FUNCS(mpctl processor_bind sched_setaffinity bind_to_cpu_id bindprocessor)
 

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2008-02-08 19:56:17 UTC (rev 222)
+++ trunk/src/netlib.c	2008-02-09 01:03:09 UTC (rev 223)
@@ -119,6 +119,10 @@
 
 #endif /* WIN32 */
 
+#ifdef HAVE_UNAME
+#include <sys/utsname.h>
+#endif
+
 #ifdef _AIX
 #include <sys/select.h>
 #include <sys/sched.h>
@@ -1115,7 +1119,7 @@
 void
 get_local_system_info()
 {
-#ifndef WIN32
+#ifdef HAVE_UNAME
   struct utsname buf;
   if (uname(&buf) == 0) {
     local_sysname = strdup(buf.sysname);
@@ -1130,7 +1134,11 @@
     local_machine = strdup("UnknownMachine");
   }
 #else
+#ifdef WIN32
   local_sysname = strdup("Windows");
+#else
+  local_sysname = strdup("UnknownSystem");
+#endif
   local_release = strdup("UnknownRelease");
   local_version = strdup("UnknownVersion");
   local_machine = strdup("UnknownMachine");