Fix the race condition in _xbt_log_cat_init().

[simgrid.git] / src / xbt / log.c

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 7800822..7ec8465 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -22,9 +22,11 @@
 #include "xbt/sysdep.h"
 #include "xbt/log_private.h"
 #include "xbt/dynar.h"
 #include "xbt/sysdep.h"
 #include "xbt/log_private.h"
 #include "xbt/dynar.h"

+#include "xbt/xbt_os_thread.h"

 
 XBT_PUBLIC_DATA(int) (*xbt_pid) ();
 int xbt_log_no_loc = 0;         /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
 
 XBT_PUBLIC_DATA(int) (*xbt_pid) ();
 int xbt_log_no_loc = 0;         /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */

+static xbt_os_rmutex_t log_cat_init_mutex = NULL;

 
 /** \addtogroup XBT_log
  *
 
 /** \addtogroup XBT_log
  *


@@ -464,11 +466,7 @@ The default appender function currently prints to stderr, and the only other
 existing one writes to the specified file. More would be needed, like the one
 able to send the logs to a remote dedicated server.
 This is on our TODO list for quite a while now, but your help would be
 existing one writes to the specified file. More would be needed, like the one
 able to send the logs to a remote dedicated server.
 This is on our TODO list for quite a while now, but your help would be

-welcome here, too.
-
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              *//*' */
-
+welcome here, too. */

 
 xbt_log_appender_t xbt_log_default_appender = NULL;     /* set in log_init */
 xbt_log_layout_t xbt_log_default_layout = NULL; /* set in log_init */
 
 xbt_log_appender_t xbt_log_default_appender = NULL;     /* set in log_init */
 xbt_log_layout_t xbt_log_default_layout = NULL; /* set in log_init */


@@ -534,6 +532,7 @@ void xbt_log_preinit(void)
   xbt_log_default_layout = xbt_log_layout_simple_new(NULL);
   _XBT_LOGV(XBT_LOG_ROOT_CAT).appender = xbt_log_default_appender;
   _XBT_LOGV(XBT_LOG_ROOT_CAT).layout = xbt_log_default_layout;
   xbt_log_default_layout = xbt_log_layout_simple_new(NULL);
   _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 = xbt_os_rmutex_init();

 }
 
 /** @brief Get all logging settings from the command line
 }
 
 /** @brief Get all logging settings from the command line


@@ -600,6 +599,7 @@ static void log_cat_exit(xbt_log_category_t cat)
 void xbt_log_postexit(void)
 {
   XBT_VERB("Exiting log");
 void xbt_log_postexit(void)
 {
   XBT_VERB("Exiting log");

+  xbt_os_rmutex_destroy(log_cat_init_mutex);

   xbt_dynar_free(&xbt_log_settings);
   log_cat_exit(&_XBT_LOGV(XBT_LOG_ROOT_CAT));
 }
   xbt_dynar_free(&xbt_log_settings);
   log_cat_exit(&_XBT_LOGV(XBT_LOG_ROOT_CAT));
 }


@@ -691,6 +691,12 @@ int _xbt_log_cat_init(xbt_log_category_t category,
 {
 #define _xbt_log_cat_init(a, b) (0)
 
 {
 #define _xbt_log_cat_init(a, b) (0)
 

+  xbt_os_rmutex_acquire(log_cat_init_mutex);
+  if (category->threshold != xbt_log_priority_uninitialized) {
+    xbt_os_rmutex_release(log_cat_init_mutex);
+    return priority >= category->threshold;
+  }
+

   unsigned int cursor;
   xbt_log_setting_t setting = NULL;
   int found = 0;
   unsigned int cursor;
   xbt_log_setting_t setting = NULL;
   int found = 0;


@@ -743,8 +749,10 @@ int _xbt_log_cat_init(xbt_log_category_t category,
   }
 
   /* Apply the control */
   }
 
   /* Apply the control */

-  if (!xbt_log_settings)
+  if (!xbt_log_settings) {
+    xbt_os_rmutex_release(log_cat_init_mutex);

     return priority >= category->threshold;
     return priority >= category->threshold;

+  }

 
   xbt_assert(category, "NULL category");
   xbt_assert(category->name);
 
   xbt_assert(category, "NULL category");
   xbt_assert(category->name);


@@ -769,6 +777,7 @@ int _xbt_log_cat_init(xbt_log_category_t category,
            category->name, xbt_log_priority_names[category->threshold],
            category->threshold);
 
            category->name, xbt_log_priority_names[category->threshold],
            category->threshold);
 

+  xbt_os_rmutex_release(log_cat_init_mutex);

   return priority >= category->threshold;
 
 #undef _xbt_log_cat_init
   return priority >= category->threshold;
 
 #undef _xbt_log_cat_init


@@ -776,7 +785,6 @@ int _xbt_log_cat_init(xbt_log_category_t category,
 
 void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
 {
 
 void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
 {

-

   xbt_assert(cat, "NULL category to be given a parent");
   xbt_assert(parent, "The parent category of %s is NULL", cat->name);
 
   xbt_assert(cat, "NULL category to be given a parent");
   xbt_assert(parent, "The parent category of %s is NULL", cat->name);
 


@@ -810,7 +818,6 @@ void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
   cat->threshold = parent->threshold;
 
   cat->isThreshInherited = 1;
   cat->threshold = parent->threshold;
 
   cat->isThreshInherited = 1;

-

 }
 
 static void _set_inherited_thresholds(xbt_log_category_t cat)
 }
 
 static void _set_inherited_thresholds(xbt_log_category_t cat)