From owner-svn-src-all@FreeBSD.ORG  Tue Apr 16 20:26:32 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 05C422EB;
 Tue, 16 Apr 2013 20:26:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC1DB15D1;
 Tue, 16 Apr 2013 20:26:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3GKQV7J093878;
 Tue, 16 Apr 2013 20:26:31 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3GKQVgs093874;
 Tue, 16 Apr 2013 20:26:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201304162026.r3GKQVgs093874@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 16 Apr 2013 20:26:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249566 - in head: lib/libc/gen sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Apr 2013 20:26:32 -0000

Author: jhb
Date: Tue Apr 16 20:26:31 2013
New Revision: 249566
URL: http://svnweb.freebsd.org/changeset/base/249566

Log:
  - Document that sem_wait() can fail with EINTR if it is interrupted by a
    signal.
  - Fix the old ksem implementation for POSIX semaphores to not restart
    sem_wait() or sem_timedwait() if interrupted by a signal.
  
  MFC after:	1 week

Modified:
  head/lib/libc/gen/sem_wait.3
  head/sys/kern/uipc_sem.c

Modified: head/lib/libc/gen/sem_wait.3
==============================================================================
--- head/lib/libc/gen/sem_wait.3	Tue Apr 16 20:21:02 2013	(r249565)
+++ head/lib/libc/gen/sem_wait.3	Tue Apr 16 20:26:31 2013	(r249566)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2000
+.Dd April 16, 2013
 .Dt SEM_WAIT 3
 .Os
 .Sh NAME
@@ -75,6 +75,14 @@ points to an invalid semaphore.
 .El
 .Pp
 Additionally,
+.Fn sem_wait
+will fail if:
+.Bl -tag -width Er
+.Pp
+.It Bq Er EINTR
+A signal interrupted this function.
+.El
+Additionally,
 .Fn sem_trywait
 will fail if:
 .Bl -tag -width Er

Modified: head/sys/kern/uipc_sem.c
==============================================================================
--- head/sys/kern/uipc_sem.c	Tue Apr 16 20:21:02 2013	(r249565)
+++ head/sys/kern/uipc_sem.c	Tue Apr 16 20:26:31 2013	(r249566)
@@ -846,6 +846,8 @@ kern_sem_wait(struct thread *td, semid_t
 err:
 	mtx_unlock(&sem_lock);
 	fdrop(fp, td);
+	if (error == ERESTART)
+		error = EINTR;
 	DP(("<<< kern_sem_wait leaving, pid=%d, error = %d\n",
 	    (int)td->td_proc->p_pid, error));
 	return (error);