return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
}
-static const char* instr_node_name(const s_xbt_node_t* node)
-{
- return static_cast<char*>(xbt_graph_node_get_data(node));
-}
-
static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, const simgrid::instr::Container* a2)
{
// this is only an optimization (since most of a1 and a2 share the same parent)
// find the lowest ancestor
p = nullptr;
- int i = ancestors_a1.size() - 1;
- int j = ancestors_a2.size() - 1;
+ int i = static_cast<int>(ancestors_a1.size()) - 1;
+ int j = static_cast<int>(ancestors_a2.size()) - 1;
while (i >= 0 && j >= 0) {
container_t a1p = ancestors_a1.at(i);
const simgrid::instr::Container* a2p = ancestors_a2.at(j);
if (root->get_name() == "LINK")
root->by_name_or_create(std::string("b") + new_typename, color);
- for (auto const& elm : root->children_) {
+ for (auto const& elm : root->get_children()) {
recursiveNewVariableType(new_typename, color, elm.second.get());
}
}
if (root->get_name() == father_type) {
root->by_name_or_create(new_typename, color);
}
- for (auto const& elm : root->children_)
+ for (auto const& elm : root->get_children())
recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get());
}
if (root->get_name() == father_type)
root->by_name_or_create<simgrid::instr::StateType>(new_typename);
- for (auto const& elm : root->children_)
+ for (auto const& elm : root->get_children())
recursiveNewUserStateType(father_type, new_typename, elm.second.get());
}
if (root->get_name() == type_name)
static_cast<simgrid::instr::StateType*>(root)->add_entity_value(val, color);
- for (auto const& elm : root->children_)
+ for (auto const& elm : root->get_children())
recursiveNewValueForUserStateType(type_name, val, color, elm.second.get());
}
recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveXBTGraphExtraction(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t>* nodes,
- std::map<std::string, xbt_edge_t>* edges, const_sg_netzone_t netzone)
-{
- // bottom-up recursion
- for (auto const& netzone_child : netzone->get_children())
- recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child);
-
- netzone->get_impl()->get_graph(graph, nodes, edges);
-}
-
namespace simgrid {
namespace instr {
xbt_graph_t g = xbt_graph_new_graph(0, nullptr);
std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>();
std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>();
- recursiveXBTGraphExtraction(g, nodes, edges, s4u::Engine::get_instance()->get_netzone_root());
+ s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, nodes, edges);
std::ofstream fs;
fs.open(output_filename, std::ofstream::out);
fs << " node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl;
for (auto const& elm : *nodes)
- fs << " \"" << instr_node_name(elm.second) << "\";" << std::endl;
+ fs << " \"" << elm.first << "\";" << std::endl;
for (auto const& elm : *edges) {
- const char* src_s = instr_node_name(elm.second->src);
- const char* dst_s = instr_node_name(elm.second->dst);
+ const char* src_s = static_cast<char*>(elm.second->src->data);
+ const char* dst_s = static_cast<char*>(elm.second->dst->data);
if (g->directed)
fs << " \"" << src_s << "\" -> \"" << dst_s << "\";" << std::endl;
else
}
if (TRACE_needs_platform()) {
- NetZoneContainer* container = new NetZoneContainer(id, currentContainer.size(), currentContainer.back());
+ unsigned level = static_cast<unsigned>(currentContainer.size());
+ NetZoneContainer* container = new NetZoneContainer(id, level, currentContainer.back());
currentContainer.push_back(container);
}
}
latency->set_calling_container(container);
latency->set_event(0, link.get_latency());
}
+
if (TRACE_uncategorized()) {
container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
}
}
}
-static void on_host_speed_change(s4u::Host const& host)
-{
- Container::by_name(host.get_name())
- ->get_variable("speed")
- ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
-}
-
static void on_action_state_change(kernel::resource::Action const& action,
kernel::resource::Action::State /* previous */)
{
- int n = action.get_variable()->get_number_of_constraint();
+ unsigned n = static_cast<unsigned>(action.get_variable()->get_number_of_constraint());
- for (int i = 0; i < n; i++) {
+ for (unsigned i = 0; i < n; i++) {
double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i);
/* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */
kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id();
}
}
-static void on_link_bandwidth_change(s4u::Link const& link)
-{
- Container::by_name(link.get_name())
- ->get_variable("bandwidth")
- ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
-}
-
-static void on_netpoint_creation(kernel::routing::NetPoint const& netpoint)
-{
- if (netpoint.is_router())
- new RouterContainer(netpoint.get_name(), currentContainer.back());
-}
-
static void on_platform_created()
{
currentContainer.clear();
recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), filter);
XBT_DEBUG("Graph extraction finished.");
delete filter;
- TRACE_paje_dump_buffer(true);
+ dump_buffer(true);
}
static void on_actor_creation(s4u::Actor const& actor)
{
- const Container* root = Container::get_root();
- Container* container = Container::by_name(actor.get_host()->get_name());
+ const Container* root = Container::get_root();
+ Container* container = Container::by_name(actor.get_host()->get_name());
+ std::string container_name = instr_pid(actor);
- container->create_child(instr_pid(actor), "ACTOR");
+ container->create_child(container_name, "ACTOR");
ContainerType* actor_type = container->type_->by_name_or_create<ContainerType>("ACTOR");
StateType* state = actor_type->by_name_or_create<StateType>("ACTOR_STATE");
state->add_entity_value("suspend", "1 0 1");
state->add_entity_value("send", "0 0 1");
state->add_entity_value("execute", "0 1 1");
root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
- root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
- std::string container_name = instr_pid(actor);
actor.on_exit([container_name](bool failed) {
if (failed)
// kill means that this actor no longer exists, let's destroy it
if (TRACE_needs_platform()) {
s4u::Engine::on_platform_created.connect(on_platform_created);
s4u::Host::on_creation.connect(on_host_creation);
- s4u::Host::on_speed_change.connect(on_host_speed_change);
+ s4u::Host::on_speed_change.connect([](s4u::Host const& host) {
+ Container::by_name(host.get_name())
+ ->get_variable("speed")
+ ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
+ });
s4u::Link::on_creation.connect(on_link_creation);
- s4u::Link::on_bandwidth_change.connect(on_link_bandwidth_change);
+ s4u::Link::on_bandwidth_change.connect([](s4u::Link const& link) {
+ Container::by_name(link.get_name())
+ ->get_variable("bandwidth")
+ ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
+ });
s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
- kernel::routing::NetPoint::on_creation.connect(on_netpoint_creation);
+ kernel::routing::NetPoint::on_creation.connect([](kernel::routing::NetPoint const& netpoint) {
+ if (netpoint.is_router())
+ new RouterContainer(netpoint.get_name(), currentContainer.back());
+ });
}
+
s4u::NetZone::on_creation.connect(on_netzone_creation);
- s4u::Engine::on_time_advance.connect([](double /*time_delta*/) { TRACE_paje_dump_buffer(false); });
kernel::resource::CpuAction::on_state_change.connect(on_action_state_change);
s4u::Link::on_communication_state_change.connect(on_action_state_change);
s4u::Actor::on_host_change.connect(on_actor_host_change);
}
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) {
+ s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const& exec) {
+ Container::by_name(std::string("rank-") + std::to_string(actor.get_pid()))
+ ->get_state("MPI_STATE")
+ ->push_event("computing", new CpuTIData("compute", exec.get_cost()));
+ });
+ s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) {
+ Container::by_name(std::string("rank-") + std::to_string(actor.get_pid()))->get_state("MPI_STATE")->pop_event();
+ });
+ }
+
if (TRACE_vm_is_enabled()) {
s4u::Host::on_creation.connect(on_vm_creation);
s4u::VirtualMachine::on_start.connect([](s4u::VirtualMachine const& vm) {
