From 3e335c3b385b784e202386a3555f92fa17b8260a Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Sat, 29 Nov 2014 11:07:07 +1100
Subject: [PATCH] Abort any functions on signal handling, cleaning up cksem
 functions

---
 src/connector.c |  2 +-
 src/libckpool.c | 27 ++++++---------------------
 src/libckpool.h | 12 ++++++------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/connector.c b/src/connector.c
index 15905a18..9b5e626c 100644
--- a/src/connector.c
+++ b/src/connector.c
@@ -141,7 +141,7 @@ static int accept_client(cdata_t *cdata, const int epfd, const uint64_t server)
 	if (unlikely(fd < 0)) {
 		/* Handle these errors gracefully should we ever share this
 		 * socket */
-		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EINTR) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED) {
 			LOGERR("Recoverable error on accept in accept_client");
 			return 0;
 		}
diff --git a/src/libckpool.c b/src/libckpool.c
index 6a643f7b..7c50b4ff 100644
--- a/src/libckpool.c
+++ b/src/libckpool.c
@@ -295,10 +295,9 @@ void _cksem_post(sem_t *sem, const char *file, const char *func, const int line)
 
 void _cksem_wait(sem_t *sem, const char *file, const char *func, const int line)
 {
-retry:
 	if (unlikely(sem_wait(sem))) {
 		if (errno == EINTR)
-			goto retry;
+			return;
 		quitfrom(1, file, func, line, "Failed to sem_wait errno=%d sem=0x%p", errno, sem);
 	}
 }
@@ -312,7 +311,6 @@ int _cksem_mswait(sem_t *sem, int ms, const char *file, const char *func, const
 	tv_time(&tv_now);
 	tv_to_ts(&ts_now, &tv_now);
 	ms_to_ts(&abs_timeout, ms);
-retry:
 	timeraddspec(&abs_timeout, &ts_now);
 	ret = sem_timedwait(sem, &abs_timeout);
 
@@ -320,26 +318,17 @@ retry:
 		if (likely(errno == ETIMEDOUT))
 			return ETIMEDOUT;
 		if (errno == EINTR)
-			goto retry;
+			return EINTR;
 		quitfrom(1, file, func, line, "Failed to sem_timedwait errno=%d sem=0x%p", errno, sem);
 	}
 	return 0;
 }
 
-void cksem_reset(sem_t *sem)
+void _cksem_destroy(sem_t *sem, const char *file, const char *func, const int line)
 {
-	int ret;
-
-	do {
-		ret = sem_trywait(sem);
-		if (unlikely(ret < 0 && (errno == EINTR)))
-			ret = 0;
-	} while (!ret);
-}
 
-void cksem_destroy(sem_t *sem)
-{
-	sem_destroy(sem);
+	if (unlikely(sem_destroy(sem)))
+		quitfrom(1, file, func, line, "Failed to sem_destroy errno=%d sem=0x%p", errno, sem);
 }
 
 /* Extract just the url and port information from a url string, allocating
@@ -1587,11 +1576,7 @@ void cksleep_prepare_r(ts_t *ts)
 
 void nanosleep_abstime(ts_t *ts_end)
 {
-	int ret;
-
-	do {
-		ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, ts_end, NULL);
-	} while (ret == EINTR);
+	clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, ts_end, NULL);
 }
 
 void timeraddspec(ts_t *a, const ts_t *b)
diff --git a/src/libckpool.h b/src/libckpool.h
index 5836a06d..b98c8c2c 100644
--- a/src/libckpool.h
+++ b/src/libckpool.h
@@ -399,13 +399,13 @@ void _cksem_init(sem_t *sem, const char *file, const char *func, const int line)
 void _cksem_post(sem_t *sem, const char *file, const char *func, const int line);
 void _cksem_wait(sem_t *sem, const char *file, const char *func, const int line);
 int _cksem_mswait(sem_t *sem, int ms, const char *file, const char *func, const int line);
-void cksem_reset(sem_t *sem);
-void cksem_destroy(sem_t *sem);
+void _cksem_destroy(sem_t *sem, const char *file, const char *func, const int line);
 
-#define cksem_init(_sem) _cksem_init(_sem, __FILE__, __func__, __LINE__)
-#define cksem_post(_sem) _cksem_post(_sem, __FILE__, __func__, __LINE__)
-#define cksem_wait(_sem) _cksem_wait(_sem, __FILE__, __func__, __LINE__)
-#define cksem_mswait(_sem, _timeout) _cksem_mswait(_sem, _timeout, __FILE__, __func__, __LINE__)
+#define cksem_init(SEM) _cksem_init(SEM, __FILE__, __func__, __LINE__)
+#define cksem_post(SEM) _cksem_post(SEM, __FILE__, __func__, __LINE__)
+#define cksem_wait(SEM) _cksem_wait(SEM, __FILE__, __func__, __LINE__)
+#define cksem_mswait(SEM, _timeout) _cksem_mswait(SEM, _timeout, __FILE__, __func__, __LINE__)
+#define cksem_destroy(SEM) _cksem_destroy(SEM, __FILE__, __func__, __LINE__)
 
 static inline bool sock_connecting(void)
 {