From owner-svn-src-projects@FreeBSD.ORG  Mon Aug 30 14:04:29 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56BC61065698;
	Mon, 30 Aug 2010 14:04:29 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 46B5B8FC18;
	Mon, 30 Aug 2010 14:04:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7UE4Tac096894;
	Mon, 30 Aug 2010 14:04:29 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7UE4TjA096892;
	Mon, 30 Aug 2010 14:04:29 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008301404.o7UE4TjA096892@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 30 Aug 2010 14:04:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211997 - projects/sv/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Aug 2010 14:04:29 -0000

Author: attilio
Date: Mon Aug 30 14:04:29 2010
New Revision: 211997
URL: http://svn.freebsd.org/changeset/base/211997

Log:
  Use 'dumping' for discriminating against dump in progress.

Modified:
  projects/sv/sys/net/netdump_client.c

Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c	Mon Aug 30 13:26:07 2010	(r211996)
+++ projects/sv/sys/net/netdump_client.c	Mon Aug 30 14:04:29 2010	(r211997)
@@ -1161,25 +1161,25 @@ netdump_trigger(void *arg, int howto)
 	u_int cpumap=0;
 #endif
 	
-	if ((howto&(RB_HALT|RB_DUMP))!=RB_DUMP || !nd_enable) {
+	if ((howto&(RB_HALT|RB_DUMP))!=RB_DUMP || !nd_enable || cold ||
+	    dumping)
 		return;
-	}
-	nd_enable = 0;
+	dumping++;
 
 	if (!nd_nic) {
 		printf("netdump_trigger: Can't netdump: no NIC given\n");
-		nd_enable = 1;
+		dumping--;
 		return;
 	}
 
 	if (nd_server.s_addr == INADDR_ANY) {
 		printf("netdump_trigger: Can't netdump; no server IP given\n");
-		nd_enable = 1;
+		dumping--;
 		return;
 	}
 	if (nd_client.s_addr == INADDR_ANY) {
 		printf("netdump_trigger: Can't netdump; no client IP given\n");
-		nd_enable = 1;
+		dumping--;
 		return;
 	}
 
@@ -1226,7 +1226,7 @@ netdump_trigger(void *arg, int howto)
 
 	if(error) {
 		printf("netdump_trigger: Could not acquire lock on %s\n", nd_nic->if_xname);
-		nd_enable = 1;
+		dumping--;
 		return;
 	}
 	
@@ -1298,7 +1298,7 @@ cleanup:
 		restart_cpus(cpumap);
 	}
 #endif
-	nd_enable = 1;
+	dumping--;
 }
 
 /*-
@@ -1440,11 +1440,6 @@ DECLARE_MODULE(netdump, netdump_mod, SI_
 DB_COMMAND(netdump, ddb_force_netdump)
 {
 
-	if(!nd_enable) {
-		db_printf("Netdump not enabled -- could be in progress");
-		return;
-	}
-
 	netdump_trigger(NULL, RB_DUMP);
 }
 #endif