simplify writing in model setup + may fix issue with unit-tests

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

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index fa0c5db..6ac9e5a 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,17 +1,16 @@
-/* Copyright (c) 2004-2019. 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. */
 
-#ifndef SURF_HOST_INTERFACE_HPP_
-#define SURF_HOST_INTERFACE_HPP_
+#ifndef SURF_HOST_INTERFACE_HPP
+#define SURF_HOST_INTERFACE_HPP
 
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
-#include "src/surf/PropertyHolder.hpp"
-#include "src/surf/StorageImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
+#include <xbt/PropertyHolder.hpp>
 
 #include <vector>
 
@@ -28,11 +27,10 @@ namespace surf {
  */
 class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
-  HostModel() : Model(Model::UpdateAlgo::FULL) {}
-
+  using Model::Model;
   virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
                                                      const double* flops_amount, const double* bytes_amount,
-                                                     double rate);
+                                                     double rate) = 0;
 };
 
 /************
@@ -40,48 +38,61 @@ 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 simgrid::surf::PropertyHolder {
+class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
+  using ActorList = 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 actor_list_;
   std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+  s4u::Host piface_;
+  std::vector<kernel::resource::DiskImpl*> 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();
+  explicit HostImpl(const std::string& name);
 
-  std::vector<s4u::Disk*> get_disks();
-  void add_disk(s4u::Disk* disk);
-  void remove_disk(const std::string& disk_name);
+  void destroy(); // Must be called instead of the destructor
 
-  /** @brief Get the vector of storages (by names) attached to the Host */
-  virtual std::vector<const char*> get_attached_storages();
+  std::vector<s4u::Disk*> get_disks() const;
+  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);
 
-  std::map<std::string, kernel::resource::StorageImpl*> storage_;
-  std::vector<kernel::resource::DiskImpl*> disks_;
+  virtual const s4u::Host* get_iface() const { return &piface_; }
+  virtual s4u::Host* get_iface() { return &piface_; }
 
-  s4u::Host* piface_ = nullptr;
+  /** 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();
-  void turn_off();
+  void turn_on() const;
+  void turn_off(const kernel::actor::ActorImpl* issuer);
   std::vector<s4u::ActorPtr> get_all_actors();
-  size_t get_actor_count();
+  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); }
 
-  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 surf
+} // namespace simgrid
 
-#endif /* SURF_Host_INTERFACE_HPP_ */
+#endif /* SURF_HOST_INTERFACE_HPP */