refactoring: moving chunks of code around to try to understand that code again

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

diff --git a/src/xbt/log.c b/src/xbt/log.c
index c7418f9..bb60ee3 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -413,135 +413,104 @@ void xbt_log_exit(void) {
   VERB0("Exited log");
 }
 
   VERB0("Exited log");
 }
 

-static void _apply_control(xbt_log_category_t cat) {
+void _xbt_log_event_log( xbt_log_event_t ev, const char *fmt, ...) {
+  
+  xbt_log_category_t cat = ev->cat;
+  
+  va_start(ev->ap, fmt);
+  while(1) {
+    xbt_log_appender_t appender = cat->appender;
+    if (appender != NULL) {
+       
+      appender->do_append(appender, ev, fmt);
+    }
+    if (!cat->willLogToParent)
+      break;
+
+    cat = cat->parent;
+  } 
+  va_end(ev->ap);
+}
+
+/*
+ * This gets called the first time a category is referenced and performs the
+ * initialization. 
+ * Also resets threshold to inherited!
+ */
+int _xbt_log_cat_init(e_xbt_log_priority_t priority,xbt_log_category_t category) {

   int cursor;
   xbt_log_setting_t setting=NULL;
   int found = 0;
   s_xbt_log_event_t _log_ev;
   int cursor;
   xbt_log_setting_t setting=NULL;
   int found = 0;
   s_xbt_log_event_t _log_ev;

-  
- 
-  
+       
+  if(category == &_XBT_LOGV(XBT_LOG_ROOT_CAT)){
+    category->threshold = xbt_log_priority_info;/* xbt_log_priority_debug*/;
+    category->appender = xbt_log_default_appender;
+  } else {
+
+#if (defined(_WIN32) && !defined(DLL_STATIC))
+    if(!category->parent){
+      category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
+    }
+#endif
+    
+    xbt_log_parent_set(category, category->parent);
+  }
+
+  /* Apply the control */  

   if (!xbt_log_settings)
   if (!xbt_log_settings)

-    return;
+    return priority >= category->threshold;
+  
+  xbt_assert0(category,"NULL category");
+  xbt_assert(category->name);

   
   

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

   xbt_dynar_foreach(xbt_log_settings,cursor,setting) {
     xbt_assert0(setting,"Damnit, NULL cat in the list");
     xbt_assert1(setting->catname,"NULL setting(=%p)->catname",(void*)setting);
   xbt_dynar_foreach(xbt_log_settings,cursor,setting) {
     xbt_assert0(setting,"Damnit, NULL cat in the list");
     xbt_assert1(setting->catname,"NULL setting(=%p)->catname",(void*)setting);

-
-    if (!strcmp(setting->catname,cat->name)) {
-       

     
     

+    if (!strcmp(setting->catname,category->name)) {
+      

       found = 1;
       found = 1;

-
-      xbt_log_threshold_set(cat, setting->thresh);
+      
+      xbt_log_threshold_set(category, setting->thresh);

       xbt_dynar_cursor_rm(xbt_log_settings,&cursor);
 
 
       xbt_dynar_cursor_rm(xbt_log_settings,&cursor);
 
 

-      if (cat->threshold <= xbt_log_priority_debug) {
-        _log_ev.cat = cat;
+      if (category->threshold <= xbt_log_priority_debug) {
+        _log_ev.cat = category;

         _log_ev.priority = xbt_log_priority_debug;
         _log_ev.fileName = __FILE__ ;
         _log_ev.functionName = _XBT_FUNCTION ;
         _log_ev.lineNum = __LINE__ ;
         _log_ev.priority = xbt_log_priority_debug;
         _log_ev.fileName = __FILE__ ;
         _log_ev.functionName = _XBT_FUNCTION ;
         _log_ev.lineNum = __LINE__ ;

-
+       

        _xbt_log_event_log(&_log_ev,
        _xbt_log_event_log(&_log_ev,

-                "Apply settings for category '%s': set threshold to %s (=%d)",
-                cat->name,
-                xbt_log_priority_names[cat->threshold], cat->threshold);
+                          "Apply settings for category '%s': set threshold to %s (=%d)",
+                          category->name,
+                          xbt_log_priority_names[category->threshold], category->threshold);

       }
     }
       }
     }

-   

   }
   
   }
   

-  if (!found && cat->threshold <= xbt_log_priority_verbose) {
-       
-    _log_ev.cat = cat;
+  if (!found && category->threshold <= xbt_log_priority_verbose) {
+    
+    _log_ev.cat = category;

     _log_ev.priority = xbt_log_priority_verbose;
     _log_ev.fileName = __FILE__ ;
     _log_ev.functionName = _XBT_FUNCTION ;
     _log_ev.lineNum = __LINE__ ;
     _log_ev.priority = xbt_log_priority_verbose;
     _log_ev.fileName = __FILE__ ;
     _log_ev.functionName = _XBT_FUNCTION ;
     _log_ev.lineNum = __LINE__ ;

-
+    

     _xbt_log_event_log(&_log_ev,
     _xbt_log_event_log(&_log_ev,

-                       "Category '%s': inherited threshold = %s (=%d)",
-                       cat->name,
-                       xbt_log_priority_names[cat->threshold], cat->threshold);
+                      "Category '%s': inherited threshold = %s (=%d)",
+                      category->name,
+                      xbt_log_priority_names[category->threshold], category->threshold);

   }
   }

-  
- 
-
-}
-
-void _xbt_log_event_log( xbt_log_event_t ev, const char *fmt, ...) {
-  
-
-  xbt_log_category_t cat = ev->cat;
-  
-  
-
-
-  va_start(ev->ap, fmt);
-  while(1) {
-    xbt_log_appender_t appender = cat->appender;
-    if (appender != NULL) {
-       
-      appender->do_append(appender, ev, fmt);
-    }
-    if (!cat->willLogToParent)
-      break;
-
-    cat = cat->parent;
-  } 
-  va_end(ev->ap);
-}
-
-static void _cat_init(xbt_log_category_t category) 
-{
-       
-       
-       if(category == &_XBT_LOGV(XBT_LOG_ROOT_CAT)){
-       category->threshold = xbt_log_priority_info;/* xbt_log_priority_debug*/;
-       category->appender = xbt_log_default_appender;
-       } 
-       else 
-       {
-
-               #if (defined(_WIN32) && !defined(DLL_STATIC))
-               if(!category->parent){
-                       category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
-               }
-               #endif
-       
-       xbt_log_parent_set(category, category->parent);
-       }
-  
-  _apply_control(category);
-  
- 
-}
-
-/*
- * This gets called the first time a category is referenced and performs the
- * initialization. 
- * Also resets threshold to inherited!
- */
-int _xbt_log_cat_init(e_xbt_log_priority_t priority,xbt_log_category_t category) 
-{

     
     

-       _cat_init(category);
-       
-       
-       
-               
-       return priority >= category->threshold;
+  return priority >= category->threshold;

 }
 
 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_assert0(cat,"NULL category to be given a parent");
        xbt_assert1(parent,"The parent category of %s is NULL",cat->name);
        
        xbt_assert0(cat,"NULL category to be given a parent");
        xbt_assert1(parent,"The parent category of %s is NULL",cat->name);
        


@@ -568,16 +537,15 @@ void xbt_log_parent_set(xbt_log_category_t cat,xbt_log_category_t parent)
        
        if (parent->threshold == xbt_log_priority_uninitialized){
                
        
        if (parent->threshold == xbt_log_priority_uninitialized){
                

-               _cat_init(parent);
+         _xbt_log_cat_init(xbt_log_priority_uninitialized/* ignored*/,
+                           parent);

        }
        
        cat->threshold = parent->threshold;
        
        cat->isThreshInherited = 1;
        
        }
        
        cat->threshold = parent->threshold;
        
        cat->isThreshInherited = 1;
        

-       
-       
-} /* log_setParent */
+}

 
 static void _set_inherited_thresholds(xbt_log_category_t cat) {
        
 
 static void _set_inherited_thresholds(xbt_log_category_t cat) {