/* log - a generic logging facility in the spirit of log4j */
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2023. 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/log_private.hpp"
-#include "xbt/asserts.h"
#include "xbt/string.hpp"
+#include "xbt/sysdep.h"
#include "xbt/xbt_modinter.h"
#include <algorithm>
#include <array>
#include <boost/tokenizer.hpp>
+#include <cstring>
#include <mutex>
#include <string>
#include <vector>
"Priority %d is greater than the biggest allowed value", ev->priority);
while (true) {
- const s_xbt_log_appender_t* appender = cat->appender;
-
- if (appender != nullptr) {
+ if (const s_xbt_log_appender_t* appender = cat->appender) {
xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name);
/* First, try with a static buffer */
}
}
- if (!cat->additivity)
+ if (not cat->additivity)
break;
cat = cat->parent;
}
return 0;
}
#define DISABLE_XBT_LOG_CAT_INIT() \
- int (*_xbt_log_cat_init)(xbt_log_category_t, e_xbt_log_priority_t) XBT_ATTRIB_UNUSED = fake_xbt_log_cat_init
+ XBT_ATTRIB_UNUSED int (*_xbt_log_cat_init)(xbt_log_category_t, e_xbt_log_priority_t) = fake_xbt_log_cat_init
static void _xbt_log_cat_apply_set(xbt_log_category_t category, const xbt_log_setting_t& setting)
{
}
if (setting.appender) {
xbt_log_appender_set(category, setting.appender);
- if (!category->layout)
+ if (not category->layout)
xbt_log_layout_set(category, xbt_log_layout_simple_new(nullptr));
category->additivity = 0;
XBT_DEBUG("Set %p as appender of category '%s'", setting.appender, category->name);
category->appender = xbt_log_default_appender;
category->layout = xbt_log_default_layout;
} else {
- if (!category->parent)
+ if (not category->parent)
category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
XBT_DEBUG("Set %s (%s) as father of %s ", category->parent->name,
}
/* Apply the control */
- auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
- [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
- if (iset != xbt_log_settings().end()) {
+ if (auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
+ [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
+ iset != xbt_log_settings().end()) {
_xbt_log_cat_apply_set(category, *iset);
xbt_log_settings().erase(iset);
} else {
parent->firstChild = cat;
- if (!parent->initialized)
- _xbt_log_cat_init(parent, xbt_log_priority_uninitialized /* ignored */ );
+ if (not parent->initialized)
+ (void)_xbt_log_cat_init(parent, xbt_log_priority_uninitialized /* ignored */);
cat->threshold = parent->threshold;
const char *orig_control_string = control_string;
xbt_log_setting_t set;
- if (!*control_string)
+ if (not*control_string)
return set;
XBT_DEBUG("Parse log setting '%s'", control_string);
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);
+ set.fmt = value;
} else {
xbt_die("Unknown setting of the log category: '%.*s'", static_cast<int>(option_len), option);
}
void xbt_log_control_set(const char *control_string)
{
- if (!control_string)
+ if (not control_string)
return;
XBT_DEBUG("Parse log settings '%s'", control_string);
void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
{
DISABLE_XBT_LOG_CAT_INIT();
- if (!cat->appender) {
+ if (not cat->appender) {
XBT_VERB ("No appender to category %s. Setting the file appender as default", cat->name);
xbt_log_appender_set(cat, xbt_log_appender_file_new(nullptr));
}
" -> %%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: full backtrace (Called %%throwable in LOG4J). Defined only when using the GNU libc because\n"
+ " backtrace() is not defined elsewhere.\n"
" -> %%B: short backtrace (only the first line of the %%b). Called %%throwable{short} in LOG4J; "
"defined where %%b is.\n"
"\n"
static void xbt_log_help_categories_rec(xbt_log_category_t category, const std::string& prefix)
{
- if (!category)
+ if (not category)
return;
std::string this_prefix(prefix);
