No more types for models.

[simgrid.git] / src / surf / HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 0d3bfc9..d6547d5 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,9 +8,7 @@
 
 #include <string>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
-
-simgrid::surf::HostModel *surf_host_model = nullptr;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_host, ker_resource, "Host resources agregate CPU, networking and I/O features");
 
 /*************
  * Callbacks *t
@@ -36,7 +34,7 @@ HostImpl::~HostImpl()
 {
   /* All actors should be gone when the host is turned off (by the end of the simulation). */
   if (not actor_list_.empty()) {
-    std::string msg = std::string("Shutting down host, but it's not empty:");
+    std::string msg = "Shutting down host, but it's not empty:";
     for (auto const& actor : actor_list_)
       msg += "\n\t" + std::string(actor.get_name());
 
@@ -73,7 +71,7 @@ void HostImpl::turn_on() const
 }
 
 /** Kill all actors hosted here */
-void HostImpl::turn_off(kernel::actor::ActorImpl* issuer)
+void HostImpl::turn_off(const kernel::actor::ActorImpl* issuer)
 {
   for (auto& actor : actor_list_) {
     XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(),
@@ -95,7 +93,7 @@ std::vector<s4u::ActorPtr> HostImpl::get_all_actors()
 {
   std::vector<s4u::ActorPtr> res;
   for (auto& actor : actor_list_)
-    res.push_back(actor.ciface());
+    res.emplace_back(actor.get_ciface());
   return res;
 }
 size_t HostImpl::get_actor_count() const
@@ -113,7 +111,7 @@ std::vector<s4u::Disk*> HostImpl::get_disks() const
 
 void HostImpl::set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host)
 {
-  disks_ = std::move(disks);
+  disks_ = disks;
   for (auto d : disks_)
     d->set_host(host);
 }
@@ -135,21 +133,5 @@ void HostImpl::remove_disk(const std::string& disk_name)
   }
 }
 
-std::vector<const char*> HostImpl::get_attached_storages()
-{
-  std::vector<const char*> storages;
-  for (auto const& s : storage_)
-    if (s.second->get_host() == piface_->get_cname())
-      storages.push_back(s.second->get_iface()->get_cname());
-  return storages;
-}
-std::unordered_map<std::string, s4u::Storage*>* HostImpl::get_mounted_storages()
-{
-  std::unordered_map<std::string, s4u::Storage*>* mounts = new std::unordered_map<std::string, s4u::Storage*>();
-  for (auto const& m : storage_) {
-    mounts->insert({m.first, m.second->get_iface()});
-  }
-  return mounts;
-}
 } // namespace surf
 } // namespace simgrid