X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b4740f2c34e232bcf203b9407af5637acaecaec..74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 13ce41348d..d6f78f78e5 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -20,35 +20,34 @@ namespace simgrid {
   /* List of links */
   std::unordered_map<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
 
-  LinkImpl* LinkImpl::byName(const char* name)
+  LinkImpl* LinkImpl::byName(std::string name)
   {
-    if (links->find(name) == links->end())
-      return nullptr;
-    return links->at(name);
+    auto link = links->find(name);
+    return link == links->end() ? nullptr : link->second;
   }
   /** @brief Returns the amount of links in the platform */
   int LinkImpl::linksCount()
   {
     return links->size();
+  }
+  /** @brief Returns a list of all existing links */
+  LinkImpl** LinkImpl::linksList()
+  {
+    LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
+    int i          = 0;
+    for (auto const& kv : *links) {
+      res[i] = kv.second;
+      i++;
     }
-    /** @brief Returns a list of all existing links */
-    LinkImpl** LinkImpl::linksList()
-    {
-      LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
-      int i          = 0;
-      for (auto kv : *links) {
-        res[i] = kv.second;
-        i++;
-      }
-      return res;
-    }
-    /** @brief destructor of the static data */
-    void LinkImpl::linksExit()
-    {
-      for (auto kv : *links)
-        (kv.second)->destroy();
-      delete links;
-    }
+    return res;
+  }
+  /** @brief destructor of the static data */
+  void LinkImpl::linksExit()
+  {
+    for (auto const& kv : *links)
+      (kv.second)->destroy();
+    delete links;
+  }
   }
 }
 
@@ -104,7 +103,7 @@ namespace simgrid {
     {
 
       if (strcmp(name,"__loopback__"))
-        xbt_assert(!LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name);
+        xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name);
 
       latency_.scale   = 1;
       bandwidth_.scale = 1;
@@ -125,7 +124,7 @@ namespace simgrid {
      */
     void LinkImpl::destroy()
     {
-      if (!currentlyDestroying_) {
+      if (not currentlyDestroying_) {
         currentlyDestroying_ = true;
         s4u::Link::onDestruction(this->piface_);
         delete this;
@@ -169,17 +168,17 @@ namespace simgrid {
     void LinkImpl::setStateTrace(tmgr_trace_t trace)
     {
       xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", cname());
-      stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
+      stateEvent_ = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
     {
       xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", cname());
-      bandwidth_.event = future_evt_set->add_trace(trace, 0.0, this);
+      bandwidth_.event = future_evt_set->add_trace(trace, this);
     }
     void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
     {
       xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", cname());
-      latency_.event = future_evt_set->add_trace(trace, 0.0, this);
+      latency_.event = future_evt_set->add_trace(trace, this);
     }
 
 
@@ -198,7 +197,7 @@ namespace simgrid {
     {
       std::list<LinkImpl*> retlist;
       lmm_system_t sys = getModel()->getMaxminSystem();
-      int llen         = lmm_get_number_of_cnst_from_var(sys, getVariable());
+      int llen         = lmm_get_number_of_cnst_from_var(sys, variable_);
 
       for (int i = 0; i < llen; i++) {
         /* Beware of composite actions: ptasks put links and cpus together */