if (newContainer->father){
newContainer->type = s_type::s_type_get_or_null (as_typename, newContainer->father->type);
if (newContainer->type == nullptr){
- newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type);
+ newContainer->type = s_type::s_type_container_new (as_typename, newContainer->father->type);
}
}else{
- newContainer->type = PJ_type_container_new ("0", nullptr);
+ newContainer->type = s_type::s_type_container_new ("0", nullptr);
}
}else{
//otherwise, the name is its kind
}
type_t type = s_type::s_type_get_or_null (typeNameBuff, newContainer->father->type);
if (type == nullptr){
- newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type);
+ newContainer->type = s_type::s_type_container_new (typeNameBuff, newContainer->father->type);
}else{
newContainer->type = type;
}
xbt_dict_t values; //valid for all types except variable and container
s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
static type_t s_type_get_or_null (const char *name, type_t father);
+ static type_t s_type_container_new (const char *name, type_t father);
};
//--------------------------------------------------
/* instr_paje_types.c */
XBT_PRIVATE void PJ_type_release ();
XBT_PUBLIC(type_t) PJ_type_get_root ();
-XBT_PRIVATE type_t PJ_type_container_new (const char *name, type_t father);
XBT_PRIVATE type_t PJ_type_event_new (const char *name, type_t father);
type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
if (TRACE_smpi_is_enabled()) {
type_t mpi = s_type::s_type_get_or_null ("MPI", root->type);
if (mpi == nullptr){
- mpi = PJ_type_container_new("MPI", root->type);
+ mpi = s_type::s_type_container_new("MPI", root->type);
if (not TRACE_smpi_is_grouped())
PJ_type_state_new ("MPI_STATE", mpi);
PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);
if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){
type_t mpi = s_type::s_type_get_or_null ("MPI", container->type);
if (mpi == nullptr){
- mpi = PJ_type_container_new("MPI", container->type);
+ mpi = s_type::s_type_container_new("MPI", container->type);
PJ_type_state_new ("MPI_STATE", mpi);
}
}
if (TRACE_msg_process_is_enabled()) {
type_t msg_process = s_type::s_type_get_or_null ("MSG_PROCESS", container->type);
if (msg_process == nullptr){
- msg_process = PJ_type_container_new("MSG_PROCESS", container->type);
+ msg_process = s_type::s_type_container_new("MSG_PROCESS", container->type);
type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
value PJ_value("suspend", "1 0 1", state);
value::get_or_new("sleep", "1 1 0", state);
if (TRACE_msg_vm_is_enabled()) {
type_t msg_vm = s_type::s_type_get_or_null ("MSG_VM", container->type);
if (msg_vm == nullptr){
- msg_vm = PJ_type_container_new("MSG_VM", container->type);
+ msg_vm = s_type::s_type_container_new("MSG_VM", container->type);
type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);
value PJ_value("suspend", "1 0 1", state);
value::get_or_new("sleep", "1 1 0", state);