Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 585e0a8..bdac362 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -51,21 +51,19 @@ public:
   ~CpuL07Model();
 
   Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
-  HostL07Model *p_hostModel;
+  HostL07Model *hostModel_;
 };
 
 class NetworkL07Model : public NetworkModel {
 public:
   NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
   ~NetworkL07Model();
-  Link* createLink(const char *name, double bandwidth, double latency,
-      e_surf_link_sharing_policy_t policy,
-      xbt_dict_t properties) override;
+  LinkImpl* createLink(const char* name, double bandwidth, double latency,
+                       e_surf_link_sharing_policy_t policy) override;
 
-  Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
-  bool next_occuring_event_isIdempotent() override {return true;}
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 
-  HostL07Model *p_hostModel;
+  HostL07Model *hostModel_;
 };
 
 /************
@@ -84,15 +82,15 @@ protected:
   void onSpeedChange() override;
 };
 
-class LinkL07 : public Link {
+class LinkL07 : public LinkImpl {
 public:
-  LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
-      double bandwidth, double latency, e_surf_link_sharing_policy_t policy);
+  LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency,
+          e_surf_link_sharing_policy_t policy);
   ~LinkL07(){ };
   bool isUsed() override;
   void apply_event(tmgr_trace_iterator_t event, double value) override;
-  void updateBandwidth(double value) override;
-  void updateLatency(double value) override;
+  void setBandwidth(double value) override;
+  void setLatency(double value) override;
 };
 
 /**********
@@ -111,11 +109,11 @@ public:
 
   int unref() override;
 
-  std::vector<kernel::routing::NetCard*> * p_netcardList = new std::vector<kernel::routing::NetCard*>();
-  double *p_computationAmount;
-  double *p_communicationAmount;
-  double m_latency;
-  double m_rate;
+  std::vector<s4u::Host*>* hostList_ = new std::vector<s4u::Host*>();
+  double *computationAmount_;
+  double *communicationAmount_;
+  double latency_;
+  double rate_;
 };
 
 }