[netperf-dev] netperf2 commit notice r50 - in trunk: doc src

[raj at netperf.org]

Author: raj
Date: 2006-02-01 14:18:52 -0800 (Wed, 01 Feb 2006)
New Revision: 50

Modified:
   trunk/doc/netperf.ps
   trunk/src/netsh.c
   trunk/src/netsh.h
   trunk/src/nettest_bsd.c
Log:
Cause "cpu bind" to be emitted in the test headers when CPU binding has
been requested via the -T command.


Modified: trunk/doc/netperf.ps
===================================================================
(Binary files differ)

Modified: trunk/src/netsh.c
===================================================================
--- trunk/src/netsh.c	2006-01-31 20:48:54 UTC (rev 49)
+++ trunk/src/netsh.c	2006-02-01 22:18:52 UTC (rev 50)
@@ -213,6 +213,9 @@
 /* address family */
 int	af = AF_INET;
 
+/* did someone request processor affinity? */
+int cpu_binding_requested = 0;
+
 char netserver_usage[] = "\n\
 Usage: netserver [options] \n\
 \n\
@@ -631,8 +634,10 @@
 	local_proc_affinity = convert(arg1);
 	bind_to_specific_processor(local_proc_affinity);
       }
-      if (arg2[0])
+      if (arg2[0]) {
 	remote_proc_affinity = convert(arg2);
+      }
+      cpu_binding_requested = 1;
       break;
     case 'W':
       /* set the "width" of the user space data buffer ring. This will */

Modified: trunk/src/netsh.h
===================================================================
--- trunk/src/netsh.h	2006-01-31 20:48:54 UTC (rev 49)
+++ trunk/src/netsh.h	2006-02-01 22:18:52 UTC (rev 50)
@@ -103,6 +103,8 @@
 extern int  iteration_max;
 extern double interval;
 
+extern int cpu_binding_requested;
+
 /* stuff to controll the bufferspace "width" */
 extern int	send_width;
 extern int      recv_width;

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2006-01-31 20:48:54 UTC (rev 49)
+++ trunk/src/nettest_bsd.c	2006-02-01 22:18:52 UTC (rev 50)
@@ -1038,6 +1038,9 @@
     fprintf(where," : first burst %d",first_burst_size);
   }
 #endif
+  if (cpu_binding_requested) {
+    fprintf(where," : cpu bind");
+  }
   fprintf(where,"\n");
   
 }
@@ -12039,13 +12042,6 @@
     fflush(stderr);
   }
 #endif
-  /* Emit a warning for first burst and not setting TCP_NODELAY */
-  if ((first_burst_size > 0) && 
-      ((!loc_nodelay) || (!rem_nodelay))) {
-    fprintf(stderr,
-	    "WARNING! Enabling first burst without setting -D for NODELAY!\n");
-    fflush(stderr);
-  }
 #endif
   /* we do not want to make remote_data_address non-NULL because if
      the user has not specified a remote adata address, we want to