further rename power to speed in surf internals

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

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index 2bdcb97..40d0fa5 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -46,16 +46,15 @@ public:
                                                          double rate);
   xbt_dynar_t getRoute(Host *src, Host *dst);
   void addTraces();
-  NetworkModel *p_networkModel;
 };
 
 class CpuL07Model : public CpuModel {
 public:
   CpuL07Model(HostL07Model *hmodel) : CpuModel() {p_hostModel = hmodel;};
   ~CpuL07Model() {surf_cpu_model_pm = NULL;};
-  Cpu *createCpu(const char *name,  xbt_dynar_t powerPeak,
-                          int pstate, double power_scale,
-                          tmgr_trace_t power_trace, int core,
+  Cpu *createCpu(const char *name,  xbt_dynar_t speedPeak,
+                          int pstate, double speedScale,
+                          tmgr_trace_t speedTrace, int core,
                           e_surf_resource_state_t state_initial,
                           tmgr_trace_t state_trace,
                           xbt_dict_t cpu_properties);
@@ -103,7 +102,7 @@ public:
 class CpuL07 : public Cpu {
   friend void HostL07Model::addTraces();
   tmgr_trace_event_t p_stateEvent;
-  tmgr_trace_event_t p_powerEvent;
+  tmgr_trace_event_t p_speedEvent;
 public:
   CpuL07(CpuL07Model *model, const char* name, xbt_dict_t properties,
                 double power_scale, double power_initial, tmgr_trace_t power_trace,
@@ -137,12 +136,9 @@ public:
   bool isUsed();
   void updateState(tmgr_trace_event_t event_type, double value, double date);
   double getBandwidth();
-  double getLatency();
   void updateBandwidth(double value, double date=surf_get_clock());
   void updateLatency(double value, double date=surf_get_clock());
 
-  double m_latCurrent;
-  tmgr_trace_event_t p_latEvent;
   double m_bwCurrent;
   tmgr_trace_event_t p_bwEvent;
 };