/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "private.h"
#include "private.hpp"
+#include <boost/algorithm/string.hpp>
#include <cctype>
#include <cstdarg>
#include <cwchar>
#include <deque>
#include <simgrid/sg_config.h>
+#include <string>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
nullptr, nullptr,
};
-static char *str_tolower (const char *str)
+static const char* instr_find_color(const char* state)
{
- char* ret = xbt_strdup(str);
- int n = strlen(ret);
- for (int i = 0; i < n; i++)
- ret[i] = tolower (str[i]);
- return ret;
-}
-
-static const char *instr_find_color (const char *state)
-{
- char* target = str_tolower(state);
+ std::string target = std::string(state);
+ boost::algorithm::to_lower(target);
const char* ret = nullptr;
unsigned int i = 0;
const char* current = smpi_colors[i];
while (current != nullptr) {
- if (strcmp (state, current) == 0 //exact match
- || strstr(target, current) != 0 ){//as substring
- ret = smpi_colors[i+1];
- break;
+ if (state == current // exact match
+ || target.find(current) != 0) { // as substring
+ ret = smpi_colors[i + 1];
+ break;
}
i+=2;
current = smpi_colors[i];
}
- xbt_free(target);
return ret;
}
-XBT_PRIVATE char *smpi_container(int rank, char *container, int n)
+XBT_PRIVATE std::string smpi_container(int rank)
{
- snprintf(container, n, "rank-%d", rank);
- return container;
+ return std::string("rank-") + std::to_string(rank);
}
static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send);
void TRACE_smpi_release()
{
- for (auto elm : keys)
+ for (auto const& elm : keys)
delete elm.second;
}
if (not TRACE_smpi_is_enabled())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+ std::string str = smpi_container(rank);
container_t father;
if (TRACE_smpi_is_grouped()){
- father = PJ_container_get(sg_host_self_get_name());
+ father = simgrid::instr::Container::byName(sg_host_self_get_name());
}else{
father = PJ_container_get_root ();
}
- xbt_assert(father!=nullptr,
- "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__);
+ 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
- PJ_container_new(str, INSTR_SMPI, father);
+ new simgrid::instr::Container(str, simgrid::instr::INSTR_SMPI, father);
#if HAVE_PAPI
papi_counter_t counters = smpi_process()->papi_counters();
- for (auto& it : counters) {
+ for (auto const& it : counters) {
/**
* Check whether this variable already exists or not. Otherwise, it will be created
* multiple times but only the last one would be used...
*/
- if (PJ_type_get_or_null(it.first.c_str(), container->type) == nullptr) {
- PJ_type_variable_new(it.first.c_str(), nullptr, container->type);
+ if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) {
+ Type::variableNew(it.first.c_str(), "", container->type_);
}
}
#endif
if (not TRACE_smpi_is_enabled())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- container_t container = PJ_container_get(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
- PJ_container_remove_from_parent (container);
- PJ_container_free (container);
+ 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)
return;
}
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
+ 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);
- value* val = value::get_or_new(operation, color, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ 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;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
+ container_t container = simgrid::instr::Container::byName(smpi_container(rank));
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_computing_init(int rank)
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get(str);
- type_t type = PJ_type_get("MPI_STATE", container->type);
- const char* color = instr_find_color("computing");
- new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type));
+ 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"));
}
void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
return;
}
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- value* val = value::get_or_new("computing", nullptr, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ 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));
}
void TRACE_smpi_computing_out(int rank)
{
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+
+ 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);
}
void TRACE_smpi_sleeping_init(int rank)
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- const char *color = instr_find_color ("sleeping");
- value* val = value::get_or_new("sleeping", color, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val);
+ 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)
return;
}
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- value* val = value::get_or_new("sleeping", nullptr, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ 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));
}
void TRACE_smpi_sleeping_out(int rank)
{
if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+
+ 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);
}
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
return;
}
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- value* val = value::get_or_new("test", nullptr, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(smpi_container(rank));
+ simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+ state->addEntityValue("test");
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"),
+ static_cast<void*>(extra));
}
void TRACE_smpi_testing_out(int rank)
{
if (not TRACE_smpi_is_enabled())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+
+ 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);
}
void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
return;
}
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
- const char *color = instr_find_color (operation);
- value* val = value::get_or_new(operation, color, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(smpi_container(rank));
+ simgrid::instr::Type* state = container->type_->byName("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));
}
void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
if (not TRACE_smpi_is_enabled())
return;
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_STATE", container->type);
+ container_t container = simgrid::instr::Container::byName(smpi_container(rank));
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
char key[INSTR_DEFAULT_STR_SIZE] = {0};
TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,1);
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+ 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);
- new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
+ new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
}
void TRACE_smpi_recv(int src, int dst, int tag)
char key[INSTR_DEFAULT_STR_SIZE] = {0};
TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,0);
- char str[INSTR_DEFAULT_STR_SIZE];
- smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+ 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);
- new EndLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
+ new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
}
