-/* Copyright (c) 2010, 2012-2017. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
"init", "0 1 0", "finalize", "0 1 0",
"put", "0.3 1 0", "get", "0 1 0.3", "accumulate", "1 0.3 0",
+ "rput", "0.3 1 0", "rget", "0 1 0.3", "raccumulate", "1 0.3 0",
+ "compare_and_swap", "0.3 1 0", "get_accumulate", "0 1 0.3", "rget_accumulate", "1 0.3 0",
"win_fence", "1 0 0.3", "win_post", "1 0 0.8", "win_wait", "1 0.8 0",
- "win_start", "0.8 0 1", "win_complete", "0.8 1 0", nullptr, nullptr,
+ "win_start", "0.8 0 1", "win_complete", "0.8 1 0", "win_lock", "1 0 0.3",
+ "win_unlock", "1 0 0.3", "win_lock_all", "1 0 0.8", "win_unlock_all", "1 0.8 0",
+ "win_flush", "1 0 0.3", "win_flush_local", "1 0 0.8", "win_flush_all", "1 0.8 0",
+ "win_flush_local_all", "1 0 0.3", "" , ""
};
static const char* instr_find_color(const char* state)
return ret;
}
-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::unordered_map<smx_actor_t, std::string> process_category;
-static void cleanup_extra_data (instr_extra_data extra){
- if(extra!=nullptr){
- if(extra->sendcounts!=nullptr)
- xbt_free(extra->sendcounts);
- if(extra->recvcounts!=nullptr)
- xbt_free(extra->recvcounts);
- xbt_free(extra);
- }
-}
-
void TRACE_internal_smpi_set_category (const char *category)
{
if (not TRACE_smpi_is_enabled())
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()){
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
if (not TRACE_smpi_is_enabled())
return;
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- container->removeFromParent();
- 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;
- }
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- const char *color = instr_find_color (operation);
- type->addEntityValue(operation, color);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue(operation),
- static_cast<void*>(extra));
-}
-
-void TRACE_smpi_collective_out(int rank, const char *operation)
-{
- if (not TRACE_smpi_is_enabled())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-
- new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+ smpi_container(rank)->removeFromParent();
}
void TRACE_smpi_computing_init(int rank)
{
//first use, initialize the color in the trace
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- type->addEntityValue("computing", instr_find_color("computing"));
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing"));
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_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, double amount)
{
- //do not forget to set the color first, otherwise this will explode
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing()) {
- cleanup_extra_data(extra);
- return;
- }
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- type->addEntityValue("computing");
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing"),
- static_cast<void*>(extra));
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing())
+ smpi_container(rank)
+ ->getState("MPI_STATE")
+ ->pushEvent("computing", new simgrid::instr::CpuTIData("compute", amount));
}
void TRACE_smpi_computing_out(int rank)
{
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing())
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
-void TRACE_smpi_sleeping_init(int rank)
+void TRACE_smpi_sleeping_in(int rank, double duration)
{
- //first use, initialize the color in the trace
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
- state->addEntityValue("sleeping", instr_find_color("sleeping"));
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"));
-}
-
-void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
-{
- //do not forget to set the color first, otherwise this will explode
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping()) {
- cleanup_extra_data(extra);
- return;
- }
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
- state->addEntityValue("sleeping");
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"),
- static_cast<void*>(extra));
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping())
+ smpi_container(rank)
+ ->getState("MPI_STATE")
+ ->pushEvent("sleeping", new simgrid::instr::CpuTIData("sleep", duration));
}
void TRACE_smpi_sleeping_out(int rank)
{
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+ if (TRACE_smpi_is_enabled() && not TRACE_smpi_is_sleeping())
+ 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)
{
//do not forget to set the color first, otherwise this will explode
- if (not TRACE_smpi_is_enabled()) {
- cleanup_extra_data(extra);
+ if (not TRACE_smpi_is_enabled())
return;
- }
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+ simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE");
state->addEntityValue("test");
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"),
- static_cast<void*>(extra));
+ state->pushEvent("test", new simgrid::instr::NoOpTIData("test"));
}
void TRACE_smpi_testing_out(int rank)
{
- if (not TRACE_smpi_is_enabled())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+ if (TRACE_smpi_is_enabled())
+ 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, simgrid::instr::TIData* extra)
{
if (not TRACE_smpi_is_enabled()) {
- cleanup_extra_data(extra);
+ delete extra;
return;
}
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+ simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE");
state->addEntityValue(operation, instr_find_color(operation));
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue(operation),
- static_cast<void*>(extra));
+ state->pushEvent(operation, extra);
}
-void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
+void TRACE_smpi_comm_out(int rank)
{
- if (not TRACE_smpi_is_enabled())
- return;
-
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-
- new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+ if (TRACE_smpi_is_enabled())
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
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);
- container_t container = simgrid::instr::Container::byName(smpi_container(rank));
- simgrid::instr::Type* type = 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());
- new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), type, container,
- "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)
std::string key = TRACE_smpi_get_key(src, dst, tag, 0);
- container_t container = simgrid::instr::Container::byName(smpi_container(dst));
- simgrid::instr::Type* type = 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());
- new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), type, container,
- "PTP", key);
+ simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(smpi_container(dst), "PTP", key);
}