X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd769219531a772284d75320187a0ef9f8118afd..e292a614483e53608932312a1c68a87063ea8600:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index b53f31255f..a4b3e23078 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -95,45 +95,32 @@ namespace simgrid {
     simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
     simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;
 
-    simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
+    simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::Action::State, simgrid::surf::Action::State)> networkActionStateChangedCallbacks;
     simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
 
   }
 }
 
 void netlink_parse_init(sg_platf_link_cbarg_t link){
-  if (link->policy == SURF_LINK_FULLDUPLEX) {
-    char *link_id;
-    link_id = bprintf("%s_UP", link->id);
-    Link *l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
-        link->policy, link->properties);
-    if (link->latency_trace)
-      l->setLatencyTrace(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->setBandwidthTrace(link->bandwidth_trace);
-    if (link->state_trace)
-      l->setStateTrace(link->state_trace);
+  std::vector<char*> names;
 
-    xbt_free(link_id);
-    link_id = bprintf("%s_DOWN", link->id);
-    l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
-        link->policy, link->properties);
-    if (link->latency_trace)
-      l->setLatencyTrace(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->setBandwidthTrace(link->bandwidth_trace);
-    if (link->state_trace)
-      l->setStateTrace(link->state_trace);
-    xbt_free(link_id);
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    names.push_back(bprintf("%s_UP", link->id));
+    names.push_back(bprintf("%s_DOWN", link->id));
   } else {
-    Link *l=surf_network_model->createLink(link->id, link->bandwidth, link->latency,
-        link->policy, link->properties);
+    names.push_back(xbt_strdup(link->id));
+  }
+  for (auto link_name : names) {
+    Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties);
+
     if (link->latency_trace)
       l->setLatencyTrace(link->latency_trace);
     if (link->bandwidth_trace)
       l->setBandwidthTrace(link->bandwidth_trace);
     if (link->state_trace)
       l->setStateTrace(link->state_trace);
+
+    xbt_free(link_name);
   }
 }
 
@@ -169,8 +156,8 @@ namespace simgrid {
       for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
           ; it != itend ; ++it) {
         action = static_cast<NetworkAction*>(&*it);
-        if (action->m_latency > 0) {
-          minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency);
+        if (action->latency_ > 0) {
+          minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);
         }
       }
 
@@ -198,6 +185,9 @@ namespace simgrid {
     : Resource(model, name, constraint),
       PropertyHolder(props)
     {
+      if (strcmp(name,"__loopback__"))
+        xbt_assert(!Link::byName(name), "Link '%s' declared several times in the platform.", name);
+
       m_latency.scale = 1;
       m_bandwidth.scale = 1;
 
@@ -275,8 +265,8 @@ namespace simgrid {
      * Action *
      **********/
 
-    void NetworkAction::setState(e_surf_action_state_t state){
-      e_surf_action_state_t old = getState();
+    void NetworkAction::setState(Action::State state){
+      Action::State old = getState();
       Action::setState(state);
       networkActionStateChangedCallbacks(this, old, state);
     }