X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..7eb5c714b49414aed4cefb03119c25af814af55c:/src/xbt/log.c diff --git a/src/xbt/log.c b/src/xbt/log.c index 8ce7c5dbdd..78008223e2 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -298,7 +298,15 @@ displayed by setting a threshold to each category through the For example, \verbatim --log=root.thres:debug\endverbatim will make SimGrid extremely verbose while \verbatim --log=root.thres:critical\endverbatim should shut it almost -completely off. +completely off. The full list of recognized thresholds is the following: + + - trace: enter and return of some functions + - debug: crufty output + - verbose: verbose output for the user wanting more + - info: output about the regular functionning + - warning: minor issue encountered + - error: issue encountered + - critical: major issue encountered \subsection log_use_conf_multi 3.1.2 Passing several settings @@ -606,7 +614,7 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...) while (1) { xbt_log_appender_t appender = cat->appender; if (appender != NULL) { - xbt_assert1(cat->layout, + xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name); cat->layout->do_layout(cat->layout, ev, fmt, appender); @@ -738,12 +746,12 @@ int _xbt_log_cat_init(xbt_log_category_t category, if (!xbt_log_settings) return priority >= category->threshold; - xbt_assert0(category, "NULL category"); + xbt_assert(category, "NULL category"); xbt_assert(category->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", + 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)) { @@ -769,8 +777,8 @@ 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) { - xbt_assert0(cat, "NULL category to be given a parent"); - xbt_assert1(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); /* * if the threshold is initialized @@ -858,7 +866,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) eq = control_string; control_string += strcspn(control_string, " "); - xbt_assert1(*dot == '.' && (*eq == '=' || *eq == ':'), + xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'), "Invalid control string '%s'", control_string); if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) { @@ -1043,6 +1051,7 @@ void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app) void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay) { +#define _xbt_log_cat_init(a, b) (0) if (!cat->appender) { XBT_VERB ("No appender to category %s. Setting the file appender as default", @@ -1057,6 +1066,7 @@ void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay) } cat->layout = lay; xbt_log_additivity_set(cat, 0); +#undef _xbt_log_cat_init } void xbt_log_additivity_set(xbt_log_category_t cat, int additivity)