fixup! rc_unmount: add parallel unmounting

use timeutils.h

Author: N-R-K

src/mountinfo/meson.build

@@ -1,6 +1,6 @@
 foreach exec : ['mountinfo', 'rc_unmount']
   executable(exec,
-    ['mountinfo.c', rc_exec_c, misc_c, usage_c, version_h],
+    ['mountinfo.c', rc_exec_c, timeutils_c, misc_c, usage_c, version_h],
     c_args : cc_branding_flags,
     include_directories: [incdir, einfo_incdir, rc_incdir],
     link_with: [libeinfo, librc],

src/mountinfo/mountinfo.c

@@ -44,15 +44,10 @@
 #include "queue.h"
 #include "rc.h"
 #include "rc_exec.h"
+#include "timeutils.h"
 #include "_usage.h"
 #include "helpers.h"
 
-/* on linux CLOCK_BOOTTIME provides proper POSIX CLOCK_MONOTONIC behavior. */
-#if defined(__linux__)
-#  undef  CLOCK_MONOTONIC
-#  define CLOCK_MONOTONIC CLOCK_BOOTTIME
-#endif
-
 const char *applet = NULL;
 const char *procmounts = "/proc/mounts";
 const char *extraopts = "[mount1] [mount2] ...";
@@ -386,21 +381,6 @@ find_mounts(struct args *args, size_t *num_mounts)
 #  error "Operating system not supported!"
 #endif
 
-static int64_t clock_ms(void)
-{
-	struct timespec t;
-	clock_gettime(CLOCK_MONOTONIC, &t);
-	return (t.tv_sec * 1000) + (t.tv_nsec / 1000000);
-}
-
-static int sleep_ms(int64_t ms)
-{
-	struct timespec t;
-	t.tv_sec = ms / 1000;
-	t.tv_nsec = (ms % 1000) * 1000000l;
-	return clock_nanosleep(CLOCK_MONOTONIC, 0, &t, NULL);
-}
-
 static int is_prefix(const char *needle, const char *hay)
 {
 	size_t nlen = strlen(needle);
@@ -494,7 +474,7 @@ static void fuser_run(struct run_queue *rp, const char *fuser_opt)
 	} else {
 		rp->fuser_pid = res.pid;
 		rp->fuser_stdoutfd = res.proc_stdout;
-		rp->fuser_exec_time = clock_ms();
+		rp->fuser_exec_time = tm_now();
 	}
 }
 
@@ -587,7 +567,7 @@ int main(int argc, char **argv)
 	pid_t pid;
 	int status, flags;
 	int64_t tmp, next_retry, now;
-	int rc_fuser_timeout;
+	int64_t rc_fuser_timeout = -1;
 	const char *umount_args[UMOUNT_ARGS_MAX];
 	int umount_args_num = 0;
 	const char **mounts = NULL;
@@ -627,8 +607,11 @@ int main(int argc, char **argv)
 		}
 
 		tmps = rc_conf_value("rc_fuser_timeout");
-		if (!tmps || sscanf(tmps, "%d", &rc_fuser_timeout) != 1)
-			rc_fuser_timeout = 60;
+		if (tmps && (rc_fuser_timeout = parse_duration(tmps)) < 0)
+			ewarn("%s: Invalid rc_fuser_timeout value: `%s`. "
+				"Defaulting to 60", applet, tmps);
+		if (rc_fuser_timeout < 0)
+			rc_fuser_timeout = 60 * 1000;
 
 		tmps = getenv("RC_UNAME");
 		if (!tmps || strcmp(tmps, "Linux") == 0) {
@@ -771,7 +754,7 @@ int main(int argc, char **argv)
 		}
 		rp = running + num_running++;
 		rp->mntpath = mounts[unmount_index];
-		rp->last_exec_time = clock_ms();
+		rp->last_exec_time = tm_now();
 		rp->try_count = 0;
 		rp->pid = run_umount(rp->mntpath, umount_args, umount_args_num);
 		rp->fuser_pid = -1;
@@ -818,7 +801,7 @@ int main(int argc, char **argv)
 			if (running[i].pid > 0)
 				continue;
 			if (running[i].fuser_pid > 0)
-				tmp = running[i].fuser_exec_time + (rc_fuser_timeout * UINT64_C(1000));
+				tmp = running[i].fuser_exec_time + rc_fuser_timeout;
 			else
 				tmp = running[i].last_exec_time + TRY_DELAY_MS;
 			if (tmp < next_retry) {
@@ -830,11 +813,11 @@ int main(int argc, char **argv)
 			state = (num_mounts > 0) ? STATE_RUN : STATE_END;
 			break;
 		}
-		now = clock_ms();
+		now = tm_now();
 		if (next_retry > now) {
-			if (sleep_ms(MIN(next_retry - now, 1000)) < 0 && errno == EINTR)
+			if (tm_sleep(MIN(next_retry - now, 1000), 0) != 0 && errno == EINTR)
 				state = STATE_REAP;
-			now = clock_ms();
+			now = tm_now();
 		}
 		if (next_retry <= now) {
 			if (rp->fuser_pid > 0) {
@@ -846,7 +829,7 @@ int main(int argc, char **argv)
 				*rp = running[--num_running];
 				result = EXIT_FAILURE;
 			} else { /* retry */
-				rp->last_exec_time = clock_ms();
+				rp->last_exec_time = tm_now();
 				rp->pid = run_umount(rp->mntpath,
 					umount_args, umount_args_num);
 			}