X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 3325fd34ce..a0a1892549 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -3,23 +3,15 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "surf_interface.hpp"
 #include "cpu_interface.hpp"
 #include "network_interface.hpp"
 #include "src/surf/PropertyHolder.hpp"
 
 #include "StorageImpl.hpp"
-#include <xbt/base.h>
 
 #ifndef SURF_HOST_INTERFACE_HPP_
 #define SURF_HOST_INTERFACE_HPP_
 
-/*********
- * Tools *
- *********/
-
-XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-
 /*********
  * Model *
  *********/
@@ -33,11 +25,11 @@ namespace surf {
  */
 class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
-  HostModel() : Model() {}
+  HostModel() : Model(Model::UpdateAlgo::FULL) {}
 
-  virtual void ignoreEmptyVmInPmLMM();
-  virtual kernel::resource::Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
-                                                        double* bytes_amount, double rate);
+  virtual void ignore_empty_vm_in_pm_LMM();
+  virtual kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                     double* bytes_amount, double rate);
 };
 
 /************
@@ -54,14 +46,14 @@ public:
   virtual ~HostImpl() = default;
 
   /** @brief Get the vector of storages (by names) attached to the Host */
-  virtual void getAttachedStorageList(std::vector<const char*>* storages);
+  virtual std::vector<const char*> get_attached_storages();
 
   std::map<std::string, simgrid::surf::StorageImpl*> storage_;
   simgrid::s4u::Host* piface_ = nullptr;
-
-  simgrid::s4u::Host* getHost() { return piface_; }
 };
 }
 }
 
+XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
+
 #endif /* SURF_Host_INTERFACE_HPP_ */