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

[raj at netperf.org]

Author: raj
Date: 2011-07-01 09:05:20 -0700 (Fri, 01 Jul 2011)
New Revision: 413

Modified:
   trunk/configure
   trunk/configure.ac
   trunk/src/nettest_omni.c
Log:
getting closer

Modified: trunk/configure
===================================================================
--- trunk/configure	2011-06-30 00:03:52 UTC (rev 412)
+++ trunk/configure	2011-07-01 16:05:20 UTC (rev 413)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for netperf 2.4.5.
+# Generated by GNU Autoconf 2.67 for netperf 2.5.0.
 #
 #
 # 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.4.5'
-PACKAGE_STRING='netperf 2.4.5'
+PACKAGE_VERSION='2.5.0'
+PACKAGE_STRING='netperf 2.5.0'
 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.4.5 to adapt to many kinds of systems.
+\`configure' configures netperf 2.5.0 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.4.5:";;
+     short | recursive ) echo "Configuration of netperf 2.5.0:";;
    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.4.5
+netperf configure 2.5.0
 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.4.5, which was
+It was created by netperf $as_me 2.5.0, 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.4.5'
+ VERSION='2.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8382,7 +8382,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.4.5, which was
+This file was extended by netperf $as_me 2.5.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8448,7 +8448,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.4.5
+netperf config.status 2.5.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2011-06-30 00:03:52 UTC (rev 412)
+++ trunk/configure.ac	2011-07-01 16:05:20 UTC (rev 413)
@@ -2,11 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 FULL-PACKAGE-NAME=netperf
-VERSION=2.4.5
+VERSION=2.5.0
 BUG-REPORT-ADDRESS=netperf-feedback at netperf.org
 
 AC_PREREQ(2.59)
-AC_INIT(netperf, 2.4.5)
+AC_INIT(netperf, 2.5.0)
 
 # Inherit compiler flags from the environment...
 CFLAGS="${CFLAGS:=}"

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-06-30 00:03:52 UTC (rev 412)
+++ trunk/src/nettest_omni.c	2011-07-01 16:05:20 UTC (rev 413)
@@ -376,6 +376,7 @@
 double bytes_per_recv;
 int null_message_ok = 0;
 int human = 0;
+int was_legacy = 0;
 int legacy = 0;
 int implicit_direction = 0;
 int csv = 0;
@@ -7781,6 +7782,7 @@
   socket_type = SOCK_STREAM;
   connection_test = 0;
   req_size = rsp_size = -1;
+  was_legacy = 1;
   legacy = 1;
   implicit_direction = 0;  /* do we allow certain options to
 			      implicitly affect the test direction? */
@@ -7821,6 +7823,7 @@
   }
   else if (strcasecmp(test_name,"omni") == 0) {
     /* there is not much to do here but clear the legacy flag */
+    was_legacy = 0;
     legacy = 0;
     implicit_direction = 1;
   }
@@ -7968,9 +7971,13 @@
 #endif /* TCP_CORK */
       break;
     case 'd':
-      /* arbitrarily set the direction variable */
-      if (implicit_direction)
+      /* arbitrarily set the direction variable, but only for an
+	 actual omni test and then disable implicit setting of
+	 direction */
+      if (!was_legacy) {
 	direction = parse_direction(optarg);
+	implicit_direction = 0;
+      }
       break;
     case 'D':
       /* set the TCP nodelay flag */