Use clock MONOTONIC to timeout, not localtime, #177514

2 files changed, 27 insertions, 15 deletions

diff --git a/src/librc.c b/src/librc.c
index 67a4174d..cd085102 100644
--- a/src/librc.c
+++ b/src/librc.c
@@ -567,26 +567,38 @@ void rc_schedule_clear (const char *service)
 }
 librc_hidden_def(rc_schedule_clear)
 
+static time_t get_uptime(void)
+{
+#ifdef __linux__
+	struct sysinfo info;
+
+	sysinfo (&info);
+	return (time_t) info.uptime;
+#else
+	struct timespec tp;
+
+	if (clock_gettime (CLOCK_MONOTONIC, &tp) == -1) {
+		eerror ("clock_gettime: %s", strerror (errno));
+		return -1;
+	}
+
+	return tp.tv_sec;
+#endif
+}
+
 bool rc_wait_service (const char *service)
 {
 	char *svc;
 	char *base;
 	char *fifo;
 	struct timeval tv;
-	struct timeval stopat;
-	struct timeval now;
+	time_t start = get_uptime ();
 	bool retval = false;
 	bool forever = false;
 
 	if (! service)
 		return (false);
 
-	if (gettimeofday (&stopat, NULL) != 0) {
-		eerror ("gettimeofday: %s", strerror (errno));
-		return (false);
-	}
-	stopat.tv_sec += WAIT_MAX;
-
 	svc = rc_xstrdup (service);
 	base = basename (svc);
 	fifo = rc_strcatpaths (RC_SVCDIR, "exclusive", base, (char *) NULL);
@@ -612,13 +624,8 @@ bool rc_wait_service (const char *service)
 		}
 
 		if (! forever) {
-			/* Don't hang around forever */
-			if (gettimeofday (&now, NULL) != 0) {
-				eerror ("gettimeofday: %s", strerror (errno));
-				break;
-			}
-
-			if (timercmp (&now, &stopat, >))
+			time_t now = get_uptime();
+			if (now - start > WAIT_MAX)
 				break;
 		}
 	}
diff --git a/src/librc.h b/src/librc.h
index 1661cea3..cbf26d95 100644
--- a/src/librc.h
+++ b/src/librc.h
@@ -15,6 +15,10 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
 
+#ifdef __linux__
+#include <sys/sysinfo.h>
+#endif
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -26,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #if defined(__DragonFly__) || defined(__FreeBSD__) || \