make piface_ private and have get_iface() everywhere

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

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 791b135..3de2ae6 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -43,14 +43,17 @@ public:
  * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
  */
 class XBT_PRIVATE HostImpl : public simgrid::surf::PropertyHolder {
+  std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+  s4u::Host* piface_ = nullptr; // FIXME: why don't we store a s4u::Host here as we do everywhere else?
 
 public:
+  friend simgrid::vm::VirtualMachineImpl;
   explicit HostImpl(s4u::Host* host);
   virtual ~HostImpl();
 
   std::vector<s4u::Disk*> get_disks();
   void add_disk(s4u::Disk* disk);
-  void remove_disk(std::string disk_name);
+  void remove_disk(const std::string& disk_name);
 
   /** @brief Get the vector of storages (by names) attached to the Host */
   virtual std::vector<const char*> get_attached_storages();
@@ -58,22 +61,24 @@ public:
   std::map<std::string, kernel::resource::StorageImpl*> storage_;
   std::vector<kernel::resource::DiskImpl*> disks_;
 
-  s4u::Host* piface_ = nullptr;
+  s4u::Host* get_iface() { return piface_; }
 
   void turn_on();
-  void turn_off();
+  void turn_off(kernel::actor::ActorImpl* issuer);
   std::vector<s4u::ActorPtr> get_all_actors();
   size_t get_actor_count();
+  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_process_list_hook>>
+                                    &kernel::actor::ActorImpl::host_actor_list_hook>>
       ActorList;
 
   // FIXME: make these private
-  ActorList process_list_;
-  std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+  ActorList actor_list_;
 };
 }
 }