X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4775ee0f232bccc4978dfbfb8153b7593be7dd77..5bc3597e1513c7b94497ae0ea819e5fa2e28058a:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index cd083646d2..763fe9841c 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -87,11 +87,8 @@ Host* Host::by_name_or_null(const char* name)
 }
 Host* Host::by_name_or_null(std::string name)
 {
-  try {
-    return host_list.at(name);
-  } catch (std::out_of_range& unfound) {
-    return nullptr;
-  }
+  auto host = host_list.find(name);
+  return host == host_list.end() ? nullptr : host->second;
 }
 
 Host *Host::current(){
@@ -160,7 +157,7 @@ void Host::routeTo(Host* dest, std::vector<Link*>* links, double* latency)
 {
   std::vector<surf::LinkImpl*> linkImpls;
   this->routeTo(dest, &linkImpls, latency);
-  for (surf::LinkImpl* l : linkImpls)
+  for (surf::LinkImpl* const& l : linkImpls)
     links->push_back(&l->piface_);
 }
 
@@ -171,7 +168,7 @@ void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* late
   if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
     XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", getCname(), dest->getCname(),
                (latency == nullptr ? -1 : *latency));
-    for (auto link : *links)
+    for (auto const& link : *links)
       XBT_CDEBUG(surf_route, "Link %s", link->cname());
   }
 }
@@ -251,12 +248,21 @@ std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()
 {
   if (mounts == nullptr) {
     mounts = new std::unordered_map<std::string, Storage*>();
-    for (auto m : this->pimpl_->storage_) {
+    for (auto const& m : this->pimpl_->storage_) {
       mounts->insert({m.first, &m.second->piface_});
     }
   }
   return *mounts;
 }
 
+void Host::execute(double flops)
+{
+  Host* host_list[1]   = {this};
+  double flops_list[1] = {flops};
+  smx_activity_t s     = simcall_execution_parallel_start(nullptr /*name*/, 1, host_list, flops_list,
+                                                      nullptr /*comm_sizes */, -1.0, -1 /*timeout*/);
+  simcall_execution_wait(s);
+}
+
 } // namespace simgrid
 } // namespace s4u