#include "src/internal_config.h"
+#include <simgrid/actor.h>
+#include <simgrid/s4u/Actor.hpp>
#include <xbt/backtrace.hpp>
#include <xbt/string.hpp>
#include <xbt/sysdep.h>
-#include <xbt/virtu.h>
#include <cstdio>
#include <cstdlib>
const std::string frame_name = frame.name();
if (print) {
if (frame_name.rfind("simgrid::xbt::MainFunction", 0) == 0 ||
- frame_name.rfind("simgrid::kernel::context::Context::operator()()", 0) == 0)
+ frame_name.rfind("simgrid::kernel::context::Context::operator()()", 0) == 0 ||
+ frame_name.rfind("auto sthread_create::{lambda") == 0)
break;
ss << " -> #" << frame_count++ << " ";
if (xbt_log_no_loc) // Don't display file source and line if so
void Backtrace::display() const
{
std::string backtrace = resolve();
- std::fprintf(stderr, "Backtrace (displayed in actor %s%s):\n%s\n", xbt_procname(),
+ std::fprintf(stderr, "Backtrace (displayed in actor %s%s):\n%s\n",
+ simgrid::s4u::Actor::is_maestro() ? "maestro" : sg_actor_self_get_name(),
(xbt_log_no_loc ? " -- short trace because of --log=no_loc" : ""),
backtrace.empty() ? "(backtrace not set -- did you install Boost.Stacktrace?)" : backtrace.c_str());
}