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

[raj at netperf.org]

Author: raj
Date: 2011-09-01 08:43:45 -0700 (Thu, 01 Sep 2011)
New Revision: 487

Modified:
   trunk/configure
   trunk/configure.ac
   trunk/src/nettest_bsd.c
Log:
since it is not migrated fix a bug in the tcp_cc test where remote service demand is fubar because netserver is not sending the number of cpus in the results message

Modified: trunk/configure
===================================================================
--- trunk/configure	2011-08-26 00:26:39 UTC (rev 486)
+++ trunk/configure	2011-09-01 15:43:45 UTC (rev 487)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for netperf 2.5.0.
+# Generated by GNU Autoconf 2.67 for netperf post-2.5.0-tot.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@
 # Identity of this package.
 PACKAGE_NAME='netperf'
 PACKAGE_TARNAME='netperf'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='netperf 2.5.0'
+PACKAGE_VERSION='post-2.5.0-tot'
+PACKAGE_STRING='netperf post-2.5.0-tot'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1275,7 +1275,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures netperf 2.5.0 to adapt to many kinds of systems.
+\`configure' configures netperf post-2.5.0-tot to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1346,7 +1346,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of netperf 2.5.0:";;
+     short | recursive ) echo "Configuration of netperf post-2.5.0-tot:";;
    esac
   cat <<\_ACEOF
 
@@ -1464,7 +1464,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-netperf configure 2.5.0
+netperf configure post-2.5.0-tot
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1940,7 +1940,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by netperf $as_me 2.5.0, which was
+It was created by netperf $as_me post-2.5.0-tot, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2875,7 +2875,7 @@
 
 # Define the identity of the package.
  PACKAGE='netperf'
- VERSION='2.5.0'
+ VERSION='post-2.5.0-tot'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8384,7 +8384,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by netperf $as_me 2.5.0, which was
+This file was extended by netperf $as_me post-2.5.0-tot, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8450,7 +8450,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-netperf config.status 2.5.0
+netperf config.status post-2.5.0-tot
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-08-26 00:26:39 UTC (rev 486)
+++ trunk/configure.ac	2011-09-01 15:43:45 UTC (rev 487)
@@ -2,11 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 FULL-PACKAGE-NAME=netperf
-VERSION=2.5.0
+VERSION=post-2.5.0-tot
 BUG-REPORT-ADDRESS=netperf-feedback at netperf.org
 
 AC_PREREQ(2.59)
-AC_INIT(netperf, 2.5.0)
+AC_INIT(netperf, post-2.5.0-tot)
 
 # Inherit compiler flags from the environment...
 CFLAGS="${CFLAGS:=}"

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2011-08-26 00:26:39 UTC (rev 486)
+++ trunk/src/nettest_bsd.c	2011-09-01 15:43:45 UTC (rev 487)
@@ -12911,11 +12911,12 @@
     fflush(where);
   }
   
-  tcp_cc_results->bytes_received	= (trans_received * 
-					   (tcp_cc_request->request_size + 
-					    tcp_cc_request->response_size));
-  tcp_cc_results->trans_received	= trans_received;
-  tcp_cc_results->elapsed_time	= elapsed_time;
+  tcp_cc_results->bytes_received = (trans_received * 
+				    (tcp_cc_request->request_size + 
+				     tcp_cc_request->response_size));
+  tcp_cc_results->trans_received = trans_received;
+  tcp_cc_results->elapsed_time	 = elapsed_time;
+  tcp_cc_results->num_cpus       = lib_num_loc_cpus;
   if (tcp_cc_request->measure_cpu) {
     tcp_cc_results->cpu_util	= calc_cpu_util(elapsed_time);
   }