-/* 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
#include <cstdarg>
#include <cwchar>
#include <deque>
-#include <simgrid/sg_config.h>
+#include <simgrid/sg_config.hpp>
#include <string>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
"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)
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)
- delete[] extra->sendcounts;
- if(extra->recvcounts!=nullptr)
- delete[] extra->recvcounts;
- xbt_free(extra);
- }
-}
-
void TRACE_internal_smpi_set_category (const char *category)
{
if (not TRACE_smpi_is_enabled())
}else{
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
- container_t container =
-#endif
- new simgrid::instr::Container(str, "MPI", father);
+ xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __func__);
+ father->createChild(str, "MPI");
#if HAVE_PAPI
+ container_t container = simgrid::instr::Container::byName(str);
papi_counter_t counters = smpi_process()->papi_counters();
for (auto const& it : counters) {
if (not TRACE_smpi_is_enabled())
return;
- container_t container = smpi_container(rank);
- container->removeFromParent();
- delete container;
+ 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;
-
- smpi_container(rank)->getState("MPI_STATE")->addEntityValue("computing", instr_find_color("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;
- }
-
- smpi_container(rank)->getState("MPI_STATE")->pushEvent("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;
-
- smpi_container(rank)->getState("MPI_STATE")->popEvent();
-}
-
-void TRACE_smpi_sleeping_init(int rank)
-{
- //first use, initialize the color in the trace
- if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
- return;
-
- smpi_container(rank)->getState("MPI_STATE")->addEntityValue("sleeping", instr_find_color("sleeping"));
+ if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing())
+ smpi_container(rank)->getState("MPI_STATE")->popEvent();
}
-void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
+void TRACE_smpi_sleeping_in(int rank, double duration)
{
- //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;
- }
-
- smpi_container(rank)->getState("MPI_STATE")->pushEvent("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;
-
- smpi_container(rank)->getState("MPI_STATE")->popEvent();
+ 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;
- }
simgrid::instr::StateType* state = smpi_container(rank)->getState("MPI_STATE");
state->addEntityValue("test");
- state->pushEvent("test", static_cast<void*>(extra));
+ state->pushEvent("test", new simgrid::instr::NoOpTIData("test"));
}
void TRACE_smpi_testing_out(int rank)
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, simgrid::instr::TIData* extra)
{
if (not TRACE_smpi_is_enabled()) {
- cleanup_extra_data(extra);
+ delete extra;
return;
}
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->pushEvent(operation, extra);
}
void TRACE_smpi_comm_out(int rank)
