X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..b35d70d6818026204833410d2e3917252fa35127:/src/surf/vm_hl13.hpp

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 411620d99b..aba2143324 100644
--- a/src/surf/vm_hl13.hpp
+++ b/src/surf/vm_hl13.hpp
@@ -33,15 +33,15 @@ public:
   VMHL13Model();
   ~VMHL13Model(){};
 
-  VirtualMachine *createVM(const char *name, surf_resource_t host_PM);
+  VirtualMachine *createVM(const char *name, sg_host_t host_PM) override;
   double shareResources(double now);
-  void adjustWeightOfDummyCpuActions() {};
+  void adjustWeightOfDummyCpuActions() override {};
   Action *executeParallelTask(int host_nb,
                               sg_host_t *host_list,
 							  double *flops_amount,
 							  double *bytes_amount,
-							  double rate);
-  void updateActionsState(double /*now*/, double /*delta*/);
+							  double rate) override;
+  void updateActionsState(double /*now*/, double /*delta*/) override;
 };
 
 /************
@@ -50,31 +50,26 @@ public:
 
 class VMHL13 : public VirtualMachine {
 public:
-  VMHL13(VMModel *model, const char* name, xbt_dict_t props, surf_resource_t host_PM);
+  VMHL13(VMModel *model, const char* name, xbt_dict_t props, 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(surf_resource_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);
 
-  surf_resource_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);
 };
 
 /**********