Skip to content

Commit f07189f

Browse files
authored
Merge pull request #563 from ldorau/Print_UMF_source_version_in_util_log_init
Print UMF source version in util_log_init() if it is defined
2 parents 16d6673 + d1e2930 commit f07189f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ set(UMF_SOURCES_WINDOWS libumf_windows.c)
7676
# Compile definitions for UMF library.
7777
#
7878
# TODO: Cleanup the compile definitions across all the CMake files
79-
set(UMF_PRIVATE_COMPILE_DEFINITIONS "")
79+
set(UMF_PRIVATE_COMPILE_DEFINITIONS "-DUMF_SRC_VERSION=${UMF_SRC_VERSION}")
8080

8181
set(UMF_SOURCES_COMMON_LINUX_MACOSX
8282
provider/provider_os_memory.c

src/utils/utils_log.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,19 @@ void util_log_init(void) {
293293
loggerConfig.flushLevel = LOG_FATAL;
294294
}
295295

296+
#ifdef UMF_SRC_VERSION
297+
// convert a define to a C string
298+
#define STR_(X) #X
299+
#define STR(X) STR_(X)
300+
#define STR_UMF_SRC_VERSION "src version: " STR(UMF_SRC_VERSION) ", "
301+
#else /* !UMF_SRC_VERSION */
302+
#define STR_UMF_SRC_VERSION ""
303+
#endif /* !UMF_SRC_VERSION */
304+
296305
int umf_ver = umfGetCurrentVersion();
297306
LOG_INFO(
298-
"Logger enabled (umf_version: %i.%i, level: %s, flush: %s, pid: %s, "
299-
"timestamp: %s)",
307+
"Logger enabled (umf version: %i.%i, " STR_UMF_SRC_VERSION
308+
"level: %s, flush: %s, pid: %s, timestamp: %s)",
300309
UMF_MAJOR_VERSION(umf_ver), UMF_MINOR_VERSION(umf_ver),
301310
level_to_str(loggerConfig.level), level_to_str(loggerConfig.flushLevel),
302311
bool_to_str(loggerConfig.pid), bool_to_str(loggerConfig.timestamp));

0 commit comments

Comments
 (0)