static void cleanup_extra_data (instr_extra_data extra){
if(extra!=nullptr){
if(extra->sendcounts!=nullptr)
- xbt_free(extra->sendcounts);
+ delete[] extra->sendcounts;
if(extra->recvcounts!=nullptr)
- xbt_free(extra->recvcounts);
+ delete[] extra->recvcounts;
xbt_free(extra);
}
}
if (TRACE_smpi_is_grouped()){
father = simgrid::instr::Container::byNameOrNull(sg_host_self_get_name());
}else{
- father = simgrid::instr::Container::getRootContainer();
+ father = simgrid::instr::Container::getRoot();
}
xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __FUNCTION__);
#if HAVE_PAPI
delete container;
}
-void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra)
-{
- if (not TRACE_smpi_is_enabled()) {
- cleanup_extra_data(extra);
- return;
- }
-
- simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
- const char *color = instr_find_color (operation);
- state->addEntityValue(operation, color);
- state->pushEvent(operation, static_cast<void*>(extra));
-}
-
-void TRACE_smpi_collective_out(int rank, const char *operation)
-{
- if (TRACE_smpi_is_enabled())
- simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
-}
-
void TRACE_smpi_computing_init(int rank)
{
//first use, initialize the color in the trace
simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
}
-void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
+void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra)
{
if (not TRACE_smpi_is_enabled()) {
cleanup_extra_data(extra);
state->pushEvent(operation, static_cast<void*>(extra));
}
-void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
+void TRACE_smpi_comm_out(int rank)
{
if (TRACE_smpi_is_enabled())
simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
std::string key = TRACE_smpi_get_key(src, dst, tag, 1);
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::LinkType* link =
- static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MPI_LINK"));
XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
- link->startEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), container, "PTP", key, size);
+ container_t startContainer = simgrid::instr::Container::byName(smpi_container(rank));
+ simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->startEvent(startContainer, "PTP", key, size);
}
void TRACE_smpi_recv(int src, int dst, int tag)
std::string key = TRACE_smpi_get_key(src, dst, tag, 0);
- container_t container = simgrid::instr::Container::byName(smpi_container(dst));
- simgrid::instr::LinkType* link =
- static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MPI_LINK"));
XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
- link->endEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), container, "PTP", key);
+ container_t endContainer = simgrid::instr::Container::byName(smpi_container(dst));
+ simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(endContainer, "PTP", key);
}