X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d5dde64a8201a55007ccc0bcc4f267facff8d30..dc6d65f0d0ee70a889f1621abb1d3778a3da11d6:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index a360296dcc..155243ad14 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -25,7 +25,6 @@ namespace kernel { namespace routing { /* Callbacks */ - simgrid::xbt::signal netcardCreatedCallbacks; simgrid::xbt::signal asCreatedCallbacks; }}} // namespace simgrid::kernel::routing @@ -46,22 +45,6 @@ int COORD_ASR_LEVEL = -1; //Coordinates level int NS3_ASR_LEVEL = -1; //host node for ns3 int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored -/** @brief Retrieve a netcard from its name - * - * Netcards are the thing that connect host or routers to the network - */ -simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name) -{ - sg_host_t h = sg_host_by_name(name); - simgrid::kernel::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard; - if (!netcard) - netcard = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); - return netcard; -} - -/* Global vars */ -simgrid::kernel::routing::RoutingPlatf* routing_platf = new simgrid::kernel::routing::RoutingPlatf(); - void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { tmgr_trace_t tmgr_trace; @@ -101,13 +84,3 @@ void routing_register_callbacks() instr_routing_define_callbacks(); } -/** \brief Frees all memory allocated by the routing module */ -void routing_exit() { - delete routing_platf; -} - -simgrid::kernel::routing::RoutingPlatf::RoutingPlatf() = default; -simgrid::kernel::routing::RoutingPlatf::~RoutingPlatf() -{ - delete root_; -}