-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2022. 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 "include/xbt/config.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/version.h"
+#include <simgrid/Exception.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/version.h>
+
#include "src/instr/instr_private.hpp"
-#include "surf/surf.hpp"
+#include "xbt/config.hpp"
#include <sys/stat.h>
#ifdef WIN32
static simgrid::config::Flag<bool> trace_actor_enabled{
"tracing/actor",
- {"tracing/msg/process"}, // XBT_ATTRIB_DEPRECATED_v330(option alias)
"Trace the behavior of all categorized actors, grouping them by host. "
"Can be used to track actor location if the simulator does actor migration.",
false};
timestamp);
stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::CreateContainer << " ";
- stream << timestamp << " " << c.get_id() << " " << c.type_->get_id() << " " << c.father_->get_id() << " \"";
+ stream << timestamp << " " << c.get_id() << " " << c.get_type()->get_id() << " " << c.get_parent()->get_id() << " \"";
if (c.get_name().find("rank-") != 0)
stream << c.get_name() << "\"";
else
timestamp);
stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " ";
- stream << timestamp << " " << c.type_->get_id() << " " << c.get_id();
+ stream << timestamp << " " << c.get_type()->get_id() << " " << c.get_id();
XBT_DEBUG("Dump %s", stream.str().c_str());
tracing_file << stream.str() << std::endl;
}
std::stringstream stream;
XBT_DEBUG("%s: event_type=%u", __func__, static_cast<unsigned>(PajeEventType::DefineEntityValue));
stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DefineEntityValue;
- stream << " " << value.get_id() << " " << value.get_father()->get_id() << " " << value.get_name();
+ stream << " " << value.get_id() << " " << value.get_parent()->get_id() << " " << value.get_name();
if (not value.get_color().empty())
stream << " \"" << value.get_color() << "\"";
XBT_DEBUG("Dump %s", stream.str().c_str());
std::stringstream stream;
stream << std::fixed << std::setprecision(trace_precision);
XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast<unsigned>(event_type), trace_precision, 0.);
- stream << event_type << " " << type.get_id() << " " << type.get_father()->get_id() << " " << type.get_name();
+ stream << event_type << " " << type.get_id() << " " << type.get_parent()->get_id() << " " << type.get_name();
if (type.is_colored())
stream << " \"" << type.get_color() << "\"";
XBT_DEBUG("Dump %s", stream.str().c_str());
std::stringstream stream;
XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast<unsigned>(PajeEventType::DefineLinkType),
trace_precision, 0.);
- stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_father()->get_id();
+ stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_parent()->get_id();
stream << " " << source.get_id() << " " << dest.get_id() << " " << type.get_name();
XBT_DEBUG("Dump %s", stream.str().c_str());
tracing_file << stream.str() << std::endl;
XBT_DEBUG("Filename %s is open for writing", filename.c_str());
if (format == "Paje") {
- Container::on_creation.connect(on_container_creation_paje);
- Container::on_destruction.connect(on_container_destruction_paje);
- EntityValue::on_creation.connect(on_entity_value_creation);
- Type::on_creation.connect(on_type_creation);
- LinkType::on_creation.connect(on_link_type_creation);
- PajeEvent::on_creation.connect(on_event_creation);
- PajeEvent::on_destruction.connect(on_event_destruction);
+ Container::on_creation_cb(on_container_creation_paje);
+ Container::on_destruction_cb(on_container_destruction_paje);
+ EntityValue::on_creation_cb(on_entity_value_creation);
+ Type::on_creation_cb(on_type_creation);
+ LinkType::on_creation_cb(on_link_type_creation);
+ PajeEvent::on_creation_cb(on_event_creation);
+ PajeEvent::on_destruction_cb(on_event_destruction);
paje::dump_generator_version();
paje::dump_header(trace_basic, TRACE_display_sizes());
} else {
trace_format = TraceFormat::Ti;
- Container::on_creation.connect(on_container_creation_ti);
- Container::on_destruction.connect(on_container_destruction_ti);
- StateEvent::on_destruction.connect(on_state_event_destruction);
+ Container::on_creation_cb(on_container_creation_ti);
+ Container::on_destruction_cb(on_container_destruction_ti);
+ StateEvent::on_destruction_cb(on_state_event_destruction);
}
trace_active = true;
return;
/* dump trace buffer */
- last_timestamp_to_dump = surf_get_clock();
+ last_timestamp_to_dump = simgrid_get_clock();
dump_buffer(true);
- const Type* root_type = Container::get_root()->type_;
+ const Type* root_type = Container::get_root()->get_type();
/* destroy all data structures of tracing (and free) */
delete Container::get_root();
delete root_type;
6);
/* Connect Engine callbacks */
- s4u::Engine::on_platform_creation.connect(on_simulation_start);
- s4u::Engine::on_time_advance.connect([](double /*time_delta*/) { dump_buffer(false); });
- s4u::Engine::on_deadlock.connect(on_simulation_end);
- s4u::Engine::on_simulation_end.connect(on_simulation_end);
+ s4u::Engine::on_platform_creation_cb(on_simulation_start);
+ s4u::Engine::on_time_advance_cb([](double /*time_delta*/) { dump_buffer(false); });
+ s4u::Engine::on_deadlock_cb(on_simulation_end);
+ s4u::Engine::on_simulation_end_cb(on_simulation_end);
}
} // namespace instr
} // namespace simgrid