Skip to content

Commit

Permalink
common: remove redundant log messages
Browse files Browse the repository at this point in the history
Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
  • Loading branch information
grom72 committed Feb 23, 2024
1 parent 1916db2 commit a609ece
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 87 deletions.
13 changes: 0 additions & 13 deletions src/core/out.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/arch_flags/log0.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ $(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with support for Valgrind pmemcheck
$(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with support for Valgrind helgrind
$(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with support for Valgrind memcheck
$(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with support for Valgrind drd
$(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with support for shutdown state
$(OPT)<arch_flags>: <1> [$(*)]$(W)compiled with libndctl 63+
<arch_flags>: <3> [$(nW) util_mmap_init]
<arch_flags>: <1> [$(nW) util_check_arch_flags]$(W)invalid machine value
<arch_flags>: <1> [$(nW) util_check_arch_flags]$(W)invalid machine_class value
Expand Down
3 changes: 0 additions & 3 deletions src/test/out_err/traces0.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ $(OPT)<trace>: <1> [$(*)]$(W)compiled with support for shutdown state
$(OPT)<trace>: <1> [$(*)]$(W)compiled with libndctl 63+
<trace>: <1> [out.c:$(N) out_init]$(W)pid $(N): program: $(nW)
<trace>: <1> [out.c:$(N) out_init]$(W)trace version 1.0
<trace>: <1> [out.c:$(N) out_init]$(W)src version: $(nW)
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind pmemcheck
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind helgrind
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind memcheck
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with support for Valgrind drd
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with support for shutdown state
$(OPT)<trace>: <1> [out.c:$(N) out_init]$(W)compiled with libndctl 63+
<trace>: <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #1
$(OPT)<trace>: <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #2: Success
$(OPX)<trace>: <1> [out_err$(nW).c:$(N) $(nW)main]$(W)ERR #2: No error: 0
Expand Down
15 changes: 6 additions & 9 deletions src/test/traces/custom_file0.log.match
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 6 additions & 9 deletions src/test/traces/redir_stderr2.log.match
Original file line number Diff line number Diff line change
@@ -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
15 changes: 6 additions & 9 deletions src/test/traces/redir_stderr3.log.match
Original file line number Diff line number Diff line change
@@ -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
15 changes: 6 additions & 9 deletions src/test/traces/redir_stderr4.log.match
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 6 additions & 9 deletions src/test/traces/redir_stderr5.log.match
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep0.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep1.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/test/util_poolset/grep10.log.match
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep2.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep3.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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+
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep4.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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+
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep5.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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+
3 changes: 0 additions & 3 deletions src/test/util_poolset/grep6.log.match
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a609ece

Please sign in to comment.