[ptask] kill the last global: the maxmin system is now registered as the one of all...

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

diff --git a/src/surf/vm_hl13.hpp b/src/surf/vm_hl13.hpp
index 411620d..2244a38 100644 (file)
--- 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,22 +50,20 @@ 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);