X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90559b37332c0f396c09fd1c75326cfbdbbe5dc1..02dd785d0212ccd8376c2ce4fd931942232fcafb:/src/surf/ptask_L07.hpp

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index f235b8c9b3..80a1fa41f0 100644
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -10,7 +10,7 @@
 
 #include <xbt/base.h>
 
-#include "host_interface.hpp"
+#include "src/surf/HostImpl.hpp"
 
 #ifndef HOST_L07_HPP_
 #define HOST_L07_HPP_
@@ -54,10 +54,7 @@ public:
   CpuL07Model(HostL07Model *hmodel,lmm_system_t sys);
   ~CpuL07Model();
 
-  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPeakList,
-                          double speedScale,
-                          tmgr_trace_t speedTrace, int core,
-                          tmgr_trace_t state_trace) override;
+  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPerPstate, int core) override;
   HostL07Model *p_hostModel;
 };
 
@@ -65,17 +62,11 @@ class NetworkL07Model : public NetworkModel {
 public:
   NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
   ~NetworkL07Model();
-  Link* createLink(const char *name,
-      double bw_initial,
-      tmgr_trace_t bw_trace,
-      double lat_initial,
-      tmgr_trace_t lat_trace,
-      int initiallyOn,
-      tmgr_trace_t state_trace,
+  Link* createLink(const char *name, double bandwidth, double latency,
       e_surf_link_sharing_policy_t policy,
       xbt_dict_t properties) override;
 
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
+  Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate) override;
   bool next_occuring_event_isIdempotent() override {return true;}
 
   HostL07Model *p_hostModel;
@@ -87,9 +78,7 @@ public:
 
 class CpuL07 : public Cpu {
 public:
-  CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList,
-     double power_scale, tmgr_trace_t power_trace,
-     int core, tmgr_trace_t state_trace);
+  CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedList, int core);
   ~CpuL07();
   bool isUsed() override;
   void apply_event(tmgr_trace_iterator_t event, double value) override;
@@ -102,13 +91,7 @@ protected:
 class LinkL07 : public Link {
 public:
   LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
-      double bw_initial,
-          tmgr_trace_t bw_trace,
-          double lat_initial,
-          tmgr_trace_t lat_trace,
-          int initiallyOn,
-          tmgr_trace_t state_trace,
-          e_surf_link_sharing_policy_t policy);
+      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;
@@ -139,7 +122,7 @@ public:
 
   int unref() override;
 
-  std::vector<NetCard*> * p_netcardList = new std::vector<NetCard*>();
+  std::vector<routing::NetCard*> * p_netcardList = new std::vector<routing::NetCard*>();
   double *p_computationAmount;
   double *p_communicationAmount;
   double m_latency;