X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d189a8a5cb4abead1d33600e16bd9e1067bcf84..84637d5a56f373e75eb6619d1afb54b7da3f5e36:/src/xbt/log.cpp diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp index 71ffabbe9c..a72858e6ac 100644 --- a/src/xbt/log.cpp +++ b/src/xbt/log.cpp @@ -5,11 +5,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/xbt_modinter.h" #include "src/xbt/log_private.hpp" +#include "src/xbt_modinter.h" #include "xbt/asserts.h" #include "xbt/dynar.h" #include "xbt/str.h" +#include "xbt/string.hpp" #include #include @@ -68,7 +69,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log, xbt, "Loggings from the logging mechanism i which were already created (damnit. Too slow little beetle) */ void xbt_log_preinit(void) { - xbt_log_default_appender = xbt_log_appender_file_new(nullptr); + xbt_log_default_appender = xbt_log_appender_stream(stderr); xbt_log_default_layout = xbt_log_layout_simple_new(nullptr); _XBT_LOGV(XBT_LOG_ROOT_CAT).appender = xbt_log_default_appender; _XBT_LOGV(XBT_LOG_ROOT_CAT).layout = xbt_log_default_layout; @@ -88,6 +89,8 @@ void xbt_log_init(int *argc, char **argv) int j = 1; int parse_args = 1; // Stop parsing the parameters once we found '--' + xbt_log_control_set("xbt_help.app:stdout xbt_help.threshold:VERBOSE xbt_help.fmt:%m%n"); + /* Set logs and init log submodule */ for (int i = 1; i < *argc; i++) { if (strcmp("--", argv[i]) == 0) { @@ -403,15 +406,11 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) }else if (i < xbt_log_priority_infinite) { set.thresh = (e_xbt_log_priority_t)i; } else { - THROWF(arg_error, 0, - "Unknown priority name: %s (must be one of: trace,debug,verbose,info,warning,error,critical)", value); + throw std::invalid_argument(simgrid::xbt::string_printf( + "Unknown priority name: %s (must be one of: trace,debug,verbose,info,warning,error,critical)", value)); } } else if (strncmp(option, "additivity", option_len) == 0) { - if (strcasecmp(value, "ON") == 0 || strcasecmp(value, "YES") == 0 || strcmp(value, "1") == 0) { - set.additivity = 1; - } else { - set.additivity = 0; - } + set.additivity = (strcasecmp(value, "ON") == 0 || strcasecmp(value, "YES") == 0 || strcmp(value, "1") == 0); } else if (strncmp(option, "appender", option_len) == 0) { if (strncmp(value, "file:", 5) == 0) { set.appender = xbt_log_appender_file_new(value + 5); @@ -419,8 +418,12 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) set.appender = xbt_log_appender2_file_new(value + 9, 1); } else if (strncmp(value, "splitfile:", 10) == 0) { set.appender = xbt_log_appender2_file_new(value + 10, 0); + } else if (strcmp(value, "stderr") == 0) { + set.appender = xbt_log_appender_stream(stderr); + } else if (strcmp(value, "stdout") == 0) { + set.appender = xbt_log_appender_stream(stdout); } else { - THROWF(arg_error, 0, "Unknown appender log type: '%s'", value); + throw std::invalid_argument(simgrid::xbt::string_printf("Unknown appender log type: '%s'", value)); } } else if (strncmp(option, "fmt", option_len) == 0) { set.fmt = std::string(value); @@ -549,56 +552,67 @@ void xbt_log_additivity_set(xbt_log_category_t cat, int additivity) static void xbt_log_help(void) { - printf("Description of the logging output:\n" - "\n" - " Threshold configuration: --log=CATEGORY_NAME.thres:PRIORITY_LEVEL\n" - " CATEGORY_NAME: defined in code with function 'XBT_LOG_NEW_CATEGORY'\n" - " PRIORITY_LEVEL: the level to print (trace,debug,verbose,info,warning,error,critical)\n" - " -> trace: enter and return of some functions\n" - " -> debug: crufty output\n" - " -> verbose: verbose output for the user wanting more\n" - " -> info: output about the regular functioning\n" - " -> warning: minor issue encountered\n" - " -> error: issue encountered\n" - " -> critical: major issue encountered\n" - " The default priority level is 'info'.\n" - "\n" - " Format configuration: --log=CATEGORY_NAME.fmt:FORMAT\n" - " FORMAT string may contain:\n" - " -> %%%%: the %% char\n" - " -> %%n: platform-dependent line separator (LOG4J compatible)\n" - " -> %%e: plain old space (SimGrid extension)\n" - "\n" - " -> %%m: user-provided message\n" - "\n" - " -> %%c: Category name (LOG4J compatible)\n" - " -> %%p: Priority name (LOG4J compatible)\n" - "\n" - " -> %%h: Hostname (SimGrid extension)\n" - " -> %%P: Process name (SimGrid extension)\n" - " -> %%t: Thread \"name\" (LOG4J compatible -- actually the address of the thread in memory)\n" - " -> %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)\n" - "\n" - " -> %%F: file name where the log event was raised (LOG4J compatible)\n" - " -> %%l: location where the log event was raised (LOG4J compatible, like '%%F:%%L' -- this is a l as " - "in 'l'etter)\n" - " -> %%L: line number where the log event was raised (LOG4J compatible)\n" - " -> %%M: function name (LOG4J compatible -- called method name here of course).\n" - "\n" - " -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only under windows or when using the " - "GNU libc because\n" - " backtrace() is not defined elsewhere, and we only have a fallback for windows boxes, not " - "mac ones for example.\n" - " -> %%B: short backtrace (only the first line of the %%b). Called %%throwable{short} in LOG4J; " - "defined where %%b is.\n" - "\n" - " -> %%d: date (UNIX-like epoch)\n" - " -> %%r: application age (time elapsed since the beginning of the application)\n" - "\n" - " Miscellaneous:\n" - " --help-log-categories Display the current hierarchy of log categories.\n" - " --log=no_loc Don't print file names in messages (for tesh tests).\n" - "\n"); + XBT_HELP( + "Description of the logging output:\n" + "\n" + " Threshold configuration: --log=CATEGORY_NAME.thres:PRIORITY_LEVEL\n" + " CATEGORY_NAME: defined in code with function 'XBT_LOG_NEW_CATEGORY'\n" + " PRIORITY_LEVEL: the level to print (trace,debug,verbose,info,warning,error,critical)\n" + " -> trace: enter and return of some functions\n" + " -> debug: crufty output\n" + " -> verbose: verbose output for the user wanting more\n" + " -> info: output about the regular functioning\n" + " -> warning: minor issue encountered\n" + " -> error: issue encountered\n" + " -> critical: major issue encountered\n" + " The default priority level is 'info'.\n" + "\n" + " Format configuration: --log=CATEGORY_NAME.fmt:FORMAT\n" + " FORMAT string may contain:\n" + " -> %%%%: the %% char\n" + " -> %%n: platform-dependent line separator (LOG4J compatible)\n" + " -> %%e: plain old space (SimGrid extension)\n" + "\n" + " -> %%m: user-provided message\n" + "\n" + " -> %%c: Category name (LOG4J compatible)\n" + " -> %%p: Priority name (LOG4J compatible)\n" + "\n" + " -> %%h: Hostname (SimGrid extension)\n" + " -> %%P: Process name (SimGrid extension)\n" + " -> %%t: Thread \"name\" (LOG4J compatible -- actually the address of the thread in memory)\n" + " -> %%i: Process PID (SimGrid extension -- this is a 'i' as in 'i'dea)\n" + "\n" + " -> %%F: file name where the log event was raised (LOG4J compatible)\n" + " -> %%l: location where the log event was raised (LOG4J compatible, like '%%F:%%L' -- this is a l as " + "in 'l'etter)\n" + " -> %%L: line number where the log event was raised (LOG4J compatible)\n" + " -> %%M: function name (LOG4J compatible -- called method name here of course).\n" + "\n" + " -> %%b: full backtrace (Called %%throwable in LOG4J). Defined only under windows or when using the " + "GNU libc because\n" + " backtrace() is not defined elsewhere, and we only have a fallback for windows boxes, not " + "mac ones for example.\n" + " -> %%B: short backtrace (only the first line of the %%b). Called %%throwable{short} in LOG4J; " + "defined where %%b is.\n" + "\n" + " -> %%d: date (UNIX-like epoch)\n" + " -> %%r: application age (time elapsed since the beginning of the application)\n" + "\n" + " Category appender: --log=CATEGORY_NAME.app:APPENDER\n" + " APPENDER may be:\n" + " -> stdout or stderr: standard output streams\n" + " -> file:NAME: append to file with given name\n" + " -> splitfile:SIZE:NAME: append to files with maximum size SIZE per file.\n" + " NAME may contain the %% wildcard as a placeholder for the file number.\n" + " -> rollfile:SIZE:NAME: append to file with maximum size SIZE.\n" + "\n" + " Category additivity: --log=CATEGORY_NAME.add:VALUE\n" + " VALUE: '0', '1', 'no', 'yes', 'on', or 'off'\n" + "\n" + " Miscellaneous:\n" + " --help-log-categories Display the current hierarchy of log categories.\n" + " --log=no_loc Don't print file names in messages (for tesh tests).\n"); } static void xbt_log_help_categories_rec(xbt_log_category_t category, const std::string& prefix) @@ -621,7 +635,7 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category, const std:: [](xbt_log_category_t a, xbt_log_category_t b) { return strcmp(a->name, b->name) < 0; }); for (auto const& cat : cats) { - printf("%s%s: %s\n", this_prefix.c_str(), cat->name, cat->description); + XBT_HELP("%s%s: %s", this_prefix.c_str(), cat->name, cat->description); if (cat == cats.back() && category->parent) child_prefix[child_prefix.rfind('|')] = ' '; xbt_log_help_categories_rec(cat->firstChild, child_prefix); @@ -630,7 +644,7 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category, const std:: static void xbt_log_help_categories(void) { - printf("Current log category hierarchy:\n"); + XBT_HELP("Current log category hierarchy:"); xbt_log_help_categories_rec(&_XBT_LOGV(XBT_LOG_ROOT_CAT), " "); - printf("\n"); + XBT_HELP("%s", ""); }