initialize logger once (except tests)

Author: bratpiorka

src/coarse/coarse.c

@@ -876,9 +876,7 @@ static umf_result_t coarse_get_stats_no_lock(coarse_t *coarse,
 // PUBLIC API
 
 umf_result_t coarse_new(coarse_params_t *coarse_params, coarse_t **pcoarse) {
-#ifdef _WIN32
-    utils_init_once(&Log_initialized, utils_log_init);
-#endif /* _WIN32 */
+    utils_log_init();
 
     if (coarse_params == NULL || pcoarse == NULL) {
         LOG_ERR("coarse parameters or handle is missing");

src/utils/utils_log.c

@@ -32,6 +32,10 @@
 #include "utils_common.h"
 #include "utils_log.h"
 
+#ifndef DISABLE_SINGLE_LOGGER
+#include "utils_concurrency.h"
+#endif
+
 #define UMF_MAGIC_STR "\x00@(#) "
 #define UMF_PREF_STR "Intel(R) "
 #define UMF_PREFIX UMF_MAGIC_STR UMF_PREF_STR
@@ -60,6 +64,10 @@ char const __umf_str_1__all_cmake_vars[] =
 #define MAX_FILE_PATH 256
 #define MAX_ENV_LEN 2048
 
+#ifndef DISABLE_SINGLE_LOGGER
+static UTIL_ONCE_FLAG initOnce = UTIL_ONCE_FLAG_INIT;
+#endif
+
 typedef struct {
     bool enableTimestamp;
     bool enablePid;
@@ -247,7 +255,7 @@ void utils_plog(utils_log_level_t level, const char *func, const char *format,
 
 static const char *bool_to_str(int b) { return b ? "yes" : "no"; }
 
-void utils_log_init(void) {
+static void utils_log_init_once(void) {
     const char *envVar = getenv("UMF_LOG");
 
     if (!envVar) {
@@ -343,6 +351,12 @@ void utils_log_init(void) {
 }
 
 // this is needed for logger unit test
+#ifndef DISABLE_SINGLE_LOGGER
+void utils_log_init(void) { utils_init_once(&initOnce, utils_log_init_once); }
+#else
+void utils_log_init(void) { utils_log_init_once(); }
+#endif
+
 #ifndef DISABLE_CTL_LOGGER
 static umf_result_t
 CTL_READ_HANDLER(timestamp)(void *ctx, umf_ctl_query_source_t source, void *arg,

test/utils/utils_log.cpp

@@ -97,6 +97,7 @@ int mock_strerror_windows(char *buff, size_t s, int errnum) {
 
 extern "C" {
 #define DISABLE_CTL_LOGGER 1
+#define DISABLE_SINGLE_LOGGER 1
 const char *env_variable = "";
 #define fopen(A, B) mock_fopen(A, B)
 #define fputs(A, B) mock_fputs(A, B)
@@ -161,8 +162,8 @@ TEST_F(test, parseEnv_errors) {
     helper_checkConfig(&b, &loggerConfig);
     helper_log_init("_level:debug");
     helper_checkConfig(&b, &loggerConfig);
-    expected_message =
-        "[ERROR UMF] utils_log_init: Cannot open output file - path too long\n";
+    expected_message = "[ERROR UMF] utils_log_init_once: Cannot open output "
+                       "file - path too long\n";
     std::string test_env = "output:file," + std::string(300, 'x');
     helper_log_init(test_env.c_str());
 }
@@ -247,7 +248,8 @@ TEST_F(test, parseEnv) {
                             expect_fput_count = 1;
                             if (expected_filename.size() > MAX_FILE_PATH) {
                                 expected_message =
-                                    "[ERROR UMF] utils_log_init: Cannot open "
+                                    "[ERROR UMF] utils_log_init_once: Cannot "
+                                    "open "
                                     "output file - path too long\n";
                             }
                         }