X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d2995483b57463581ffdc4365fe1999ddc306c2..2f3c9cf811c7c608eb49a3ee14411a887b6a99c8:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 6672d7afdd..d48e4bb14e 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. 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. */
@@ -6,11 +6,12 @@
 #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,9 +30,9 @@ class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
   HostModel() : Model(Model::UpdateAlgo::FULL) {}
 
-  virtual void ignore_empty_vm_in_pm_LMM();
-  virtual kernel::resource::Action* execute_parallel(int 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;
 };
 
 /************
@@ -41,33 +42,43 @@ public:
  * @brief SURF Host interface class
  * @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 {
+class XBT_PRIVATE HostImpl : public xbt::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(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::map<std::string, simgrid::surf::StorageImpl*> storage_;
-  simgrid::s4u::Host* piface_ = nullptr;
+  std::map<std::string, kernel::resource::StorageImpl*> storage_;
+  std::vector<kernel::resource::DiskImpl*> disks_;
+
+  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();
-  int get_actor_count();
+  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*> auto_restart_processes_;
-  std::vector<kernel::actor::ProcessArg*> boot_processes_;
+  ActorList actor_list_;
 };
 }
 }