uniformize one step of the link creation in Cste

When netlink_parse_init() will be called by every model, it will be
inlined instead of being the exact same callback in any case

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index ce90e8a..d5601f0 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -19,15 +19,19 @@ void surf_network_model_init_Constant()
 
   routing_model_create(NULL);
 
 
   routing_model_create(NULL);
 

-  simgrid::surf::on_link.connect([](sg_platf_link_cbarg_t link){
-    xbt_die("There is no link in the Constant network model. "
-        "Please remove any link from your platform (and switch to routing='None')");
-  });
+  simgrid::surf::on_link.connect(netlink_parse_init);

 }
 
 namespace simgrid {
   namespace surf {
 
 }
 
 namespace simgrid {
   namespace surf {
 

+    Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
+        xbt_dict_t properties) {
+
+      xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
+          "Please remove any link from your platform (and switch to routing='None')", name);
+    }
+

     double NetworkConstantModel::next_occuring_event(double /*now*/)
     {
       NetworkConstantAction *action = NULL;
     double NetworkConstantModel::next_occuring_event(double /*now*/)
     {
       NetworkConstantAction *action = NULL;

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 9848e7a..a15b173 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -34,8 +34,7 @@ namespace simgrid {
       bool next_occuring_event_isIdempotent() override {return true;}
       void updateActionsState(double now, double delta) override;
 
       bool next_occuring_event_isIdempotent() override {return true;}
       void updateActionsState(double now, double delta) override;
 

-      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override
-        { DIE_IMPOSSIBLE; }
+      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;

     };
 
     /**********
     };
 
     /**********