[netperf-dev] netperf2 commit notice r438 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2011-07-18 15:40:24 -0700 (Mon, 18 Jul 2011)
New Revision: 438

Modified:
   trunk/src/netserver.c
Log:
enable one to tell netserver to not create a debug file

Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c	2011-07-18 18:52:32 UTC (rev 437)
+++ trunk/src/netserver.c	2011-07-18 22:40:24 UTC (rev 438)
@@ -256,7 +256,8 @@
 	   "%s_%d",
 	   DEBUG_LOG_FILE,
 	   getpid());
-  if ((where = fopen(FileName, "w")) == NULL) {
+  if ((where = fopen((suppress_debug) ? NETPERF_NULL : FileName,
+		     "w")) == NULL) {
     perror("netserver: debug file");
     exit(1);
   }
@@ -708,14 +709,16 @@
       
     case DEBUG_ON:
       netperf_response.content.response_type = DEBUG_OK;
-      debug++;
+      if (!suppress_debug) {
+	debug++;
 
-      if (debug == 1) {
-	/* we just flipped-on debugging, dump the request because
-	   recv_request/recv_request_n will not have dumped it as its
-	   dump_request() call is conditional on debug being set. raj
-	   2011-07-08 */
-	dump_request();
+	if (debug == 1) {
+	  /* we just flipped-on debugging, dump the request because
+	     recv_request/recv_request_n will not have dumped it as its
+	     dump_request() call is conditional on debug being set. raj
+	     2011-07-08 */
+	  dump_request();
+	}
       }
 
       send_response();
@@ -1221,9 +1224,9 @@
 }
 
 #ifndef WIN32
-#define SERVER_ARGS "DdfhL:n:p:v:V46"
+#define SERVER_ARGS "DdfhL:n:Np:v:V46"
 #else
-#define SERVER_ARGS "DdfhL:n:p:v:V46I:i:"
+#define SERVER_ARGS "DdfhL:n:Np:v:V46I:i:"
 #endif
 void
 scan_netserver_args(int argc, char *argv[]) {
@@ -1246,6 +1249,7 @@
       exit(1);
     case 'd':
       debug++;
+      suppress_debug = 0;
       break;
     case 'D':
       /* perhaps one of these days we'll take an argument */
@@ -1284,6 +1288,10 @@
 	exit(1);
       }
       break;
+    case 'N':
+      suppress_debug = 1;
+      debug = 0;
+      break;
     case 'p':
       /* we want to open a listen socket at a specified port number */
       strncpy(listen_port,optarg,sizeof(listen_port));