X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b98e2e68753ffbe791c52a3f698fb1a3e726daec..8c6bbb14f44b8daed5ea43d80880c6bf2155118b:/src/xbt/log.cpp

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index 93ed95f57e..e9c6542863 100644
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -1,14 +1,14 @@
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/xbt/log_private.hpp"
+#include "src/xbt/xbt_modinter.h"
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
-#include "xbt/xbt_modinter.h"
 
 #include <algorithm>
 #include <array>
@@ -19,10 +19,6 @@
 #include <vector>
 
 int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
-static std::recursive_mutex* log_cat_init_mutex = nullptr;
-
-xbt_log_appender_t xbt_log_default_appender = nullptr; /* set in log_init */
-xbt_log_layout_t xbt_log_default_layout     = nullptr; /* set in log_init */
 
 struct xbt_log_setting_t {
   std::string catname;
@@ -58,17 +54,6 @@ s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt, "Loggings from the logging mechanism itself");
 
-/* create the default appender and install it in the root category,
-   which were already created (damnit. Too slow little beetle) */
-void xbt_log_preinit(void)
-{
-  xbt_log_default_appender             = xbt_log_appender_stream(stderr);
-  xbt_log_default_layout               = xbt_log_layout_simple_new(nullptr);
-  _XBT_LOGV(XBT_LOG_ROOT_CAT).appender = xbt_log_default_appender;
-  _XBT_LOGV(XBT_LOG_ROOT_CAT).layout = xbt_log_default_layout;
-  log_cat_init_mutex                   = new std::recursive_mutex();
-}
-
 static void xbt_log_help();
 static void xbt_log_help_categories();
 
@@ -132,7 +117,6 @@ static void log_cat_exit(const s_xbt_log_category_t* cat)
 void xbt_log_postexit(void)
 {
   XBT_VERB("Exiting log");
-  delete log_cat_init_mutex;
   log_cat_exit(&_XBT_LOGV(XBT_LOG_ROOT_CAT));
 }
 
@@ -151,9 +135,7 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
              "Priority %d is greater than the biggest allowed value", ev->priority);
 
   while (true) {
-    const s_xbt_log_appender_t* appender = cat->appender;
-
-    if (appender != nullptr) {
+    if (const s_xbt_log_appender_t* appender = cat->appender) {
       xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name);
 
       /* First, try with a static buffer */
@@ -205,7 +187,7 @@ static int fake_xbt_log_cat_init(xbt_log_category_t, e_xbt_log_priority_t)
   return 0;
 }
 #define DISABLE_XBT_LOG_CAT_INIT()                                                                                     \
-  int (*_xbt_log_cat_init)(xbt_log_category_t, e_xbt_log_priority_t) XBT_ATTRIB_UNUSED = fake_xbt_log_cat_init
+ XBT_ATTRIB_UNUSED int (*_xbt_log_cat_init)(xbt_log_category_t, e_xbt_log_priority_t) = fake_xbt_log_cat_init
 
 static void _xbt_log_cat_apply_set(xbt_log_category_t category, const xbt_log_setting_t& setting)
 {
@@ -248,8 +230,8 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   if (category->initialized)
     return priority >= category->threshold;
 
-  if (log_cat_init_mutex != nullptr)
-    log_cat_init_mutex->lock();
+  static std::recursive_mutex log_cat_init_mutex;
+  log_cat_init_mutex.lock();
 
   XBT_DEBUG("Initializing category '%s' (firstChild=%s, nextSibling=%s)", category->name,
          (category->firstChild ? category->firstChild->name : "none"),
@@ -257,8 +239,8 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
 
   if (category == &_XBT_LOGV(XBT_LOG_ROOT_CAT)) {
     category->threshold = xbt_log_priority_info;
-    category->appender = xbt_log_default_appender;
-    category->layout = xbt_log_default_layout;
+    category->appender  = xbt_log_appender_stream(stderr);
+    category->layout    = xbt_log_layout_simple_new(nullptr);
   } else {
     if (not category->parent)
       category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
@@ -282,9 +264,9 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   }
 
   /* Apply the control */
-  auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
-                           [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
-  if (iset != xbt_log_settings().end()) {
+  if (auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
+                               [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
+      iset != xbt_log_settings().end()) {
     _xbt_log_cat_apply_set(category, *iset);
     xbt_log_settings().erase(iset);
   } else {
@@ -293,8 +275,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   }
 
   category->initialized = 1;
-  if (log_cat_init_mutex != nullptr)
-    log_cat_init_mutex->unlock();
+  log_cat_init_mutex.unlock();
   return priority >= category->threshold;
 }
 
@@ -321,7 +302,7 @@ void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
   parent->firstChild = cat;
 
   if (not parent->initialized)
-    _xbt_log_cat_init(parent, xbt_log_priority_uninitialized /* ignored */ );
+    (void)_xbt_log_cat_init(parent, xbt_log_priority_uninitialized /* ignored */);
 
   cat->threshold = parent->threshold;
 
@@ -413,7 +394,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
       throw std::invalid_argument(simgrid::xbt::string_printf("Unknown appender log type: '%s'", value));
     }
   } else if (strncmp(option, "fmt", option_len) == 0) {
-    set.fmt = std::string(value);
+    set.fmt = value;
   } else {
     xbt_die("Unknown setting of the log category: '%.*s'", static_cast<int>(option_len), option);
   }
@@ -547,10 +528,8 @@ static void xbt_log_help()
       "         -> %%L: line number where the log event was raised (LOG4J compatible)\n"
       "         -> %%M: function name (LOG4J compatible -- called method name here of course).\n"
       "\n"
-      "         -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only under windows or when using the "
-      "GNU libc because\n"
-      "                 backtrace() is not defined elsewhere, and we only have a fallback for windows boxes, not "
-      "mac ones for example.\n"
+      "         -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only when using the GNU libc because\n"
+      "                 backtrace() is not defined elsewhere.\n"
       "         -> %%B: short backtrace (only the first line of the %%b). Called %%throwable{short} in LOG4J; "
       "defined where %%b is.\n"
       "\n"