From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <www-data@comics.unina.it>
Received: from svn.comics.unina.it (unknown [143.225.229.147])
	by huchra.bufferbloat.net (Postfix) with ESMTP id 68A952006AA
	for <bismark-commits@lists.bufferbloat.net>;
	Fri, 14 Oct 2011 03:51:24 -0700 (PDT)
Received: from www-data by svn.comics.unina.it with local (Exim 4.69)
	(envelope-from <www-data@comics.unina.it>) id 1REf5s-0008I1-JN
	for bismark-commits@lists.bufferbloat.net;
	Fri, 14 Oct 2011 12:34:24 +0200
To: bismark-commits@lists.bufferbloat.net
From: walter@svn.comics.unina.it
Message-Id: <E1REf5s-0008I1-JN@svn.comics.unina.it>
Date: Fri, 14 Oct 2011 12:34:24 +0200
Subject: [Bismark-commits] rev 361 - trunk/mserver/scripts
	trunk/mserver/src/patches
X-BeenThere: bismark-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Commit log for the bismark source code
	<bismark-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/bismark-commits>
List-Post: <mailto:bismark-commits@lists.bufferbloat.net>
List-Help: <mailto:bismark-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Fri, 14 Oct 2011 10:51:25 -0000

Author: walter
Date: 2011-10-14 12:34:24 +0200 (Fri, 14 Oct 2011)
New Revision: 361

Added:
   trunk/mserver/src/patches/netperf-r432.patch
Modified:
   trunk/mserver/scripts/setup_common
Log:
added netperf debug logs suppression patch

Modified: trunk/mserver/scripts/setup_common
===================================================================
--- trunk/mserver/scripts/setup_common	2011-10-14 09:00:14 UTC (rev 360)
+++ trunk/mserver/scripts/setup_common	2011-10-14 10:34:24 UTC (rev 361)
@@ -14,6 +14,7 @@
 
 # Apply patches
 ( cd ~/src/$DITG_PKG ; patch -p1 < ~/src/patches/$DITG_PKG.patch )
+( cd ~/src/netperf ; patch -p1 < ~/src/patches/netperf-$NETPERF_REV.patch )
 
 # Build binaries
 ( cd ~/src/netperf; ./configure; make; cp -v src/netserver ~/bin )

Added: trunk/mserver/src/patches/netperf-r432.patch
===================================================================
--- trunk/mserver/src/patches/netperf-r432.patch	                        (rev 0)
+++ trunk/mserver/src/patches/netperf-r432.patch	2011-10-14 10:34:24 UTC (rev 361)
@@ -0,0 +1,49 @@
+Index: src/netserver.c
+===================================================================
+--- src/netserver.c	(revision 432)
++++ src/netserver.c	(working copy)
+@@ -644,7 +644,7 @@
+       
+     case DEBUG_ON:
+       netperf_response.content.response_type = DEBUG_OK;
+-      debug++;
++      //debug++;
+ 
+       if (debug == 1) {
+ 	/* we just flipped-on debugging, dump the request because
+@@ -659,7 +659,7 @@
+       
+     case DEBUG_OFF:
+       if (debug)
+-	debug--;
++	//debug--;
+       netperf_response.content.response_type = DEBUG_OK;
+       send_response();
+       /* we used to take the trouble to close the debug file, but SAF
+@@ -932,7 +932,7 @@
+        worry about the standard file descriptors. raj 2011-07-11 */
+ 
+     close_listens(listen_list);
+-    open_debug_file();
++    //open_debug_file();
+ 
+     child = 1;
+     netperf_daemon = 0;
+@@ -1283,7 +1283,7 @@
+     /* we are the child. we should get a new "where" to match our new
+        pid */
+ 
+-    open_debug_file();
++    //open_debug_file();
+ 
+ #ifdef HAVE_SETSID
+       setsid();
+@@ -1415,7 +1415,7 @@
+        be called before open_debug_file() or there is a chance that
+        we'll toast the descriptor when we do not wish it. */
+     set_server_sock();
+-    open_debug_file();
++    //open_debug_file();
+     process_requests();
+   }
+   else if (daemon_parent) {