From owner-p4-projects@FreeBSD.ORG  Fri Jan 25 13:24:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A3C3416A46D; Fri, 25 Jan 2008 13:24:01 +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 5EEFD16A46B
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:24:01 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47F3813C4EB
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:24:01 +0000 (UTC)
	(envelope-from jhb@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 m0PDO1CC035174
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:24:01 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0PDO1oc035171
	for perforce@freebsd.org; Fri, 25 Jan 2008 13:24:01 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 25 Jan 2008 13:24:01 GMT
Message-Id: <200801251324.m0PDO1oc035171@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 134078 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, 25 Jan 2008 13:24:02 -0000

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

Change 134078 by jhb@jhb_zion on 2008/01/25 13:23:43

	Don't set TDF_INTERRUPT to fake a KSE thread signal when a timeout
	triggers while the thread is still running.  The KSE code controls
	setting and clearing TDF_INTERRUPT, so what would happen is that
	TDF_INTERRUPT would not be cleared until KSE finished sending a
	signal (i.e. never for non-KSE processes) but that while TDF_INTERRUPT
	is set, any sleeps that catch signals would immediately fail with
	EWOULDBLOCK.  Thus, if a non-KSE process hit the race with a timeout
	firing then all future *sleep(... PCATCH ...) or cv_*wait_sig()'s
	would not actually block.

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#34 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#34 (text+ko) ====

@@ -817,8 +817,7 @@
 	 * sleepq_catch_signals().
 	 */
 	if (TD_ON_SLEEPQ(td)) {
-		td->td_flags |= TDF_TIMEOUT | TDF_INTERRUPT;
-		td->td_intrval = EWOULDBLOCK;
+		td->td_flags |= TDF_TIMEOUT;
 		thread_unlock(td);
 		return;
 	}