From owner-svn-src-user@FreeBSD.ORG  Mon May  9 07:04:14 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AADB2106566B;
	Mon,  9 May 2011 07:04:14 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DCB18FC0A;
	Mon,  9 May 2011 07:04:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4974EcB080347;
	Mon, 9 May 2011 07:04:14 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4974EOU080345;
	Mon, 9 May 2011 07:04:14 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201105090704.p4974EOU080345@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 9 May 2011 07:04:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221676 - user/avg/xcpu/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2011 07:04:14 -0000

Author: avg
Date: Mon May  9 07:04:14 2011
New Revision: 221676
URL: http://svn.freebsd.org/changeset/base/221676

Log:
  generic_stop_cpus: move timeout detection code from under DIAGNOSTIC
  
  ... and also increase it a bit.
  IMO it's better to detect and report the (rather serious) condition and
  allow a system to proceed somehow rather than be stuck in an endless
  loop.

Modified:
  user/avg/xcpu/sys/kern/subr_smp.c

Modified: user/avg/xcpu/sys/kern/subr_smp.c
==============================================================================
--- user/avg/xcpu/sys/kern/subr_smp.c	Mon May  9 07:03:01 2011	(r221675)
+++ user/avg/xcpu/sys/kern/subr_smp.c	Mon May  9 07:04:14 2011	(r221676)
@@ -232,12 +232,10 @@ generic_stop_cpus(cpumask_t map, u_int t
 		/* spin */
 		cpu_spinwait();
 		i++;
-#ifdef DIAGNOSTIC
-		if (i == 100000) {
+		if (i == 100000000) {
 			printf("timeout stopping cpus\n");
 			break;
 		}
-#endif
 	}
 
 	stopping_cpu = NOCPU;