+ init adds the entity value
+ in pushes an event
+ no need to do both ... twice
improve readability by modifying smpi_container to return the
container and not its name.
-XBT_PRIVATE std::string smpi_container(int rank)
+XBT_PRIVATE container_t smpi_container(int rank)
- return std::string("rank-") + std::to_string(rank);
+ return simgrid::instr::Container::byName(std::string("rank-") + std::to_string(rank));
}
static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send)
}
static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send)
if (not TRACE_smpi_is_enabled())
return;
if (not TRACE_smpi_is_enabled())
return;
- std::string str = smpi_container(rank);
+ std::string str = std::string("rank-") + std::to_string(rank);
container_t father;
if (TRACE_smpi_is_grouped()){
container_t father;
if (TRACE_smpi_is_grouped()){
if (not TRACE_smpi_is_enabled())
return;
if (not TRACE_smpi_is_enabled())
return;
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
+ container_t container = smpi_container(rank);
container->removeFromParent();
delete container;
}
container->removeFromParent();
delete container;
}
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
- state->addEntityValue("computing", instr_find_color("computing"));
- state->pushEvent("computing");
+ smpi_container(rank)->getState("MPI_STATE")->addEntityValue("computing", instr_find_color("computing"));
}
void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
}
void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
- state->addEntityValue("computing");
- state->pushEvent("computing", static_cast<void*>(extra));
+ smpi_container(rank)->getState("MPI_STATE")->pushEvent("computing", static_cast<void*>(extra));
}
void TRACE_smpi_computing_out(int rank)
}
void TRACE_smpi_computing_out(int rank)
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
- simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
void TRACE_smpi_sleeping_init(int rank)
}
void TRACE_smpi_sleeping_init(int rank)
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
- state->addEntityValue("sleeping", instr_find_color("sleeping"));
- state->pushEvent("sleeping");
+ smpi_container(rank)->getState("MPI_STATE")->addEntityValue("sleeping", instr_find_color("sleeping"));
}
void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
}
void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
- state->addEntityValue("sleeping");
- state->pushEvent("sleeping", static_cast<void*>(extra));
+ smpi_container(rank)->getState("MPI_STATE")->pushEvent("sleeping", static_cast<void*>(extra));
}
void TRACE_smpi_sleeping_out(int rank)
}
void TRACE_smpi_sleeping_out(int rank)
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
- simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
}
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
+ simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE");
state->addEntityValue("test");
state->pushEvent("test", static_cast<void*>(extra));
}
state->addEntityValue("test");
state->pushEvent("test", static_cast<void*>(extra));
}
void TRACE_smpi_testing_out(int rank)
{
if (TRACE_smpi_is_enabled())
void TRACE_smpi_testing_out(int rank)
{
if (TRACE_smpi_is_enabled())
- simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra)
}
void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra)
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
+ simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE");
state->addEntityValue(operation, instr_find_color(operation));
state->pushEvent(operation, static_cast<void*>(extra));
}
state->addEntityValue(operation, instr_find_color(operation));
state->pushEvent(operation, static_cast<void*>(extra));
}
void TRACE_smpi_comm_out(int rank)
{
if (TRACE_smpi_is_enabled())
void TRACE_smpi_comm_out(int rank)
{
if (TRACE_smpi_is_enabled())
- simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
}
void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
std::string key = TRACE_smpi_get_key(src, dst, tag, 1);
XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
std::string key = TRACE_smpi_get_key(src, dst, tag, 1);
XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
- container_t startContainer = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->startEvent(startContainer, "PTP", key, size);
+ simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->startEvent(smpi_container(rank), "PTP", key, size);
}
void TRACE_smpi_recv(int src, int dst, int tag)
}
void TRACE_smpi_recv(int src, int dst, int tag)
std::string key = TRACE_smpi_get_key(src, dst, tag, 0);
XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
std::string key = TRACE_smpi_get_key(src, dst, tag, 0);
XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
- container_t endContainer = simgrid::instr::Container::byName(smpi_container(dst));
- simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(endContainer, "PTP", key);
+ simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(smpi_container(dst), "PTP", key);
#if HAVE_PAPI
if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) {
#if HAVE_PAPI
if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) {
- container_t container = new simgrid::instr::Container(smpi_container(smpi_process()->index()));
+ container_t container =
+ new simgrid::instr::Container(std::string("rank-") + std::to_string(smpi_process()->index()));
papi_counter_t& counter_data = smpi_process()->papi_counters();
for (auto const& pair : counter_data) {
papi_counter_t& counter_data = smpi_process()->papi_counters();
for (auto const& pair : counter_data) {