X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b4dc02411d79e4c367d331b85c1b295ec41edff..27ea8d78c124dd6b7cdb649b8d2bb95dc16f4cde:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index c925dbfd4f..87f511931d 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,16 +1,17 @@
-/* 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 "StorageImpl.hpp"
-#include "cpu_interface.hpp"
-#include "network_interface.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/surf/PropertyHolder.hpp"
+#include "src/kernel/actor/ActorImpl.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>
 
@@ -29,8 +30,9 @@ class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
   HostModel() : Model(Model::UpdateAlgo::FULL) {}
 
-  virtual kernel::resource::Action* execute_parallel(size_t host_nb, sg_host_t* host_list, double* flops_amount,
-                                                     double* bytes_amount, double rate);
+  virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
+                                                     const double* flops_amount, const double* bytes_amount,
+                                                     double rate) = 0;
 };
 
 /************
@@ -38,38 +40,53 @@ 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 a Storage
  */
-class XBT_PRIVATE HostImpl : public simgrid::surf::PropertyHolder {
+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*, std::less<>> storage_;
+  std::vector<kernel::resource::DiskImpl*> disks_;
 
 public:
+  friend simgrid::vm::VirtualMachineImpl;
   explicit HostImpl(s4u::Host* host);
   virtual ~HostImpl();
 
+  std::vector<s4u::Disk*> get_disks() const;
+  void set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host);
+  void add_disk(const s4u::Disk* disk);
+  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();
+  std::unordered_map<std::string, s4u::Storage*>* get_mounted_storages();
+  void set_storages(const std::map<std::string, kernel::resource::StorageImpl*, std::less<>>& storages)
+  {
+    storage_ = storages;
+  }
 
-  std::map<std::string, simgrid::surf::StorageImpl*> storage_;
-  simgrid::s4u::Host* piface_ = nullptr;
+  s4u::Host* get_iface() const { return piface_; }
 
-  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<
+  using ActorList = 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>>
-      ActorList;
+                                    &kernel::actor::ActorImpl::host_actor_list_hook>>;
 
   // FIXME: make these private
-  ActorList process_list_;
-  std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+  ActorList actor_list_;
 };
 }
 }
 
 XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 
-#endif /* SURF_Host_INTERFACE_HPP_ */
+#endif /* SURF_HOST_INTERFACE_HPP */