From 92ef99d90574ebd4732c10a0a127945a40271c87 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 1 Oct 2025 18:24:19 +0000 Subject: Add repo/set touching to avoid extra compiles --- src/include/s6-rc/repo.h | 2 ++ src/libs6rc/deps-lib/s6rc | 2 ++ src/libs6rc/s6rc_repo_touch.c | 45 ++++++++++++++++++++++++++++++++++++++++ src/libs6rc/s6rc_repo_touchset.c | 25 ++++++++++++++++++++++ src/repo/s6-rc-repo-sync.c | 1 + src/repo/s6-rc-set-commit.c | 43 ++++++++++++++++++++++++++++++++++---- src/repo/s6-rc-set-new.c | 8 +++++-- 7 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 src/libs6rc/s6rc_repo_touch.c create mode 100644 src/libs6rc/s6rc_repo_touchset.c (limited to 'src') diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h index 2253984..7122404 100644 --- a/src/include/s6-rc/repo.h +++ b/src/include/s6-rc/repo.h @@ -30,6 +30,8 @@ extern int s6rc_repo_sync (char const *, unsigned int, char const *) ; extern int s6rc_repo_syncset (char const *, char const *, unsigned int) ; extern int s6rc_repo_syncset_tmp (char const *, char const *, stralloc *, genalloc *ga, unsigned int) ; extern int s6rc_repo_lock (char const *, int) ; +extern int s6rc_repo_touch (char const *) ; +extern int s6rc_repo_touchset (char const *, char const *) ; extern int s6rc_repo_makesetbundles (char const *, char const *, unsigned int) ; extern int s6rc_repo_makedefbundle (char const *, char const *, char const *) ; diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc index d847297..79c2909 100644 --- a/src/libs6rc/deps-lib/s6rc +++ b/src/libs6rc/deps-lib/s6rc @@ -42,6 +42,8 @@ s6rc_repo_sv_cmpr.o s6rc_repo_sync.o s6rc_repo_syncset.o s6rc_repo_syncset_tmp.o +s6rc_repo_touch.o +s6rc_repo_touchset.o s6rc_sanitize_dir.o s6rc_servicedir_internal.o s6rc_servicedir_block.o diff --git a/src/libs6rc/s6rc_repo_touch.c b/src/libs6rc/s6rc_repo_touch.c new file mode 100644 index 0000000..069ed78 --- /dev/null +++ b/src/libs6rc/s6rc_repo_touch.c @@ -0,0 +1,45 @@ +/* ISC license. */ + +#include +#include + +#include +#include + +#include + +int s6rc_repo_touch (char const *repo) +{ + DIR *dir ; + size_t repolen = strlen(repo) ; + char sources[repolen + 9] ; + memcpy(sources, repo, repolen) ; + memcpy(sources + repolen, "/sources", 9) ; + + dir = opendir(sources) ; + if (!dir) + { + strerr_warnfu2sys("opendir ", sources) ; + return 0 ; + } + for (;;) + { + direntry *d ; + errno = 0 ; + d = readdir(dir) ; + if (!d) break ; + if (d->d_name[0] == '.') continue ; + if (!s6rc_repo_touchset(repo, d->d_name)) + { + dir_close(dir) ; + return 0 ; + } + } + dir_close(dir) ; + if (errno) + { + strerr_warnfu2sys("readdir ", sources) ; + return 0 ; + } + return 1 ; +} diff --git a/src/libs6rc/s6rc_repo_touchset.c b/src/libs6rc/s6rc_repo_touchset.c new file mode 100644 index 0000000..684bfc4 --- /dev/null +++ b/src/libs6rc/s6rc_repo_touchset.c @@ -0,0 +1,25 @@ +/* ISC license. */ + +#include + +#include +#include + +#include + +int s6rc_repo_touchset (char const *repo, char const *set) +{ + size_t repolen = strlen(repo) ; + size_t setlen = strlen(set) ; + char fn[repolen + 17 + setlen] ; + memcpy(fn, repo, repolen) ; + memcpy(fn + repolen, "/sources/", 9) ; + memcpy(fn + repolen + 9, set, setlen) ; + memcpy(fn + repolen + 9 + setlen, "/.stamp", 8) ; + if (!touch(fn)) + { + strerr_warnfu2sys("touch ", fn) ; + return 0 ; + } + return 1 ; +} diff --git a/src/repo/s6-rc-repo-sync.c b/src/repo/s6-rc-repo-sync.c index 751037c..474eec5 100644 --- a/src/repo/s6-rc-repo-sync.c +++ b/src/repo/s6-rc-repo-sync.c @@ -46,6 +46,7 @@ int main (int argc, char const *const *argv) if (fdlock == -1) strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ; if (!s6rc_repo_sync(wgola[GOLA_REPODIR], verbosity, wgola[GOLA_FDHUSER])) _exit(111) ; + if (!s6rc_repo_touch(wgola[GOLA_REPODIR])) _exit(111) ; _exit(0) ; } diff --git a/src/repo/s6-rc-set-commit.c b/src/repo/s6-rc-set-commit.c index 9676f68..908f307 100644 --- a/src/repo/s6-rc-set-commit.c +++ b/src/repo/s6-rc-set-commit.c @@ -19,12 +19,13 @@ #include #include -#define USAGE "s6-rc-set-commit [ -v verbosity ] [ -r repo ] [ -D defaultbundle ] [ -h fdhuser ] [ -K ] set" +#define USAGE "s6-rc-set-commit [ -v verbosity ] [ -r repo ] [ -D defaultbundle ] [ -h fdhuser ] [ -K ] [ -f ] set" #define dieusage() strerr_dieusage(100, USAGE) enum golb_e { - GOLB_KEEPOLD = 0x01 + GOLB_KEEPOLD = 0x01, + GOLB_FORCE = 0x02 } ; enum gola_e @@ -38,7 +39,8 @@ enum gola_e static gol_bool const rgolb[] = { - { .so = 'K', .lo = "keep-old", .clear = 0, .set = GOLB_KEEPOLD } + { .so = 'K', .lo = "keep-old", .clear = 0, .set = GOLB_KEEPOLD }, + { .so = 'f', .lo = "force", .clear = 0, .set = GOLB_FORCE } } ; static gol_arg const rgola[] = @@ -51,7 +53,7 @@ static gol_arg const rgola[] = static uint64_t wgolb = 0 ; -static void check_set (char const *repo, char const *set) +static inline void check_set (char const *repo, char const *set) { struct stat st ; size_t repolen = strlen(repo) ; @@ -70,6 +72,34 @@ static void check_set (char const *repo, char const *set) strerr_dief3x(102, "file ", fn, " is not a directory") ; } +static inline int uptodate (char const *repo, char const *set) +{ + struct stat stsource ; + struct stat stcompiled ; + size_t repolen = strlen(repo) ; + size_t setlen = strlen(set) ; + char srcfn[repolen + 17 + setlen] ; + char dstfn[repolen + 11 + setlen] ; + memcpy(srcfn, repo, repolen) ; + memcpy(srcfn + repolen, "/sources/", 9) ; + memcpy(srcfn + repolen + 9, set, setlen) ; + memcpy(srcfn + repolen + 9 + setlen, "/.stamp", 8) ; + memcpy(dstfn, repo, repolen) ; + memcpy(dstfn + repolen, "/compiled/", 10) ; + memcpy(dstfn + repolen + 10, set, setlen + 1) ; + if (stat(srcfn, &stsource) == -1) + strerr_diefu2sys(111, "stat ", srcfn) ; + if (stat(dstfn, &stcompiled) == -1) + { + if (errno == ENOENT) return 0 ; + else strerr_diefu2sys(111, "stat ", dstfn) ; + } + return + stsource.st_atim.tv_sec < stcompiled.st_atim.tv_sec ? 1 : + stsource.st_atim.tv_sec > stcompiled.st_atim.tv_sec ? 0 : + stsource.st_atim.tv_nsec < stcompiled.st_atim.tv_nsec ; +} + int main (int argc, char const *const *argv) { int fdlock ; @@ -93,6 +123,11 @@ int main (int argc, char const *const *argv) fdlock = s6rc_repo_lock(wgola[GOLA_REPODIR], 1) ; if (fdlock == -1) strerr_diefu2sys(111, "lock ", wgola[GOLA_REPODIR]) ; check_set(wgola[GOLA_REPODIR], argv[0]) ; + if (!(wgolb & GOLB_FORCE) && uptodate(wgola[GOLA_REPODIR], argv[0])) + { + if (verbosity >= 2) strerr_warni3x("set ", argv[0], " is already up-to-date.") ; + _exit(0) ; + } size_t oldclen = S6RC_REPO_COMPILE_BUFLEN(strlen(wgola[GOLA_REPODIR]), strlen(argv[0])) ; char oldc[oldclen] ; diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c index 04be39d..010c2b1 100644 --- a/src/repo/s6-rc-set-new.c +++ b/src/repo/s6-rc-set-new.c @@ -34,6 +34,7 @@ static inline void newset (char const *repo, char const *setname) { size_t repolen = strlen(repo) ; size_t setlen = strlen(setname) ; + mode_t m ; char atomics[repolen + 18] ; char fn[repolen + 10 + setlen] ; char tmp[repolen + 18 + setlen] ; @@ -51,6 +52,7 @@ static inline void newset (char const *repo, char const *setname) tmp[repolen + 9] = '.' ; memcpy(tmp + repolen + 10, setname, setlen) ; memcpy(tmp + repolen + 10 + setlen, ":XXXXXX", 8) ; + m = umask(0) ; if (!mkdtemp(tmp)) strerr_diefu2sys(111, "mkdtemp ", tmp) ; for (size_t i = 0 ; i < 4 ; i++) @@ -58,12 +60,14 @@ static inline void newset (char const *repo, char const *setname) memcpy(sub + repolen + 18 + setlen, s6rc_repo_subnames[i], 7) ; if (mkdir(sub, 02755) == -1) { + umask(m) ; cleanup(tmp) ; strerr_diefu2sys(111, "mkdir ", sub) ; } } - - if (s6rc_repo_fillset(repo, tmp + repolen + 9, 0, 0)) + umask(m) ; + if (!s6rc_repo_fillset(repo, tmp + repolen + 9, 0, 0) + || !s6rc_repo_touchset(repo, tmp + repolen + 9)) { cleanup(tmp) ; _exit(111) ; -- cgit v1.3.1