X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bac7d0f735ac8ba47a46e1db4f6d7a7164fe0f2..bfed90d7c58bf90f06017312bc82965a416986eb:/src/surf/vm_hl13.hpp

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index ca0f38026a..54642d3f4e 100644
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -33,14 +33,9 @@ public:
   VMHL13Model();
   ~VMHL13Model(){};
 
-  VirtualMachine *createVM(const char *name, sg_host_t host_PM) override;
-  double shareResources(double now);
+  s4u::Host *createVM(const char *name, sg_host_t host_PM) override;
+  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,31 +45,18 @@ public:
 
 class VMHL13 : public VirtualMachine {
 public:
-  VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t host_PM);
+  VMHL13(VMModel *model, const char* name, sg_host_t host_PM);
   ~VMHL13();
 
-  void suspend();
-  void resume();
+  void suspend() override;
+  void resume() override;
 
-  void save();
-  void restore();
+  void save() override;
+  void restore() override;
 
-  void migrate(sg_host_t ind_dst_pm);
+  void migrate(sg_host_t ind_dst_pm) override;
 
-  e_surf_resource_state_t getState();
-  void setState(e_surf_resource_state_t state);
-
-  sg_host_t getPm(); // will be vm_ws_get_pm()
-
-  void setBound(double bound);
-  void setAffinity(Cpu *cpu, unsigned long mask);
-
-  //FIXME: remove
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-  bool isUsed();
-
-  Action *execute(double size);
-  Action *sleep(double duration);
+  void setBound(double bound) override;
 };
 
 /**********