From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:19:52 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 25F5A16A528; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BEE816A46C
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C08E13C478
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85JpJ0046007
	for <perforce@freebsd.org>; Sat, 8 Dec 2007 05:19:51 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85Jp5B046004
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:19:51 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:19:51 GMT
Message-Id: <200712080519.lB85Jp5B046004@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130459 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 08 Dec 2007 05:19:52 -0000

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

Change 130459 by kmacy@kmacy:storage:toestack on 2007/12/08 05:19:26

	use cv in place of tsleep

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#9 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#9 (text+ko) ====

@@ -141,8 +141,12 @@
 		err = ENOBUFS;
 	}
 	mtx_unlock(&mr->br_lock);
-	if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0)
-		wakeup(qs);
+	if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0) {
+		mtx_lock(&qs->qs_mtx);
+		cv_broadcastpri(&qs->qs_cv, 1);
+		mtx_unlock(&qs->qs_mtx);
+	}
+	
 	if (err) 
 		m_freem(m);
 
@@ -501,8 +505,11 @@
 	} else if (immpkt)
 		err = cxgb_pcpu_enqueue_packet_(qs, immpkt);
 
-	if (resid && (txq->flags & TXQ_TRANSMITTING) == 0)
-		wakeup(qs);
+	if (resid && (txq->flags & TXQ_TRANSMITTING) == 0) {
+		mtx_lock(&qs->qs_mtx);
+		cv_broadcastpri(&qs->qs_cv, 1);
+		mtx_unlock(&qs->qs_mtx);
+	}
 
 	return ((err == ENOSPC) ? 0 : err);
 }
@@ -617,8 +624,10 @@
 				    txq->txq_mr.br_prod);
 			continue;
 		}
-	done:	
-		tsleep(qs, 1, "cxgbidle", sleep_ticks);
+	done:
+		mtx_lock(&qs->qs_mtx);
+		cv_timedwait(&qs->qs_cv, &qs->qs_mtx, sleep_ticks);
+		mtx_unlock(&qs->qs_mtx);
 	}
 
 	if (bootverbose)
@@ -661,6 +670,8 @@
 			qs = &sc->sge.qs[pi->first_qset + j];
 			qs->port = pi;
 			qs->qs_cpuid = ((pi->first_qset + j) % mp_ncpus);
+			cv_init(&qs->qs_cv, qs->namebuf);
+			mtx_init(&qs->qs_mtx, qs->namebuf, NULL, MTX_DEF);
 			device_printf(sc->dev, "starting thread for %d\n", qs->qs_cpuid);
 
 			kproc_create(cxgb_pcpu_start_proc, qs, &p,
@@ -683,7 +694,9 @@
 			struct sge_qset *qs = &sc->sge.qs[first + j];
 
 			qs->qs_flags |= QS_EXITING;
-			wakeup(qs);
+			mtx_lock(&qs->qs_mtx);
+			cv_broadcastpri(&qs->qs_cv, 1);
+			mtx_unlock(&qs->qs_mtx);
 			tsleep(&sc, PRI_MIN_TIMESHARE, "cxgb unload 0", hz>>2);
 			while (qs->qs_flags & QS_RUNNING) {
 				qs->qs_flags |= QS_EXITING;