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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 3c2bb7e818..6034eaeea1 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -12,8 +12,7 @@
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
-    "Logging specific to the SURF network module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module");
 
 /*********
  * C API *
@@ -64,12 +63,9 @@ namespace simgrid {
 
     boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
     Link *Link::byName(const char* name) {
-      Link * res = NULL;
-      try {
-        res = links->at(name);
-      } catch (std::out_of_range& e) {}
-
-      return res;
+      if (links->find(name) == links->end())
+        return NULL;
+      return  links->at(name);
     }
     /** @brief Returns the amount of links in the platform */
     int Link::linksCount() {
@@ -106,38 +102,25 @@ namespace simgrid {
 }
 
 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);
   }
 }
 
@@ -168,7 +151,7 @@ namespace simgrid {
       ActionList *runningActions = surf_network_model->getRunningActionSet();
       double minRes;
 
-      minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
+      minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
 
       for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
           ; it != itend ; ++it) {