X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/503aa37006d22d261b792dd00d526976fafa7052..6c56800bdad43cabb6c870c9163bbeea694d6692:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 6e3404f197..0dcc24d81f 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -7,17 +7,16 @@
 #define SURF_HOST_INTERFACE_HPP
 
 #include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
-#include "src/surf/StorageImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 #include <xbt/PropertyHolder.hpp>
 
 #include <vector>
 
 namespace simgrid {
-namespace surf {
-
+namespace kernel {
+namespace resource {
 /*********
  * Model *
  *********/
@@ -26,13 +25,11 @@ namespace surf {
  * @brief SURF Host model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class XBT_PRIVATE HostModel : public kernel::resource::Model {
+class XBT_PRIVATE HostModel : public Model {
 public:
-  HostModel() : Model(Model::UpdateAlgo::FULL) {}
-
-  virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
-                                                     const double* flops_amount, const double* bytes_amount,
-                                                     double rate) = 0;
+  using Model::Model;
+  virtual Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+                                   const double* bytes_amount, double rate) = 0;
 };
 
 /************
@@ -40,51 +37,62 @@ public:
  ************/
 /** @ingroup SURF_host_interface
  * @brief SURF Host interface class
- * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
+ * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s)
  */
 class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
-  std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
-  s4u::Host* piface_ = nullptr; // we must have a pointer there because the VM wants to change the piface in its ctor
-  std::map<std::string, kernel::resource::StorageImpl*> storage_;
-  std::vector<kernel::resource::DiskImpl*> disks_;
+  using ActorList =
+      boost::intrusive::list<actor::ActorImpl,
+                             boost::intrusive::member_hook<actor::ActorImpl, boost::intrusive::list_member_hook<>,
+                                                           &actor::ActorImpl::host_actor_list_hook>>;
+
+  ActorList actor_list_;
+  std::vector<actor::ProcessArg*> actors_at_boot_;
+  s4u::Host piface_;
+  std::map<std::string, DiskImpl*, std::less<>> disks_;
+  xbt::string name_{"noname"};
+  bool sealed_ = false;
+
+protected:
+  virtual ~HostImpl(); // Use destroy() instead of this destructor.
+  HostImpl(const std::string& name, s4u::Host* piface);
 
 public:
-  friend simgrid::vm::VirtualMachineImpl;
-  explicit HostImpl(s4u::Host* host);
-  virtual ~HostImpl();
+  friend VirtualMachineImpl;
+  explicit HostImpl(const std::string& name);
+
+  void destroy(); // Must be called instead of the destructor
 
   std::vector<s4u::Disk*> get_disks() const;
-  void set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host);
+  s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth);
   void add_disk(const s4u::Disk* disk);
-  void remove_disk(const std::string& disk_name);
+  void remove_disk(const std::string& name);
 
-  /** @brief Get the vector of storages (by names) attached to the Host */
-  virtual std::vector<const char*> get_attached_storages();
-  std::unordered_map<std::string, s4u::Storage*>* get_mounted_storages();
-  void set_storages(const std::map<std::string, kernel::resource::StorageImpl*>& storages) { storage_ = storages; }
+  virtual const s4u::Host* get_iface() const { return &piface_; }
+  virtual s4u::Host* get_iface() { return &piface_; }
 
-  s4u::Host* get_iface() { return piface_; }
+  /** Retrieves the name of that host as a C++ string */
+  xbt::string const& get_name() const { return name_; }
+  /** Retrieves the name of that host as a C string */
+  const char* get_cname() const { return name_.c_str(); }
 
   void turn_on() const;
-  void turn_off(const kernel::actor::ActorImpl* issuer);
+  void turn_off(const actor::ActorImpl* issuer);
   std::vector<s4u::ActorPtr> get_all_actors();
   size_t get_actor_count() const;
-  void add_actor(kernel::actor::ActorImpl* actor) { actor_list_.push_back(*actor); }
-  void remove_actor(kernel::actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); }
-  void add_actor_at_boot(kernel::actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); }
+  void add_actor(actor::ActorImpl* actor) { actor_list_.push_back(*actor); }
+  void remove_actor(actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); }
+  void add_actor_at_boot(actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); }
 
-  typedef boost::intrusive::list<
-      kernel::actor::ActorImpl,
-      boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
-                                    &kernel::actor::ActorImpl::host_actor_list_hook>>
-      ActorList;
+  void seal();
 
-  // FIXME: make these private
-  ActorList actor_list_;
+  template <class F> void foreach_actor(F function)
+  {
+    for (auto& actor : actor_list_)
+      function(actor);
+  }
 };
-}
-}
-
-XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
 
-#endif /* SURF_HOST_INTERFACE_HPP */
+#endif /* HOST_INTERFACE_HPP */