From a609ece4fdda0185284a98ee4b9b786375cabe17 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 23 Feb 2024 09:27:12 +0100 Subject: [PATCH] common: remove redundant log messages Signed-off-by: Tomasz Gromadzki --- src/core/out.c | 13 ------------- src/test/arch_flags/log0.log.match | 2 -- src/test/out_err/traces0.log.match | 3 --- src/test/traces/custom_file0.log.match | 15 ++++++--------- src/test/traces/redir_stderr2.log.match | 15 ++++++--------- src/test/traces/redir_stderr3.log.match | 15 ++++++--------- src/test/traces/redir_stderr4.log.match | 15 ++++++--------- src/test/traces/redir_stderr5.log.match | 15 ++++++--------- src/test/util_poolset/grep0.log.match | 3 --- src/test/util_poolset/grep1.log.match | 3 --- src/test/util_poolset/grep10.log.match | 6 +++--- src/test/util_poolset/grep2.log.match | 3 --- src/test/util_poolset/grep3.log.match | 3 --- src/test/util_poolset/grep4.log.match | 3 --- src/test/util_poolset/grep5.log.match | 3 --- src/test/util_poolset/grep6.log.match | 3 --- 16 files changed, 33 insertions(+), 87 deletions(-) diff --git a/src/core/out.c b/src/core/out.c index 12b4e4225e7..d1b9785c9e2 100644 --- a/src/core/out.c +++ b/src/core/out.c @@ -168,9 +168,6 @@ out_init(const char *log_prefix, const char *log_level_var, CORE_LOG_HARK("%s version %d.%d", log_prefix, major_version, minor_version); - static __attribute__((used)) const char *version_msg = - "src version: " SRCVERSION; - CORE_LOG_HARK("%s", version_msg); #if VG_PMEMCHECK_ENABLED /* * Attribute "used" to prevent compiler from optimizing out the variable @@ -195,16 +192,6 @@ out_init(const char *log_prefix, const char *log_level_var, "compiled with support for Valgrind drd"; CORE_LOG_HARK("%s", drd_msg); #endif /* VG_DRD_ENABLED */ -#if SDS_ENABLED - static __attribute__((used)) const char *shutdown_state_msg = - "compiled with support for shutdown state"; - CORE_LOG_HARK("%s", shutdown_state_msg); -#endif -#if NDCTL_ENABLED - static __attribute__((used)) const char *ndctl_ge_63_msg = - "compiled with libndctl 63+"; - CORE_LOG_HARK("%s", ndctl_ge_63_msg); -#endif last_error_msg_init(); } diff --git a/src/test/arch_flags/log0.log.match b/src/test/arch_flags/log0.log.match index 6335703f5f0..bb87a7f820b 100644 --- a/src/test/arch_flags/log0.log.match +++ b/src/test/arch_flags/log0.log.match @@ -8,8 +8,6 @@ $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind pmemcheck $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind helgrind $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind memcheck $(OPT): <1> [$(*)]$(W)compiled with support for Valgrind drd -$(OPT): <1> [$(*)]$(W)compiled with support for shutdown state -$(OPT): <1> [$(*)]$(W)compiled with libndctl 63+ : <3> [$(nW) util_mmap_init] : <1> [$(nW) util_check_arch_flags]$(W)invalid machine value : <1> [$(nW) util_check_arch_flags]$(W)invalid machine_class value diff --git a/src/test/out_err/traces0.log.match b/src/test/out_err/traces0.log.match index f4a016acc1d..b9b09809d4f 100644 --- a/src/test/out_err/traces0.log.match +++ b/src/test/out_err/traces0.log.match @@ -3,13 +3,10 @@ $(OPT): <1> [$(*)]$(W)compiled with support for shutdown state $(OPT): <1> [$(*)]$(W)compiled with libndctl 63+ : <1> [out.c:$(N) out_init]$(W)pid $(N): program: $(nW) : <1> [out.c:$(N) out_init]$(W)trace version 1.0 -: <1> [out.c:$(N) out_init]$(W)src version: $(nW) $(OPT): <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind pmemcheck $(OPT): <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind helgrind $(OPT): <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind memcheck $(OPT): <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind drd -$(OPT): <1> [out.c:$(N) out_init]$(W)compiled with support for shutdown state -$(OPT): <1> [out.c:$(N) out_init]$(W)compiled with libndctl 63+ : <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #1 $(OPT): <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #2: Success $(OPX): <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #2: No error: 0 diff --git a/src/test/traces/custom_file0.log.match b/src/test/traces/custom_file0.log.match index f5fc05bbbb5..e04efd9f8c0 100644 --- a/src/test/traces/custom_file0.log.match +++ b/src/test/traces/custom_file0.log.match @@ -1,15 +1,12 @@ $(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for shutdown state +$(OPT)$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ $(nW) <1> $(nW) $(nW) pid $(N): program: $(nW) $(nW) <1> $(nW) $(nW) ut version 1.0 -$(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd $(nW) <3> $(nW) $(nW) $(nW) <1> $(nW) $(nW) Log level HARK $(nW) <1> $(nW) $(nW) Log level ERROR diff --git a/src/test/traces/redir_stderr2.log.match b/src/test/traces/redir_stderr2.log.match index 1b1da1d81dc..1de6b64ad75 100644 --- a/src/test/traces/redir_stderr2.log.match +++ b/src/test/traces/redir_stderr2.log.match @@ -1,14 +1,11 @@ $(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for shutdown state +$(OPT)$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ $(nW) <1> $(nW) $(nW) pid $(N): program: $(nW) $(nW) <1> $(nW) $(nW) ut version 1.0 -$(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd $(nW) <1> $(nW) $(nW) Log level HARK $(nW) <1> $(nW) $(nW) Log level ERROR diff --git a/src/test/traces/redir_stderr3.log.match b/src/test/traces/redir_stderr3.log.match index c71f0ff5d27..a2d55384538 100644 --- a/src/test/traces/redir_stderr3.log.match +++ b/src/test/traces/redir_stderr3.log.match @@ -1,15 +1,12 @@ $(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for shutdown state +$(OPT)$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ $(nW) <1> $(nW) $(nW) pid $(N): program: $(nW) $(nW) <1> $(nW) $(nW) ut version 1.0 -$(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd $(nW) <1> $(nW) $(nW) Log level HARK $(nW) <1> $(nW) $(nW) Log level ERROR $(nW) <2> $(nW) $(nW) Log level WARNING diff --git a/src/test/traces/redir_stderr4.log.match b/src/test/traces/redir_stderr4.log.match index 48b1f776812..140b9d37046 100644 --- a/src/test/traces/redir_stderr4.log.match +++ b/src/test/traces/redir_stderr4.log.match @@ -1,15 +1,12 @@ $(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for shutdown state +$(OPT)$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ $(nW) <1> $(nW) $(nW) pid $(N): program: $(nW) $(nW) <1> $(nW) $(nW) ut version 1.0 -$(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd $(nW) <3> $(nW) $(nW) $(nW) <1> $(nW) $(nW) Log level HARK $(nW) <1> $(nW) $(nW) Log level ERROR diff --git a/src/test/traces/redir_stderr5.log.match b/src/test/traces/redir_stderr5.log.match index f5fc05bbbb5..e04efd9f8c0 100644 --- a/src/test/traces/redir_stderr5.log.match +++ b/src/test/traces/redir_stderr5.log.match @@ -1,15 +1,12 @@ $(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for shutdown state +$(OPT)$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ $(nW) <1> $(nW) $(nW) pid $(N): program: $(nW) $(nW) <1> $(nW) $(nW) ut version 1.0 -$(nW) <1> $(nW) $(nW) src version: $(nW) -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck -$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd -$(nW) <1> $(nW) $(nW) compiled with support for shutdown state -$(nW) <1> $(nW) $(nW) compiled with libndctl 63+ +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind pmemcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind helgrind +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind memcheck +$(OPT)$(nW) <1> $(nW) $(nW) compiled with support for Valgrind drd $(nW) <3> $(nW) $(nW) $(nW) <1> $(nW) $(nW) Log level HARK $(nW) <1> $(nW) $(nW) Log level ERROR diff --git a/src/test/util_poolset/grep0.log.match b/src/test/util_poolset/grep0.log.match index bfdcdb162bb..441bee9364a 100644 --- a/src/test/util_poolset/grep0.log.match +++ b/src/test/util_poolset/grep0.log.match @@ -3,13 +3,10 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)/util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ open "$(nW)/testset0": No such file or directory cannot create pool set -- '$(nW)/testset0' $(OPT)Cannot read device usc - ndctl is not available diff --git a/src/test/util_poolset/grep1.log.match b/src/test/util_poolset/grep1.log.match index 739d49f8239..370ed3dee53 100644 --- a/src/test/util_poolset/grep1.log.match +++ b/src/test/util_poolset/grep1.log.match @@ -3,13 +3,10 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)/util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ open "$(nW)/testset0": No such file or directory cannot open pool set -- '$(nW)/testset0' invalid major version (0) diff --git a/src/test/util_poolset/grep10.log.match b/src/test/util_poolset/grep10.log.match index f7d99cc936f..091561cbf37 100644 --- a/src/test/util_poolset/grep10.log.match +++ b/src/test/util_poolset/grep10.log.match @@ -1,12 +1,12 @@ +src version: $(nW) +$(OPT)compiled with support for shutdown state +$(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)/util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ invalid checksum of pool header wrong pool type: "ERRORXX" pool version 99 (library expects 1) diff --git a/src/test/util_poolset/grep2.log.match b/src/test/util_poolset/grep2.log.match index 4d9565f6890..63958613a09 100644 --- a/src/test/util_poolset/grep2.log.match +++ b/src/test/util_poolset/grep2.log.match @@ -3,13 +3,10 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)/util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ invalid checksum of pool header header check failed - part #1 wrong pool type: "ERRORXX" diff --git a/src/test/util_poolset/grep3.log.match b/src/test/util_poolset/grep3.log.match index e65f9966f51..4849bc225db 100644 --- a/src/test/util_poolset/grep3.log.match +++ b/src/test/util_poolset/grep3.log.match @@ -3,10 +3,7 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ diff --git a/src/test/util_poolset/grep4.log.match b/src/test/util_poolset/grep4.log.match index e65f9966f51..4849bc225db 100644 --- a/src/test/util_poolset/grep4.log.match +++ b/src/test/util_poolset/grep4.log.match @@ -3,10 +3,7 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ diff --git a/src/test/util_poolset/grep5.log.match b/src/test/util_poolset/grep5.log.match index e65f9966f51..4849bc225db 100644 --- a/src/test/util_poolset/grep5.log.match +++ b/src/test/util_poolset/grep5.log.match @@ -3,10 +3,7 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ diff --git a/src/test/util_poolset/grep6.log.match b/src/test/util_poolset/grep6.log.match index cacd9c26dae..dd61ea30a0d 100644 --- a/src/test/util_poolset/grep6.log.match +++ b/src/test/util_poolset/grep6.log.match @@ -3,13 +3,10 @@ $(OPT)compiled with support for shutdown state $(OPT)compiled with libndctl 63+ pid $(N): program: $(nW)util_poolset$(nW) ut version 1.0 -src version: $(nW) $(OPT)compiled with support for Valgrind pmemcheck $(OPT)compiled with support for Valgrind helgrind $(OPT)compiled with support for Valgrind memcheck $(OPT)compiled with support for Valgrind drd -$(OPT)compiled with support for shutdown state -$(OPT)compiled with libndctl 63+ cannot mix directories and files in a set cannot create pool set -- '$(nW)/testset2' cannot mix directories and files in a set