Commit 5d7c99f3895aab0bac5ca787c8c8bdccb9c96371
2013-11-06T00:24:16
Revert "Return ETIMEDOUT regardless if we fail in cgsem_mswait since we may be waiting on it on shutdown and the return response is harmless." This reverts commit 3dcae53e38021a61c10de1414195926c339d1c89.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/util.c b/util.c
index d7d3700..f5472c3 100644
--- a/util.c
+++ b/util.c
@@ -2579,14 +2579,11 @@ int _cgsem_mswait(cgsem_t *cgsem, int ms, const char *file, const char *func, co
ret = read(fd, &buf, 1);
return 0;
}
-
- /* Harmless to time out regardless here since we may be waiting on sems
- * during shutdown. */
- if (unlikely(ret)) {
- applog(LOG_WARNING, "Failed to sem_timedwait %s %s %d errno=%d cgsem=0x%p",
- file, func, line, errno, cgsem);
- }
- return ETIMEDOUT;
+ if (likely(!ret))
+ return ETIMEDOUT;
+ quitfrom(1, file, func, line, "Failed to sem_timedwait errno=%d cgsem=0x%p", errno, cgsem);
+ /* We don't reach here */
+ return 0;
}
#else
void _cgsem_init(cgsem_t *cgsem, const char *file, const char *func, const int line)
@@ -2620,13 +2617,12 @@ int _cgsem_mswait(cgsem_t *cgsem, int ms, const char *file, const char *func, co
timeraddspec(&abs_timeout, &ts_now);
ret = sem_timedwait(cgsem, &abs_timeout);
- /* Harmless to time out regardless here since we may be waiting on sems
- * during shutdown. */
- if (unlikely(ret && !sock_timeout())) {
- applog(LOG_WARNING, "Failed to sem_timedwait %s %s %d errno=%d cgsem=0x%p",
- file, func, line, errno, cgsem);
+ if (ret) {
+ if (likely(sock_timeout()))
+ return ETIMEDOUT;
+ quitfrom(1, file, func, line, "Failed to sem_timedwait errno=%d cgsem=0x%p", errno, cgsem);
}
- return ETIMEDOUT;
+ return 0;
}
void cgsem_destroy(cgsem_t *cgsem)