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 ();
}
* 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_);
+ Type::variableNew(it.first.c_str(), "", container->type_);
}
}
#endif
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);
+ container_t container = simgrid::instr::Container::byName(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+ container->removeFromParent();
delete container;
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
const char *color = instr_find_color (operation);
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(operation, color, type);
- new simgrid::instr::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)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get(str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- const char* color = instr_find_color("computing");
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type,
- simgrid::instr::Value::byNameOrCreate("computing", color, type));
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("computing", "", type);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- const char *color = instr_find_color ("sleeping");
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("sleeping", color, type);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val);
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("sleeping", "", type);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("test", "", type);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
return;
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
- const char *color = instr_find_color (operation);
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(operation, color, type);
- new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+ container_t container = simgrid::instr::Container::byName(str);
+ 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)
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK");
+ container_t container = simgrid::instr::Container::byName(str);
+ 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 simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
}
char str[INSTR_DEFAULT_STR_SIZE];
smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get (str);
- simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK");
+ container_t container = simgrid::instr::Container::byName(str);
+ 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 simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
}