X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ca53b5ebe9b96f24832b6890a34e13599b254c2..e71a2a302d28430dc1bfee906f842f5f3d0fa3ce:/include/xbt/log.h diff --git a/include/xbt/log.h b/include/xbt/log.h index 1e6292b25c..32215d227e 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -81,9 +81,6 @@ typedef enum { * start of main(). */ -/* Asserts that the provided name was not already used for another category */ -void _xbt_log_is_name_unique(const char* name, const char* file, int line); - /* XBT_LOG_NEW_SUBCATEGORY_helper: * Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition to avoid an extra * declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by XBT_LOG_NEW_CATEGORY */ @@ -94,7 +91,6 @@ void _xbt_log_is_name_unique(const char* name, const char* file, int line); void _XBT_LOGV_CTOR(catName)(void) \ { \ XBT_LOG_EXTERNAL_CATEGORY(catName); \ - _xbt_log_is_name_unique(_XBT_STRINGIFY(catName), __FILE__, __LINE__); \ if (!_XBT_LOGV(catName).initialized) { \ _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized); \ } \ @@ -203,6 +199,22 @@ void _xbt_log_is_name_unique(const char* name, const char* file, int line); /* Functions you may call */ +/** Provide a log setting as if it were passed on the command line. + * + * Expected syntax: + * ( [category] "." [keyword] ":" value (" ")... )... + * + * where [category] is one the category names (see @ref XBT_log_cats for a complete list of the ones defined in the + * SimGrid library) and keyword is one of the following: + * + * - threshold: category's threshold priority. Possible values: + * TRACE,DEBUG,VERBOSE,INFO,WARNING,ERROR,CRITICAL + * - add or additivity: whether the logging actions must be passed to the parent category. + * Possible values: 0, 1, no, yes, on, off. + * Default value: yes. + * - fmt: the format to use. See @ref log_use_conf_fmt for more information. + * - app or appender: the appender to use. See @ref log_use_conf_app for more information. + */ XBT_PUBLIC void xbt_log_control_set(const char* cs); /* Forward declarations */ @@ -291,6 +303,8 @@ XBT_PUBLIC xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int ro /* ********************************** */ /* Functions that you shouldn't call */ /* ********************************** */ + +/** Retrieve and parse all log settings from the command line (don't call it directly) */ XBT_PUBLIC void xbt_log_init(int* argc, char** argv); XBT_PUBLIC void _xbt_log_event_log(xbt_log_event_t ev, const char* fmt, ...) XBT_ATTRIB_PRINTF(2, 3); XBT_PUBLIC int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority);