X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94f91fddf6aa49b80b881571a2575f1ab3c67755..7ff60387c9140b46ec6bbcefe3897e9238bca79d:/src/surf/host_interface.hpp

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 01ceeb6c9d..236ccdb038 100644
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -52,7 +52,7 @@ public:
   HostModel() : Model() {}
   ~HostModel() {}
 
-  Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu, xbt_dict_t props);
+  Host *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props);
   void addTraces() override {DIE_IMPOSSIBLE;}
 
   virtual void adjustWeightOfDummyCpuActions();
@@ -81,7 +81,7 @@ public:
   /* callbacks */
   static simgrid::surf::signal<void(Host*)> onCreation;    /** Called on each newly created object */
   static simgrid::surf::signal<void(Host*)> onDestruction; /** Called just before destructing an object */
-  static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
+  static simgrid::surf::signal<void(Host*)> onStateChange; /** Called when the machine is turned on or off */
 
 public:
   static void classInit(); // must be called before the first use of that class
@@ -92,11 +92,10 @@ public:
    * @param name The name of the Host
    * @param props Dictionary of properties associated to this Host
    * @param storage The Storage associated to this Host
-   * @param netElm The RoutingEdge associated to this Host
    * @param cpu The Cpu associated to this Host
    */
   Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
-		      xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu);
+		      xbt_dynar_t storage, Cpu *cpu);
 
   /**
    * @brief Host constructor
@@ -106,12 +105,10 @@ public:
    * @param props Dictionary of properties associated to this Host
    * @param constraint The lmm constraint associated to this Host if it is part of a LMM component
    * @param storage The Storage associated to this Host
-   * @param netElm The RoutingEdge associated to this Host
    * @param cpu The Cpu associated to this Host
    */
   Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
-      lmm_constraint_t constraint, xbt_dynar_t storage, RoutingEdge *netElm,
-      Cpu *cpu);
+      lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu);
 
   /* Host destruction logic */
   /**************************/
@@ -126,8 +123,10 @@ private:
 public:
   void attach(simgrid::Host* host);
 
-  e_surf_resource_state_t getState();
-  void setState(e_surf_resource_state_t state);
+  bool isOn() override;
+  bool isOff() override;
+  void turnOn() override;
+  void turnOff() override;
 
   /** @brief Return the storage of corresponding mount point */
   virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage);
@@ -242,7 +241,6 @@ public:
 
 public:
   xbt_dynar_t p_storage;
-  RoutingEdge *p_netElm;
   Cpu *p_cpu;
   simgrid::Host* p_host = nullptr;