First round of refactoring in the event trace stuff

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

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 02f977f..ce2c066 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -33,8 +33,8 @@ class XBT_PRIVATE HostAction;
 /*********
  * Tools *
  *********/
+
 XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model;
-XBT_PUBLIC(void) host_add_traces();
 
 /*********
  * Model *
@@ -57,10 +57,10 @@ public:
 
   virtual void adjustWeightOfDummyCpuActions();
   virtual Action *executeParallelTask(int host_nb,
-                                      sg_host_t *host_list,
-                                                                         double *flops_amount,
-                                                                         double *bytes_amount,
-                                                                         double rate)=0;
+      sg_host_t *host_list,
+      double *flops_amount,
+      double *bytes_amount,
+      double rate);
 
   bool shareResourcesIsIdempotent() override {return true;}
 };
@@ -76,12 +76,7 @@ class Host :
         public simgrid::surf::Resource,
         public simgrid::surf::PropertyHolder {
 public:
-  static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
-
-  /* callbacks */
-  static simgrid::xbt::signal<void(Host*)> onCreation;    /** Called on each newly created object */
-  static simgrid::xbt::signal<void(Host*)> onDestruction; /** Called just before destructing an object */
-  static simgrid::xbt::signal<void(Host*)> onStateChange; /** Called when the machine is turned on or off */
+  static simgrid::xbt::Extension<simgrid::s4u::Host, Host> EXTENSION_ID;
 
 public:
   static void classInit(); // must be called before the first use of that class
@@ -112,20 +107,14 @@ public:
 
   /* Host destruction logic */
   /**************************/
-protected:
   ~Host();
-public:
-       void destroy(); // Must be called instead of the destructor
-private:
-       bool currentlyDestroying_ = false;
-
 
 public:
   HostModel *getModel()
   {
     return static_cast<HostModel*>(Resource::getModel());
   }
-  void attach(simgrid::Host* host);
+  void attach(simgrid::s4u::Host* host);
 
   bool isOn() override;
   bool isOff() override;
@@ -240,13 +229,13 @@ public:
   virtual int fileMove(surf_file_t fd, const char* fullpath);
 
   bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override
+  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override
     {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource
 
 public:
   xbt_dynar_t p_storage;
   Cpu *p_cpu;
-  simgrid::Host* p_host = nullptr;
+  simgrid::s4u::Host* p_host = nullptr;
 
   /** @brief Get the list of virtual machines on the current Host */
   xbt_dynar_t getVms();
@@ -257,7 +246,7 @@ public:
   void getParams(vm_params_t params);
   /** @brief Sets the params of that VM/PM */
   void setParams(vm_params_t params);
-  simgrid::Host* getHost() { return p_host; }
+  simgrid::s4u::Host* getHost() { return p_host; }
 private:
   s_vm_params_t p_params;
 };