Merge pull request #442 from gmilos/SR-9863-sem-wait-signal-interrupt-fix

ktopley-apple · web-flow · commit 4b85ca66d0df · 2019-02-05T15:34:33.000-08:00
Retry sem_wait on signal interrupts
diff --git a/src/shims/lock.c b/src/shims/lock.c
@@ -203,7 +203,10 @@ _dispatch_sema4_signal(_dispatch_sema4_t *sema, long count)
 void
 _dispatch_sema4_wait(_dispatch_sema4_t *sema)
 {
-	int ret = sem_wait(sema);
+	int ret = 0;
+	do {
+		ret = sem_wait(sema);
+	} while (ret == -1 && errno == EINTR);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,10 @@ _dispatch_sema4_signal(_dispatch_sema4_t *sema, long count)`
`203`	`203`	`void`
`204`	`204`	`_dispatch_sema4_wait(_dispatch_sema4_t *sema)`
`205`	`205`	`{`
`206`		`- int ret = sem_wait(sema);`
	`206`	`+ int ret = 0;`
	`207`	`+ do {`
	`208`	`+ ret = sem_wait(sema);`
	`209`	`+ } while (ret == -1 && errno == EINTR);`
`207`	`210`	`DISPATCH_SEMAPHORE_VERIFY_RET(ret);`
`208`	`211`	`}`
`209`	`212`