Fri Mar 9 19:46:38 2012 UTC ()

It is perfectly valid for sem_wait to be interrupted, so loop on EINTR.


(joerg)

diff -r1.6 -r1.7 src/tests/lib/libpthread/t_sem.c

--- src/tests/lib/libpthread/t_sem.c 2012/03/07 23:31:44	1.6
+++ src/tests/lib/libpthread/t_sem.c 2012/03/09 19:46:37	1.7

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_sem.c,v 1.6 2012/03/07 23:31:44 joerg Exp $ */
+/* $NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $ */
 /*
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -76,27 +76,27 @@
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  ****************************************************************************/
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008, 2010\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sem.c,v 1.6 2012/03/07 23:31:44 joerg Exp $");
+__RCSID("$NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <atf-c.h>
 #include <atf-c/config.h>
 @@ -220,34 +220,37 @@ static void
 alarm_ms(const int ms)
+{
 	struct itimerval timer;
 	timer.it_interval.tv_sec = 0;
 	timer.it_interval.tv_usec = 0;
 	timer.it_value.tv_sec = 0;
 	timer.it_value.tv_usec = ms * 1000;
 	ATF_REQUIRE(setitimer(ITIMER_REAL, &timer, NULL) == 0);
+}
 static void *
 threadfunc(void *arg)
+{
-	int i;
+	int i, ret;
 	printf("Entering loop\n");
 	for (i = 0; i < 500; ) {
 		if ((i & 1) != 0) {
-			ATF_REQUIRE(sem_wait(&sem) != -1);
+			do {
 				ret = sem_wait(&sem);
 			} while (ret == -1 && errno == EINTR);
 			ATF_REQUIRE(ret == 0);
 		} else {
-			const int ret = sem_trywait(&sem);
+			ret = sem_trywait(&sem);
 			if (ret == -1) {
 				ATF_REQUIRE(errno == EAGAIN);
 				continue;
+			}
+		}
 		printf("%s: %d\n", __func__, i);
 		alarm_ms(5);
 		i++;
+	}
 	return NULL;
+}