#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();
* Check whether this variable already exists or not. Otherwise, it will be created
* multiple times but only the last one would be used...
*/
- if (s_type::getOrNull(it.first.c_str(), container->type) == nullptr) {
- Type::variableNew(it.first.c_str(), nullptr, container->type);
+ if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) {
+ Type::variableNew(it.first.c_str(), nullptr, container->type_);
}
}
#endif
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);
+ delete container;
}
void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
+ simgrid::instr::Type* 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));
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(operation, color, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
}
void TRACE_smpi_collective_out(int rank, const char *operation)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_computing_init(int rank)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get(str);
- Type* type = PJ_type_get("MPI_STATE", container->type);
+ simgrid::instr::Type* 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));
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type,
+ simgrid::instr::Value::get_or_new("computing", color, type));
}
void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* 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));
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("computing", nullptr, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
}
void TRACE_smpi_computing_out(int rank)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_sleeping_init(int rank)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
+ simgrid::instr::Type* 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);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", color, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val);
}
void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* 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));
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", nullptr, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
}
void TRACE_smpi_sleeping_out(int rank)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* 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));
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("test", nullptr, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
}
void TRACE_smpi_testing_out(int rank)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
- new PopStateEvent (SIMIX_get_clock(), container, type);
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
+ new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
+ simgrid::instr::Type* 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));
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(operation, color, type);
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
}
void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_STATE", container->type);
+ simgrid::instr::Type* type = PJ_type_get("MPI_STATE", container->type_);
- 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 str[INSTR_DEFAULT_STR_SIZE];
smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+ simgrid::instr::Type* type = PJ_type_get("MPI_LINK", PJ_type_get_root());
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 str[INSTR_DEFAULT_STR_SIZE];
smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
container_t container = PJ_container_get (str);
- Type* type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+ simgrid::instr::Type* type = PJ_type_get("MPI_LINK", PJ_type_get_root());
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);
}