seriously, me

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

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 0676724..f1c199d 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -35,7 +35,6 @@ class XBT_PRIVATE HostAction;
  *********/
 
 XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model;
-XBT_PUBLIC(void) host_add_traces();
 
 /*********
  * Model *
@@ -48,22 +47,21 @@ namespace surf {
  * @brief SURF Host model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class HostModel : public Model{
+class HostModel : public Model {
 public:
   HostModel() : Model() {}
-  ~HostModel() {}
+  ~HostModel() override {}
 
   Host *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props);
-  void addTraces() override {DIE_IMPOSSIBLE;}
 
   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;}
+  bool next_occuring_event_isIdempotent() override {return true;}
 };
 
 /************
@@ -74,10 +72,10 @@ public:
  * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
  */
 class Host :
-        public simgrid::surf::Resource,
-        public simgrid::surf::PropertyHolder {
+    public simgrid::surf::Resource,
+   public simgrid::surf::PropertyHolder {
 public:
-  static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
+  static simgrid::xbt::Extension<simgrid::s4u::Host, Host> EXTENSION_ID;
 
 public:
   static void classInit(); // must be called before the first use of that class
@@ -91,7 +89,7 @@ public:
    * @param cpu The Cpu associated to this Host
    */
   Host(HostModel *model, const char *name, xbt_dict_t props,
-                     xbt_dynar_t storage, Cpu *cpu);
+          xbt_dynar_t storage, Cpu *cpu);
 
   /**
    * @brief Host constructor
@@ -115,7 +113,7 @@ public:
   {
     return static_cast<HostModel*>(Resource::getModel());
   }
-  void attach(simgrid::Host* host);
+  void attach(simgrid::s4u::Host* host);
 
   bool isOn() override;
   bool isOff() override;
@@ -230,13 +228,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 apply_event(tmgr_trace_iterator_t event, double value) 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();
@@ -247,7 +245,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;
 };