From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 14 13:55:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EDDF1065674;
	Thu, 14 Jun 2012 13:55:53 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AE268FC15;
	Thu, 14 Jun 2012 13:55:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5EDtq80098159;
	Thu, 14 Jun 2012 13:55:52 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EDtqCE098157;
	Thu, 14 Jun 2012 13:55:52 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206141355.q5EDtqCE098157@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Thu, 14 Jun 2012 13:55:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237067 - projects/calloutng/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 13:55:53 -0000

Author: davide
Date: Thu Jun 14 13:55:52 2012
New Revision: 237067
URL: http://svn.freebsd.org/changeset/base/237067

Log:
  The second argument of sleepq_timedwait_sig() is priority and it does not
  concern signal caught in previous calls as I thought and the manpage says.
  Fix kern_nanosleep() accordingly.
  
  Reported by:		bde
  Reviewed by:		bde

Modified:
  projects/calloutng/sys/kern/kern_time.c

Modified: projects/calloutng/sys/kern/kern_time.c
==============================================================================
--- projects/calloutng/sys/kern/kern_time.c	Thu Jun 14 12:43:37 2012	(r237066)
+++ projects/calloutng/sys/kern/kern_time.c	Thu Jun 14 13:55:52 2012	(r237067)
@@ -355,7 +355,7 @@ kern_nanosleep(struct thread *td, struct
 {
 	struct timespec ts;
 	struct bintime bt, bt2, tmp;
-	int catch = 0, error;
+	int error;
 
 	if (rqt->tv_nsec < 0 || rqt->tv_nsec >= 1000000000)
 		return (EINVAL);
@@ -368,22 +368,20 @@ kern_nanosleep(struct thread *td, struct
 		sleepq_lock(&nanowait);	
 		sleepq_add(&nanowait, NULL, "nanslp", PWAIT | PCATCH, 0);
 		sleepq_set_timeout_bt(&nanowait,bt);
-		error = sleepq_timedwait_sig(&nanowait,catch);
+		error = sleepq_timedwait_sig(&nanowait, PWAIT | PCATCH);
 		binuptime(&bt2);
-		if (catch) { 
-			if (error != EWOULDBLOCK) {
-				if (error == ERESTART)
-					error = EINTR;
-				if (rmt != NULL) {
-					tmp = bt;
-					bintime_sub(&tmp, &bt2);	
-					bintime2timespec(&tmp,&ts);
-					if (ts.tv_sec < 0)
-						timespecclear(&ts);
-					*rmt = ts;
-				}
-			return (error);
+		if (error != EWOULDBLOCK) {
+			if (error == ERESTART)
+				error = EINTR;
+			if (rmt != NULL) {
+				tmp = bt;
+				bintime_sub(&tmp, &bt2);	
+				bintime2timespec(&tmp, &ts);
+				if (ts.tv_sec < 0)
+					timespecclear(&ts);
+				*rmt = ts;
 			}
+			return (error);
 		}
 		if (bintime_cmp(&bt2, &bt, >=))
 			return (0);