path-util: paths_check_timestamp() opimizations

[elogind.git] / src / shared / path-util.c

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index def7a7409a30ed85ef8ebf573b5df489977f81b8..6c4efbfd9442058c7c74c404468871996e89cd2b 100644 (file)
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -428,6 +428,8 @@ int path_is_os_tree(const char *path) {
 
 int find_binary(const char *name, char **filename) {
         assert(name);
+        assert(filename);
+
         if (strchr(name, '/')) {
                 char *p;
 
@@ -474,33 +476,37 @@ int find_binary(const char *name, char **filename) {
         }
 }
 
-bool paths_check_timestamp(char **paths, usec_t *paths_ts_usec, bool update)
-{
-        unsigned int i;
+bool paths_check_timestamp(char **paths, usec_t *timestamp, bool update) {
         bool changed = false;
+        char **i;
+
+        assert(timestamp);
 
         if (paths == NULL)
-                goto out;
+                return false;
 
-        for (i = 0; paths[i]; i++) {
+        STRV_FOREACH(i, paths) {
                 struct stat stats;
+                usec_t u;
 
-                if (stat(paths[i], &stats) < 0)
+                if (stat(*i, &stats) < 0)
                         continue;
 
-                if (paths_ts_usec[i] == timespec_load(&stats.st_mtim))
-                        continue;
+                u = timespec_load(&stats.st_mtim);
 
                 /* first check */
-                if (paths_ts_usec[i] != 0) {
-                        log_debug("reload - timestamp of '%s' changed\n", paths[i]);
-                        changed = true;
-                }
+                if (*timestamp >= u)
+                        continue;
+
+                log_debug("timestamp of '%s' changed\n", *i);
 
                 /* update timestamp */
-                if (update)
-                        paths_ts_usec[i] = timespec_load(&stats.st_mtim);
+                if (update) {
+                        *timestamp = u;
+                        changed = true;
+                } else
+                        return true;
         }
-out:
+
         return changed;
 }