From owner-svn-src-all@FreeBSD.ORG  Wed Jul  3 21:11:56 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BD6BF2AC;
 Wed,  3 Jul 2013 21:11:56 +0000 (UTC)
 (envelope-from jilles@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 AF8EA18BC;
 Wed,  3 Jul 2013 21:11:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63LBubr018978;
 Wed, 3 Jul 2013 21:11:56 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63LBuY2018977;
 Wed, 3 Jul 2013 21:11:56 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201307032111.r63LBuY2018977@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 3 Jul 2013 21:11:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252606 - stable/9/bin/sleep
X-SVN-Group: stable-9
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: Wed, 03 Jul 2013 21:11:56 -0000

Author: jilles
Date: Wed Jul  3 21:11:56 2013
New Revision: 252606
URL: http://svnweb.freebsd.org/changeset/base/252606

Log:
  MFC r251078,r251433: sleep: Improve nanosleep() error handling:
  
   * Work around kernel bugs that cause a spurious [EINTR] return if a
     debugger (such as truss(1)) is attached.
  
   * Write an error message if an error other than [EINTR] occurs.
  
  PR:		bin/178664

Modified:
  stable/9/bin/sleep/sleep.c
Directory Properties:
  stable/9/bin/sleep/   (props changed)

Modified: stable/9/bin/sleep/sleep.c
==============================================================================
--- stable/9/bin/sleep/sleep.c	Wed Jul  3 21:07:02 2013	(r252605)
+++ stable/9/bin/sleep/sleep.c	Wed Jul  3 21:11:56 2013	(r252606)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdint.h>
@@ -81,14 +82,20 @@ main(int argc, char *argv[])
 	time_to_sleep.tv_nsec = 1e9 * (d - time_to_sleep.tv_sec);
 
 	signal(SIGINFO, report_request);
+
+	/*
+	 * Note: [EINTR] is supposed to happen only when a signal was handled
+	 * but the kernel also returns it when a ptrace-based debugger
+	 * attaches. This is a bug but it is hard to fix.
+	 */
 	while (nanosleep(&time_to_sleep, &time_to_sleep) != 0) {
 		if (report_requested) {
 			/* Reporting does not bother with nanoseconds. */
 			warnx("about %d second(s) left out of the original %d",
 			    (int)time_to_sleep.tv_sec, (int)original);
 			report_requested = 0;
-		} else
-			break;
+		} else if (errno != EINTR)
+			err(1, "nanosleep");
 	}
 	return (0);
 }