From owner-p4-projects@FreeBSD.ORG  Wed Nov 17 15:57:34 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BF8A16A4D1; Wed, 17 Nov 2004 15:57:34 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ECD3316A4CE
	for <perforce@freebsd.org>; Wed, 17 Nov 2004 15:57:33 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD11943D48
	for <perforce@freebsd.org>; Wed, 17 Nov 2004 15:57:33 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAHFvXlZ072656
	for <perforce@freebsd.org>; Wed, 17 Nov 2004 15:57:33 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAHFvXtf072653
	for perforce@freebsd.org; Wed, 17 Nov 2004 15:57:33 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 17 Nov 2004 15:57:33 GMT
Message-Id: <200411171557.iAHFvXtf072653@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 65337 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Nov 2004 15:57:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=65337

Change 65337 by jhb@jhb_slimer on 2004/11/17 15:57:30

	Get rid of the 'storming' variable altogether.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_intr.c#62 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_intr.c#62 (text+ko) ====

@@ -485,7 +485,7 @@
 	struct intrhand *ih;		/* and our interrupt handler chain */
 	struct thread *td;
 	struct proc *p;
-	int count, warned, storming;
+	int count, warned;
 	
 	td = curthread;
 	p = td->td_proc;
@@ -494,7 +494,6 @@
 	    ("%s: ithread and proc linkage out of sync", __func__));
 	count = 0;
 	warned = 0;
-	storming = 0;
 
 	/*
 	 * As long as we have interrupts outstanding, go through the
@@ -561,7 +560,7 @@
 			 * interrupts exceeds the storm threshold, then
 			 * enter storming mode.
 			 */
-			if (!storming && intr_storm_threshold != 0 &&
+			if (intr_storm_threshold != 0 &&
 			    count >= intr_storm_threshold) {
 				if (!warned) {
 					printf(
@@ -569,9 +568,6 @@
 					    p->p_comm);
 					warned = 1;
 				}
-				storming = 1;
-			}
-			if (storming)
 				tsleep(&count, td->td_priority, "istorm", 1);
 			else
 				count++;
@@ -591,7 +587,6 @@
 		if (!ithd->it_need) {
 			TD_SET_IWAIT(td);
 			count = 0;
-			storming = 0;
 			CTR2(KTR_INTR, "%s: pid %d: done", __func__, p->p_pid);
 			mi_switch(SW_VOL, NULL);
 			CTR2(KTR_INTR, "%s: pid %d: resumed", __func__, p->p_pid);