Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 04075eb..3bcd9b8 100644 (file)
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -34,13 +34,8 @@ public:
   ~VMHL13Model(){};
 
   VirtualMachine *createVM(const char *name, sg_host_t host_PM) override;
-  double shareResources(double now);
+  double next_occuring_event(double now) override;
   void adjustWeightOfDummyCpuActions() override {};
-  Action *executeParallelTask(int host_nb,
-                              sg_host_t *host_list,
-                                                         double *flops_amount,
-                                                         double *bytes_amount,
-                                                         double rate) override;
   void updateActionsState(double /*now*/, double /*delta*/) override;
 };
 
@@ -50,8 +45,8 @@ public:
 
 class VMHL13 : public VirtualMachine {
 public:
-  VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t host_PM);
-  ~VMHL13() {}
+  VMHL13(VMModel *model, const char* name, sg_host_t host_PM);
+  ~VMHL13();
 
   void suspend() override;
   void resume() override;
@@ -61,8 +56,8 @@ public:
 
   void migrate(sg_host_t ind_dst_pm) override;
 
-  void setBound(double bound);
-  void setAffinity(Cpu *cpu, unsigned long mask);
+  void setBound(double bound) override;
+  void setAffinity(Cpu *cpu, unsigned long mask) override;
 };
 
 /**********