snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id);
container_id++;
- container_t newContainer = xbt_new0(s_container_t, 1);
+ container_t newContainer = xbt_new0(s_container, 1);
newContainer->name = xbt_strdup (name); // name of the container
newContainer->id = xbt_strdup (id_str); // id (or alias) of the container
newContainer->father = father;
xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_ROUTER:
- newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
+ newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_AS:
- newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
+ newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
default:
newContainer->children = xbt_dict_new_homogeneous(nullptr);
if (newContainer->father){
xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr);
- CreateContainerEvent(newContainer);
+ LogContainerCreation(newContainer);
}
//register all kinds by name
if (not TRACE_disable_destroy() && container != PJ_container_get_root()) {
//do not trace the container destruction if user requests
//or if the container is root
- DestroyContainerEvent(container);
+ LogContainerDestruction(container);
}
//remove it from allContainers data structure