[netperf-dev] netperf4 commit notice r40 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2006-01-23 15:48:30 -0800 (Mon, 23 Jan 2006)
New Revision: 40

Modified:
   trunk/config.h.in
   trunk/configure
   trunk/configure.ac
   trunk/src/netperf.c
   trunk/src/nettest_bsd.c
Log:
Some additional misc fixes.


Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in	2006-01-23 23:41:24 UTC (rev 39)
+++ trunk/config.h.in	2006-01-23 23:48:30 UTC (rev 40)
@@ -60,6 +60,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
 /* Define to 1 if you have the `exs' library (-lexs). */
 #undef HAVE_LIBEXS
 

Modified: trunk/configure
===================================================================
--- trunk/configure	2006-01-23 23:41:24 UTC (rev 39)
+++ trunk/configure	2006-01-23 23:48:30 UTC (rev 40)
@@ -20670,6 +20670,74 @@
 ac_cv_lib_pthread=ac_cv_lib_pthread_main
 
 
+echo "$as_me:$LINENO: checking for main in -ldl" >&5
+echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
+if test $ac_cv_lib_dl_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
+
+fi
+ac_cv_lib_dl=ac_cv_lib_dl_main
+
+
 # Checks for header files.
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-23 23:41:24 UTC (rev 39)
+++ trunk/configure.ac	2006-01-23 23:48:30 UTC (rev 40)
@@ -28,6 +28,7 @@
 # Checks for libraries.
 AC_HAVE_LIBRARY(m)
 AC_HAVE_LIBRARY(pthread)
+AC_HAVE_LIBRARY(dl)
 
 # Checks for header files.
 AC_HEADER_STDC

Modified: trunk/src/netperf.c
===================================================================
--- trunk/src/netperf.c	2006-01-23 23:41:24 UTC (rev 39)
+++ trunk/src/netperf.c	2006-01-23 23:48:30 UTC (rev 40)
@@ -1342,6 +1342,14 @@
 
   set_name      = xmlGetProp(my_cmd,(const xmlChar *)"test_set");
   report_flags  = (char *)xmlGetProp(my_cmd,(const xmlChar *)"report_flags");
+
+  if (NULL == report_flags) {
+    fprintf(where,
+	    "Error: report_flags NULL in report_stats_command\n");
+    fflush(where);
+    return(NPE_EMPTY_MSG);
+  }
+
   output_file   = (char *)xmlGetProp(my_cmd,(const xmlChar *)"output_file");
 
   /* once more, we have to make sure that there really is a valid

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2006-01-23 23:41:24 UTC (rev 39)
+++ trunk/src/nettest_bsd.c	2006-01-23 23:48:30 UTC (rev 40)
@@ -2361,7 +2361,7 @@
     for computing service demand */
 
 void
-bsd_test_results_init(tset_t *test_set,char *report_flags,char *output)
+bsd_test_results_init(tset_t *test_set, char *report_flags, char *output)
 {
   bsd_results_t *rd;
   FILE          *outfd;