kill a now useless function

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 96c31e0..ed0ddb2 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -154,8 +154,6 @@ NetworkCm02Model::NetworkCm02Model()
   maxminSystem_ = lmm_system_new(selectiveUpdate_);
   loopback_     = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
 
-  routing_model_create();
-
   if (updateMechanism_ == UM_LAZY) {
     actionHeap_ = xbt_heap_new(8, nullptr);
     xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap);

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index bbf16a8..be17976 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -16,8 +16,6 @@ void surf_network_model_init_Constant()
   xbt_assert(surf_network_model == nullptr);
   surf_network_model = new simgrid::surf::NetworkConstantModel();
   all_existing_models->push_back(surf_network_model);
-
-  routing_model_create();
 }
 
 namespace simgrid {

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index bf5d0f7..21325c2 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -174,7 +174,6 @@ namespace surf {
 NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   ns3_initialize(ns3_tcp_model.get().c_str());
 
-  routing_model_create();
   simgrid::s4u::Host::onCreation.connect(ns3_add_host);
   simgrid::kernel::routing::netcardCreatedCallbacks.connect(ns3_add_netcard);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index a986926..3ca0d7c 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -40,8 +40,6 @@ HostL07Model::HostL07Model() : HostModel() {
   maxminSystem_->solve_fun = &bottleneck_solve;
   surf_network_model = new NetworkL07Model(this,maxminSystem_);
   surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
-
-  routing_model_create();
 }
 
 HostL07Model::~HostL07Model() = default;

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 7f18490..aa86759 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -60,8 +60,7 @@ simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name)
 }
 
 /* Global vars */
-simgrid::kernel::routing::RoutingPlatf *routing_platf = nullptr;
-
+simgrid::kernel::routing::RoutingPlatf* routing_platf = new simgrid::kernel::routing::RoutingPlatf();
 
 void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
 {
@@ -128,12 +127,6 @@ xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
 
 }}}
 
-/** @brief create the root AS */
-void routing_model_create()
-{
-  routing_platf = new simgrid::kernel::routing::RoutingPlatf();
-}
-
 /* ************************************************************************** */
 /* ************************* GENERIC PARSE FUNCTIONS ************************ */
 

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 71d0d14..e15db96 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -18,7 +18,6 @@
 #include <vector>
 
 SG_BEGIN_DECL()
-XBT_PUBLIC(void) routing_model_create();
 XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
 XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
 SG_END_DECL()