tree-wide: add DEBUG_LOGGING macro that checks whether debug logging is on (#7645)

This makes things a bit easier to read I think, and also makes sure we
always use the _unlikely_ wrapper around it, which so far we used
sometimes and other times we didn't. Let's clean that up.

diff --git a/coccinelle/debug-logging.cocci b/coccinelle/debug-logging.cocci
new file mode 100644 (file)
index 0000000..9084cf7
--- /dev/null
+++ b/coccinelle/debug-logging.cocci
@@ -0,0 +1,8 @@
+@@
+@@
+- _unlikely_(log_get_max_level() >= LOG_DEBUG)
++ DEBUG_LOGGING
+@@
+@@
+- log_get_max_level() >= LOG_DEBUG
++ DEBUG_LOGGING

diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 461e7852ac80e10607dc50931096083d23f95bb5..f475b6598c6719c4c9fed4903e2ba3f4d6fd7cc7 100644 (file)
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -220,7 +220,7 @@ static int verify_unit(Unit *u, bool check_man) {
 
         assert(u);
 
-        if (log_get_max_level() >= LOG_DEBUG)
+        if (DEBUG_LOGGING)
                 unit_dump(u, stdout, "\t");
 
         log_unit_debug(u, "Creating %s/start job", u->id);

diff --git a/src/basic/log.h b/src/basic/log.h
index aa5976c3c040e66d7694b52b3f42e1bc6bbaa76a..28300312f628586f2a520ee6befdd6fa9c2d3d65 100644 (file)
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -335,3 +335,5 @@ int log_syntax_internal(
                                             "String is not UTF-8 clean, ignoring assignment: %s", strna(_p)); \
                 }                                                       \
         })
+
+#define DEBUG_LOGGING _unlikely_(log_get_max_level() >= LOG_DEBUG)

diff --git a/src/core/execute.c b/src/core/execute.c
index f20246796f180eb20bc727a84f4da8997ce12898..b91f654994a615180faaab58b338e7600aa46796 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3418,7 +3418,7 @@ static int exec_child(
                 return log_oom();
         }
 
-        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *line;
 
                 line = exec_command_line(final_argv);

diff --git a/src/core/manager.c b/src/core/manager.c
index 81c4d5289beb830264161ce2466c860af1ff847e..15720ada24f223b3b7de3cbb8f86974ec11e2361 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1887,7 +1887,7 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const
 
         if (UNIT_VTABLE(u)->notify_message)
                 UNIT_VTABLE(u)->notify_message(u, pid, tags, fds);
-        else if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+        else if (DEBUG_LOGGING) {
                 _cleanup_free_ char *x = NULL, *y = NULL;
 
                 x = cescape(buf);

diff --git a/src/core/service.c b/src/core/service.c
index ef1be33260456ed7f6da65d51511f5d86c256e79..c6835a4d6c640f06b5ddc875919a1ce4ce143a1b 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3417,7 +3417,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds)
         if (!service_notify_message_authorized(SERVICE(u), pid, tags, fds))
                 return;
 
-        if (log_get_max_level() >= LOG_DEBUG) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *cc = NULL;
 
                 cc = strv_join(tags, ", ");

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 0d420b2190d0305af10cf99722110fe81a281d94..2fd5adcddc9c22574bd73ee0243ddbb9c7569ced 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1061,7 +1061,7 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 goto end;
 
-        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 69718aae8757d36fe5da6de40954c2636c3ec592..7566543c1aacd979cf48e490cdde9ef10d55c120 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -248,7 +248,7 @@ int start_upload(Uploader *u,
                 easy_setopt(curl, CURLOPT_HTTPHEADER, u->header,
                             LOG_ERR, return -EXFULL);
 
-                if (_unlikely_(log_get_max_level() >= LOG_DEBUG))
+                if (DEBUG_LOGGING)
                         /* enable verbose for easier tracing */
                         easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
 

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 956d85aff273bd518f2a598b1d257b3b21760612..7078f11b0dd766b333da5ece7e7cd2cd674425fb 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2257,7 +2257,7 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 goto finish;
 
-        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index 942956dd718770bd600398e22d989210d45b8daa..e9197f1dfdf656299f91a457ccb1627043ec0d8e 100644 (file)
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -476,7 +476,7 @@ static int dns_cache_put_positive(
         if (r < 0)
                 return r;
 
-        if (log_get_max_level() >= LOG_DEBUG) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *t = NULL;
 
                 (void) in_addr_to_string(i->owner_family, &i->owner_address, &t);

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 2dbf432df909b15d950283503e362d872bef96ba..1311f04f75513322fd3f7192203392ba4586e498 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1410,7 +1410,7 @@ void manager_dnssec_verdict(Manager *m, DnssecVerdict verdict, const DnsResource
         assert(verdict >= 0);
         assert(verdict < _DNSSEC_VERDICT_MAX);
 
-        if (log_get_max_level() >= LOG_DEBUG) {
+        if (DEBUG_LOGGING) {
                 char s[DNS_RESOURCE_KEY_STRING_MAX];
 
                 log_debug("Found verdict for lookup %s: %s",

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index afc3dcd21905a79d17beb0924d477072ddf07167..af7f8f345e196a138c6c1bd13eb2b8c213658c99 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1392,7 +1392,7 @@ int show_journal_by_unit(
         if (r < 0)
                 return log_error_errno(r, "Failed to add unit matches: %m");
 
-        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *filter;
 
                 filter = journal_make_match_string(j);

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 62742858c7bfd42fccbf0f8bce4ac62a10a78fcc..b8f2b30a719dbd7e4e1ed0c90d02ff03a3b321d0 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -954,7 +954,7 @@ int seccomp_restrict_namespaces(unsigned long retain) {
         uint32_t arch;
         int r;
 
-        if (log_get_max_level() >= LOG_DEBUG) {
+        if (DEBUG_LOGGING) {
                 _cleanup_free_ char *s = NULL;
 
                 (void) namespace_flag_to_string_many(retain, &s);