X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ea1a3dca97a66f81466333806853c97af7eb398..78edc5d868c7cb88107abcdc887180ff15c5228f:/src/surf/ptask_L07.hpp

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 25364a291c..98d6940dca 100644
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -49,16 +49,16 @@ public:
   CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys);
   ~CpuL07Model();
 
-  Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
+  Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
   HostL07Model *hostModel_;
 };
 
-class NetworkL07Model : public NetworkModel {
+class NetworkL07Model : public kernel::resource::NetworkModel {
 public:
   NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys);
   ~NetworkL07Model();
-  LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
+  kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+                                          s4u::Link::SharingPolicy policy) override;
 
   kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 
@@ -71,12 +71,12 @@ public:
 
 class CpuL07 : public Cpu {
 public:
-  CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> * speedPerPstate, int core);
+  CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
   ~CpuL07() override;
   bool is_used() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
   kernel::resource::Action* execution_start(double size) override;
-  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
@@ -84,18 +84,18 @@ public:
   kernel::resource::Action* sleep(double duration) override;
 
 protected:
-  void onSpeedChange() override;
+  void on_speed_change() override;
 };
 
-class LinkL07 : public LinkImpl {
+class LinkL07 : public kernel::resource::LinkImpl {
 public:
   LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
-          e_surf_link_sharing_policy_t policy);
+          s4u::Link::SharingPolicy policy);
   ~LinkL07() override;
   bool is_used() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  void setBandwidth(double value) override;
-  void setLatency(double value) override;
+  void set_bandwidth(double value) override;
+  void set_latency(double value) override;
 };
 
 /**********