X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85c342932c60954a7e1c9430742bfff2b28c31a8..b6f6ca1caa0a0d1855847d47fd80af536d277143:/src/xbt/log.c diff --git a/src/xbt/log.c b/src/xbt/log.c index 1a29248df9..b5fdebf24c 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -473,8 +473,8 @@ xbt_log_layout_t xbt_log_default_layout = NULL; /* set in log_init */ typedef struct { char *catname; - e_xbt_log_priority_t thresh; char *fmt; + e_xbt_log_priority_t thresh; int additivity; xbt_log_appender_t appender; } s_xbt_log_setting_t, *xbt_log_setting_t; @@ -507,7 +507,8 @@ const char *xbt_log_priority_names[8] = { s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = { NULL /*parent */ , NULL /* firstChild */ , NULL /* nextSibling */ , - "root", xbt_log_priority_uninitialized /* threshold */ , + "root", + 0 /*initialized */, xbt_log_priority_uninitialized /* threshold */ , 0 /* isThreshInherited */ , NULL /* appender */ , NULL /* layout */ , 0 /* additivity */ @@ -546,7 +547,7 @@ void xbt_log_init(int *argc, char **argv) // _XBT_LOGV(log).threshold = xbt_log_priority_debug; /* uncomment to set the LOG category to debug directly */ /* Set logs and init log submodule */ - for (i = 1; i < *argc; i++) { + for (j = i = 1; i < *argc; i++) { if (!strncmp(argv[i], "--log=", strlen("--log=")) || !strncmp(argv[i], "--gras-log=", strlen("--gras-log=")) || !strncmp(argv[i], "--surf-log=", strlen("--surf-log=")) || @@ -563,17 +564,14 @@ void xbt_log_init(int *argc, char **argv) opt++; xbt_log_control_set(opt); XBT_DEBUG("Did apply '%s' as log setting", opt); - /*remove this from argv */ - - for (j = i + 1; j < *argc; j++) { - argv[j - 1] = argv[j]; - } - - argv[j - 1] = NULL; - (*argc)--; - i--; /* compensate effect of next loop incrementation */ + } else { + argv[j++] = argv[i]; } } + if (j < *argc) { + argv[j] = NULL; + *argc = j; + } } static void log_cat_exit(xbt_log_category_t cat) @@ -728,7 +726,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, xbt_os_rmutex_acquire(log_cat_init_mutex); } - if (category->threshold != xbt_log_priority_uninitialized) { + if (category->initialized) { if (log_cat_init_mutex != NULL) { xbt_os_rmutex_release(log_cat_init_mutex); } @@ -746,7 +744,6 @@ int _xbt_log_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; category->layout = xbt_log_default_layout; } else { @@ -756,9 +753,8 @@ int _xbt_log_cat_init(xbt_log_category_t category, XBT_DEBUG("Set %s (%s) as father of %s ", category->parent->name, - (category->parent->threshold == xbt_log_priority_uninitialized ? - "uninited" : xbt_log_priority_names[category-> - parent->threshold]), + (category->parent->initialized ? + xbt_log_priority_names[category->parent->threshold] : "uninited"), category->name); xbt_log_parent_set(category, category->parent); @@ -787,36 +783,29 @@ int _xbt_log_cat_init(xbt_log_category_t category, } /* Apply the control */ - if (!xbt_log_settings) { - if (log_cat_init_mutex != NULL) { - xbt_os_rmutex_release(log_cat_init_mutex); + if (xbt_log_settings) { + xbt_assert(category, "NULL category"); + xbt_assert(category->name); + + xbt_dynar_foreach(xbt_log_settings, cursor, setting) { + xbt_assert(setting, "Damnit, NULL cat in the list"); + xbt_assert(setting->catname, "NULL setting(=%p)->catname", + (void *) setting); + + if (!strcmp(setting->catname, category->name)) { + found = 1; + _xbt_log_cat_apply_set(category, setting); + xbt_dynar_cursor_rm(xbt_log_settings, &cursor); + } } - return priority >= category->threshold; - } - xbt_assert(category, "NULL category"); - xbt_assert(category->name); - - xbt_dynar_foreach(xbt_log_settings, cursor, setting) { - xbt_assert(setting, "Damnit, NULL cat in the list"); - xbt_assert(setting->catname, "NULL setting(=%p)->catname", - (void *) setting); - - if (!strcmp(setting->catname, category->name)) { - - found = 1; - - _xbt_log_cat_apply_set(category, setting); - - xbt_dynar_cursor_rm(xbt_log_settings, &cursor); - } + if (!found) + XBT_DEBUG("Category '%s': inherited threshold = %s (=%d)", + category->name, xbt_log_priority_names[category->threshold], + category->threshold); } - if (!found) - XBT_DEBUG("Category '%s': inherited threshold = %s (=%d)", - category->name, xbt_log_priority_names[category->threshold], - category->threshold); - + category->initialized = 1; if (log_cat_init_mutex != NULL) { xbt_os_rmutex_release(log_cat_init_mutex); } @@ -830,13 +819,10 @@ 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); - /* - * if the threshold is initialized - * unlink from current parent - */ - if (cat->threshold != xbt_log_priority_uninitialized) { + /* if the category is initialized, unlink from current parent */ + if (cat->initialized) { - xbt_log_category_t *cpp = &parent->firstChild; + xbt_log_category_t *cpp = &cat->parent->firstChild; while (*cpp != cat && *cpp != NULL) { cpp = &(*cpp)->nextSibling; @@ -851,11 +837,8 @@ void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent) parent->firstChild = cat; - if (parent->threshold == xbt_log_priority_uninitialized) { - - _xbt_log_cat_init(parent, - xbt_log_priority_uninitialized /* ignored */ ); - } + if (!parent->initialized) + _xbt_log_cat_init(parent, xbt_log_priority_uninitialized /* ignored */ ); cat->threshold = parent->threshold; @@ -1060,7 +1043,7 @@ void xbt_log_control_set(const char *control_string) /* split the string, and remove empty entries */ set_strings = xbt_str_split_quoted(control_string); - if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */ + if (xbt_dynar_is_empty(set_strings)) { /* vicious user! */ xbt_dynar_free(&set_strings); return; }