-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
/* 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 <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
-#include <xbt/dict.h>
-#include <xbt/lib.h>
-#include <xbt/log.h>
-
-#include <surf/surf.h>
-#include <surf/surf_routing.h>
+#include "surf/surf.h"
#include "src/instr/instr_private.h"
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;
//Search for network_element_t
switch (kind){
case INSTR_HOST:
- newContainer->netcard = sg_host->pimpl_netcard;
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = sg_host->pimpl_netpoint;
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_ROUTER:
- newContainer->netcard = static_cast<sg_netcard_t>(xbt_dict_get_or_null(netcards_dict, name));
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_AS:
- newContainer->netcard = static_cast<sg_netcard_t>(xbt_dict_get_or_null(netcards_dict, name));
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
default:
- newContainer->netcard = nullptr;
+ newContainer->netpoint = nullptr;
break;
}
newContainer->children = xbt_dict_new_homogeneous(nullptr);
if (newContainer->father){
xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr);
- new_pajeCreateContainer (newContainer);
+ LogContainerCreation(newContainer);
}
//register all kinds by name
TRACE_paje_dump_buffer(1);
//trace my destruction
- if (!TRACE_disable_destroy() && container != PJ_container_get_root()){
+ 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
- new_pajeDestroyContainer(container);
+ LogContainerDestruction(container);
}
//remove it from allContainers data structure
rootContainer = nullptr;
//checks
- if (!xbt_dict_is_empty(allContainers)){
+ if (not xbt_dict_is_empty(allContainers)) {
THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
}
}