/* log - a generic logging facility in the spirit of log4j */
-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */
/* 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 <algorithm>
#include <mutex>
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;
int j = 1;
int parse_args = 1; // Stop parsing the parameters once we found '--'
- xbt_log_control_set("xbt_help.threshold:VERBOSE xbt_help.fmt:%m%n");
+ 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++) {
}
}
-static void log_cat_exit(xbt_log_category_t cat)
+static void log_cat_exit(const s_xbt_log_category_t* cat)
{
- xbt_log_category_t child;
-
if (cat->appender) {
if (cat->appender->free_)
cat->appender->free_(cat->appender);
xbt_free(cat->layout);
}
- for (child = cat->firstChild; child != nullptr; child = child->nextSibling)
+ for (auto const* child = cat->firstChild; child != nullptr; child = child->nextSibling)
log_cat_exit(child);
}
void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
{
- xbt_log_category_t cat = ev->cat;
+ const xbt_log_category_s* cat = ev->cat;
xbt_assert(ev->priority >= 0, "Negative logging priority naturally forbidden");
xbt_assert(static_cast<size_t>(ev->priority) < sizeof(xbt_log_priority_names)/sizeof(xbt_log_priority_names[0]),
"Priority %d is greater than the biggest allowed value", ev->priority);
while (1) {
- xbt_log_appender_t appender = cat->appender;
+ const s_xbt_log_appender_t* appender = cat->appender;
if (appender != nullptr) {
xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name);
if (done) {
appender->do_append(appender, buff);
} else {
-
/* The static buffer was too small, use a dynamically expanded one */
ev->buffer_size = XBT_LOG_DYNAMIC_BUFFER_SIZE;
ev->buffer = static_cast<char*>(xbt_malloc(ev->buffer_size));
if (XBT_LOG_ISENABLED(log, xbt_log_priority_debug)) {
std::string res;
- xbt_log_category_t cpp = category->parent->firstChild;
+ const xbt_log_category_s* cpp = category->parent->firstChild;
while (cpp) {
res += std::string(" ") + cpp->name;
cpp = cpp->nextSibling;
cat->isThreshInherited = 1;
}
-static void _set_inherited_thresholds(xbt_log_category_t cat)
+static void _set_inherited_thresholds(const s_xbt_log_category_t* cat)
{
xbt_log_category_t child = cat->firstChild;
}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);
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);
" -> %%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");
cats.push_back(cat);
std::sort(begin(cats), end(cats),
- [](xbt_log_category_t a, xbt_log_category_t b) { return strcmp(a->name, b->name) < 0; });
+ [](const s_xbt_log_category_t* a, const s_xbt_log_category_t* b) { return strcmp(a->name, b->name) < 0; });
for (auto const& cat : cats) {
XBT_HELP("%s%s: %s", this_prefix.c_str(), cat->name, cat->description);