From owner-p4-projects@FreeBSD.ORG  Sat Nov 20 02:19:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0DFC516A4D0; Sat, 20 Nov 2004 02:19:00 +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 DE41416A4CE
	for <perforce@freebsd.org>; Sat, 20 Nov 2004 02:18:59 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CD84443D41
	for <perforce@freebsd.org>; Sat, 20 Nov 2004 02:18:59 +0000 (GMT)
	(envelope-from davidxu@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 iAK2IxOY099257
	for <perforce@freebsd.org>; Sat, 20 Nov 2004 02:18:59 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAK2IxFY099254
	for perforce@freebsd.org; Sat, 20 Nov 2004 02:18:59 GMT
	(envelope-from davidxu@freebsd.org)
Date: Sat, 20 Nov 2004 02:18:59 GMT
Message-Id: <200411200218.iAK2IxFY099254@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 65488 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: Sat, 20 Nov 2004 02:19:00 -0000

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

Change 65488 by davidxu@davidxu_alona on 2004/11/20 02:18:27

	if a thread is resumed by thr_wake, it should return 0, 
	for example, a signal can cause ERESTART to be returned,
	this will cause the wakeup to be lost.

Affected files ...

.. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#3 edit

Differences ...

==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#3 (text+ko) ====

@@ -270,11 +270,21 @@
 	if ((td->td_flags & TDF_THRWAKEUP) == 0)
 		error = msleep((void *)td, &td->td_proc->p_mtx,
 		    td->td_priority | PCATCH, "lthr", hz);
-	mtx_lock_spin(&sched_lock);
-	td->td_flags &= ~TDF_THRWAKEUP;
-	mtx_unlock_spin(&sched_lock);
+	if (td->td_flags & TDF_THRWAKEUP) {
+		mtx_lock_spin(&sched_lock);
+		td->td_flags &= ~TDF_THRWAKEUP;
+		mtx_unlock_spin(&sched_lock);
+		PROC_UNLOCK(td->td_proc);
+		return (0);
+	}
 	PROC_UNLOCK(td->td_proc);
-	return (error == EWOULDBLOCK ? ETIMEDOUT : error);
+	if (error == EWOULDBLOCK)
+		error = ETIMEDOUT;
+	else if (error == ERESTART) {
+		if (hz != 0)
+			error = EINTR;
+	}
+	return (error);
 }
 
 int