Merge 9bed9e3 into a630434

Author: jimklimov

Makefile.am

@@ -136,22 +136,22 @@ install-fanout-cleanup: install-recursive @dotMAKE@
 # Called from generated-sources-with-a-touch:
 touch-include-all-nut_version-generated.timestamp:
 	@[ -s include/nut_version.h ]
-	@touch -r include/nut_version.h -d '-10 seconds' include/.all.nut_version-generated.timestamp && exit ; \
+	@touch -r include/nut_version.h -d '-10 seconds' include/.all.nut_version-generated.timestamp 2>/dev/null && exit ; \
 	 touch -d '1970-01-01T00:00:00' include/.all.nut_version-generated.timestamp && exit ; \
 	 touch include/.all.nut_version-generated.timestamp
 
 touch-clients-all-libupsclient_version-generated.timestamp:
 	@[ -s clients/libupsclient-version.h ]
-	@touch -r clients/libupsclient-version.h -d '-10 seconds' clients/.all.libupsclient_version-generated.timestamp && exit ; \
+	@touch -r clients/libupsclient-version.h -d '-10 seconds' clients/.all.libupsclient_version-generated.timestamp 2>/dev/null && exit ; \
 	 touch -d '1970-01-01T00:00:00' clients/.all.libupsclient_version-generated.timestamp && exit ; \
 	 touch clients/.all.libupsclient_version-generated.timestamp
 
 touch-docs-man-all-linkman-generated.timestamp:
 	@[ -s docs/man/linkman-driver-names.txt ] && [ -s docs/man/linkman-drivertool-names.txt ]
 	@if test -n "`find docs/man/linkman-driver-names.txt -newer docs/man/linkman-drivertool-names.txt`" ; then \
-	    touch -r docs/man/linkman-drivertool-names.txt -d '-10 seconds' docs/man/.all.nut_linkman-generated.timestamp && exit ; \
+	    touch -r docs/man/linkman-drivertool-names.txt -d '-10 seconds' docs/man/.all.nut_linkman-generated.timestamp 2>/dev/null && exit ; \
 	 else \
-	    touch -r docs/man/linkman-driver-names.txt -d '-10 seconds' docs/man/.all.nut_linkman-generated.timestamp && exit ; \
+	    touch -r docs/man/linkman-driver-names.txt -d '-10 seconds' docs/man/.all.nut_linkman-generated.timestamp 2>/dev/null && exit ; \
 	 fi ; \
 	 touch -d '1970-01-01T00:00:00' docs/man/.all.nut_linkman-generated.timestamp && exit ; \
 	 touch docs/man/.all.nut_linkman-generated.timestamp

ci_build.adoc

@@ -106,10 +106,24 @@ It can be stored outside of the build area(s), under `${CI_CACHE_NUT_BASEDIR}`
 by caller (e.g. via `~/.profile` of a developer) or guessed from environment
 variables typical for CI runs.
 
+Note there is also a separate `DO_USE_NUTCI_CACHE_DEBUG=yes` (or `...=first`)
+toggle, which aims to keep a copy of not only the `config.cache`, but also of
+`config.log` and `config.h` files, as well as a copy of the help text from
+`configure` script, from a first run with new cache hash for troubleshooting.
+
+A further `DO_USE_NUTCI_CACHE_DEBUG=each` keeps such files time-stamped, from
+every run (primarily to help determine if re-runs do modify some detection
+results due to mis-interpretation of cached data -- i.e. to help fix the `m4`
+scripts and/or `configure.ac` source file).
+
+WARNING: It is up to the caller (developer, CI) to ensure that third-party
+dependencies and tools (and their flags delivered by `pkg-config`, or module
+paths for interpreted languages, etc.) remain the same between cached runs.
+
 If something acts up, or the build environment changes invisibly to the
 script, an `export DO_CLEAN_NUTCI_CACHE_BEFORE=yes` (or a more targeted
-`DO_CLEAN_AUTOCONF_CACHE_BEFORE`, since NIT uses similar logic and general
-toggle to retain generated test certificates) should fix that.
+`export DO_CLEAN_AUTOCONF_CACHE_BEFORE=yes`, since NIT uses similar logic
+and general toggle to retain generated test certificates) should fix that.
 
 You can also always nuke the `${CI_CACHE_NUT_BASEDIR}` directory, or the
 `AUTOCONF_*` subdirectories and stale lock files under it.

ci_build.sh

@@ -1292,14 +1292,39 @@ configure_nut() {
           "${CONFIG_OPTS[@]}" \
       && echo "$0: configure phase complete (0)" >&2 \
       && {
-        if [ x"${DO_USE_AUTOCONF_CACHE}" = xyes ] && [ x"${DO_USE_AUTOCONF_CACHE_DEBUG}" = xyes ] && [ -n "${CI_CACHE_NUT_HASHDIR_CFG_OPT}" ] && [ -s "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache" ] ; then
-            if [ x = x"`cat \"${CI_CACHE_NUT_HASHDIR_CFG}/config.log\" \"${CI_CACHE_NUT_HASHDIR_CFG}/config.h\"`" ] ; then
-                # Stash a copy to track evolution:
-                cp -pf "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache" "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache.orig"
-                # Populate on first run (may cost 1-2Mb):
-                cp -pf config.log "${CI_CACHE_NUT_HASHDIR_CFG}/"
-                cp -pf include/config.h "${CI_CACHE_NUT_HASHDIR_CFG}/"
-            fi
+        if [ x"${DO_USE_AUTOCONF_CACHE}" = xyes ] \
+        && [ -n "${CI_CACHE_NUT_HASHDIR_CFG_OPT}" ] \
+        && [ -s "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache" ] \
+        ; then
+            case x"${DO_USE_AUTOCONF_CACHE_DEBUG}" in
+                xyes|xfirst)
+                    if [ x = x"`cat \"${CI_CACHE_NUT_HASHDIR_CFG}/config.log\" \"${CI_CACHE_NUT_HASHDIR_CFG}/config.h\"`" ] ; then
+                        # Stash a copy to track evolution:
+                        cp -pf "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache" "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache.orig"
+                        # Populate on first run (may cost 1-2Mb):
+                        cp -pf config.log "${CI_CACHE_NUT_HASHDIR_CFG}/"
+                        cp -pf include/config.h "${CI_CACHE_NUT_HASHDIR_CFG}/"
+                    fi
+
+                    # Make sure all args are declared outside cached logic:
+                    $CONFIGURE_SCRIPT --help > "${CI_CACHE_NUT_HASHDIR_CFG}/config.help" 2>&1
+                    ;;
+                xeach)
+                    TS="`date '+%s'`" && [ -n "$TS" ] && [ "$TS" -gt 0 ] \
+                    || { TS="`date | tr -d ':' | tr -d ' '`" && [ -n "$TS" ] ; } \
+                    || TS=$$
+
+                    for F in \
+                        "${CI_CACHE_NUT_HASHDIR_CFG}/config.cache" \
+                        config.log include/config.h \
+                    ; do
+                        cp -pf "$F" "${CI_CACHE_NUT_HASHDIR_CFG}/`basename \"$F\"`.$TS"
+                    done
+
+                    # Make sure all args are declared outside cached logic:
+                    $CONFIGURE_SCRIPT --help > "${CI_CACHE_NUT_HASHDIR_CFG}/config.help.$TS" 2>&1
+                    ;;
+            esac
         fi
       } && return 0 \
       || { RES_CFG=$?
@@ -2087,6 +2112,22 @@ default|default-alldrv|default-alldrv:no-distcheck|default-all-errors|default-al
         CONFIG_OPTS+=("CC=${CC}")
         CONFIG_OPTS+=("CXX=${CXX}")
         CONFIG_OPTS+=("CPP=${CPP}")
+
+        # Do not let autoconf-cached re-runs (re-running the configure script
+        # due to a `make` with changed *.m4, *.am or configure.ac sources)
+        # complain that CCACHE_* vars were not previously set. This hassle
+        # comes with use of AC_ARG_VAR to mark "precious" arguments:
+        CONFIG_OPTS+=("CCACHE_NAMESPACE=${CCACHE_NAMESPACE}")
+        CONFIG_OPTS+=("CCACHE_BASEDIR=${CCACHE_BASEDIR}")
+        CONFIG_OPTS+=("CCACHE_DIR=${CCACHE_DIR}")
+        CONFIG_OPTS+=("CCACHE_PATH=${CCACHE_PATH}")
+    else
+        # Still have them declared; the configure script will probably parse
+        # them as empty/undefined and re-evaluate if situation warrants that:
+        CONFIG_OPTS+=("CCACHE_NAMESPACE=")
+        CONFIG_OPTS+=("CCACHE_BASEDIR=")
+        CONFIG_OPTS+=("CCACHE_DIR=")
+        CONFIG_OPTS+=("CCACHE_PATH=")
     fi
 
     # Build and check this project; note that zprojects always have an autogen.sh
@@ -3111,6 +3152,22 @@ bindings)
         CONFIG_OPTS+=("CC=${CC}")
         CONFIG_OPTS+=("CXX=${CXX}")
         CONFIG_OPTS+=("CPP=${CPP}")
+
+        # Do not let autoconf-cached re-runs (re-running the configure script
+        # due to a `make` with changed *.m4, *.am or configure.ac sources)
+        # complain that CCACHE_* vars were not previously set. This hassle
+        # comes with use of AC_ARG_VAR to mark "precious" arguments:
+        CONFIG_OPTS+=("CCACHE_NAMESPACE=${CCACHE_NAMESPACE}")
+        CONFIG_OPTS+=("CCACHE_BASEDIR=${CCACHE_BASEDIR}")
+        CONFIG_OPTS+=("CCACHE_DIR=${CCACHE_DIR}")
+        CONFIG_OPTS+=("CCACHE_PATH=${CCACHE_PATH}")
+    else
+        # Still have them declared; the configure script will probably parse
+        # them as empty/undefined and re-evaluate if situation warrants that:
+        CONFIG_OPTS+=("CCACHE_NAMESPACE=")
+        CONFIG_OPTS+=("CCACHE_BASEDIR=")
+        CONFIG_OPTS+=("CCACHE_DIR=")
+        CONFIG_OPTS+=("CCACHE_PATH=")
     fi
 
     # If detect_platform_PKG_CONFIG_PATH_and_FLAGS() customized anything here,

common/common.c

@@ -3183,12 +3183,17 @@ int upsnotify(upsnotify_state_t state, const char *fmt, ...)
 	 * a reload action for Type=notify-reload; for more details see
 	 * https://github.com/systemd/systemd/blob/main/src/core/service.c#L2618
 	 */
-	struct timespec monoclock_ts;
-	int got_monoclock = clock_gettime(CLOCK_MONOTONIC, &monoclock_ts);
+	struct timespec	monoclock_ts;
+	int	got_monoclock = clock_gettime(CLOCK_MONOTONIC, &monoclock_ts);
 #  endif	/* HAVE_CLOCK_GETTIME && HAVE_CLOCK_MONOTONIC */
 # endif	/* HAVE_SD_NOTIFY */
 #endif	/* WITH_LIBSYSTEMD */
 
+	/* Some code paths (build configurations/goals) do not involve these,
+	 * but easier to make-believe that we do than pepper code with ifdefs */
+	NUT_UNUSED_VARIABLE(buf);
+	NUT_UNUSED_VARIABLE(msglen);
+
 	/* Were we asked to be quiet on the console? */
 	if (upsnotify_report_verbosity < 0) {
 		char *quiet_init = getenv("NUT_QUIET_INIT_UPSNOTIFY");
@@ -3258,8 +3263,6 @@ int upsnotify(upsnotify_state_t state, const char *fmt, ...)
 
 #if defined(WITH_LIBSYSTEMD) && (WITH_LIBSYSTEMD)
 # if defined(WITHOUT_LIBSYSTEMD) && (WITHOUT_LIBSYSTEMD)
-	NUT_UNUSED_VARIABLE(buf);
-	NUT_UNUSED_VARIABLE(msglen);
 	if (!upsnotify_reported_disabled_systemd) {
 		upsdebugx(upsnotify_report_verbosity,
 			"%s: notify about state %s with libsystemd: "