From owner-p4-projects@FreeBSD.ORG  Fri Mar  9 16:13:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 405A716A405; Fri,  9 Mar 2007 16:13:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 132FF16A402
	for <perforce@freebsd.org>; Fri,  9 Mar 2007 16:13:53 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 013BE13C4A8
	for <perforce@freebsd.org>; Fri,  9 Mar 2007 16:13:53 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l29GDmtF076018
	for <perforce@freebsd.org>; Fri, 9 Mar 2007 16:13:48 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l29GDmm3076015
	for perforce@freebsd.org; Fri, 9 Mar 2007 16:13:48 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 9 Mar 2007 16:13:48 GMT
Message-Id: <200703091613.l29GDmm3076015@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>
Cc: 
Subject: PERFORCE change 115610 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: Fri, 09 Mar 2007 16:13:53 -0000

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

Change 115610 by jhb@jhb_zion on 2007/03/09 16:13:46

	Use pause().

Affected files ...

.. //depot/projects/smpng/sys/modules/crash/crash.c#36 integrate
.. //depot/projects/smpng/sys/modules/crash2/crash2.c#20 integrate

Differences ...

==== //depot/projects/smpng/sys/modules/crash/crash.c#36 (text+ko) ====

@@ -239,7 +239,7 @@
 {
 	rw_init(&baz, "baz");
 	rw_rlock(&baz);
-	tsleep(&baz, 0, "-", 1);
+	pause("-", 1);
 	rw_runlock(&baz);
 	rw_destroy(&baz);
 }
@@ -753,7 +753,7 @@
 
 	printf("Should panic\n");
 	THREAD_NO_SLEEPING();
-	tsleep(&test1_mtx, 0, "sleep", 1);
+	pause("sleep", 1);
 	THREAD_SLEEPING_OK();
 }
 CRASH_EVENT("sleep while sleeping is prohibited", test_no_sleeping);

==== //depot/projects/smpng/sys/modules/crash2/crash2.c#20 (text+ko) ====

@@ -138,7 +138,7 @@
 		sx_xlock(sxs[thread % 4]);
 	else
 		lockmgr(locks[thread % 4], LK_EXCLUSIVE, NULL, curthread);
-	tsleep(sxs, 0, "slp_dead", hz/10);
+	pause("slp_dead", hz/10);
 	if (thread % 2)
 		lockmgr(locks[(thread + 1) % 4], LK_SHARED, NULL, curthread);
 	else
@@ -152,7 +152,7 @@
 {
 
 	lockmgr(locks[thread % 4], LK_EXCLUSIVE, NULL, curthread);
-	tsleep(locks, 0, "lk_dead", hz/10);
+	pause("lk_dead", hz/10);
 	lockmgr(locks[(thread + 1) % 4], LK_EXCLUSIVE, NULL, curthread);
 }
 CRASH2_EVENT("lockmgr cycle", lockmgr_deadlock, lockmgr_deadlock,
@@ -163,7 +163,7 @@
 {
 
 	sx_xlock(sxs[thread % 4]);
-	tsleep(sxs, 0, "sx_dead", hz/10);
+	pause("sx_dead", hz/10);
 	sx_xlock(sxs[(thread + 1) % 4]);
 }
 CRASH2_EVENT("sx cycle", sx_deadlock, sx_deadlock, sx_deadlock, sx_deadlock);
@@ -226,7 +226,7 @@
 {
 
 	mtx_lock(&bar);
-	tsleep(&bar, 0, "bar", hz/100);
+	pause("bar", hz/100);
 	mtx_unlock(&bar);
 }
 CRASH2_EVENT("sleep holding bar", bar_sleep, bar_sleep, bar_sleep, bar_sleep);