uniformize how CpuTI creates SpeedTrace with other models

[simgrid.git] / src / surf / cpu_ti.cpp

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 724a9c5..1b21c45 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -7,7 +7,6 @@
 #include "cpu_ti.hpp"
 #include "xbt/heap.h"
 #include "src/surf/trace_mgr.hpp"
-#include "src/surf/platform.hpp"
 
 #ifndef SURF_MODEL_CPUTI_H_
 #define SURF_MODEL_CPUTI_H_
@@ -416,20 +415,14 @@ CpuTiModel::~CpuTiModel()
 }
 
 Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
-                         xbt_dynar_t speedPeak,
-                         int pstate,
-                           double speedScale,
-                           tmgr_trace_t speedTrace,
-                           int core,
-                           int initiallyOn,
-                           tmgr_trace_t stateTrace)
+    xbt_dynar_t speedPeak,
+    tmgr_trace_t speedTrace,
+    int core)
 {
   xbt_assert(core==1,"Multi-core not handled with this model yet");
   xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
       "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
-  CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace,
-               core, initiallyOn, stateTrace);
-  return cpu;
+  return new CpuTi(this, host, speedPeak, speedTrace, core);
 }
 
 double CpuTiModel::next_occuring_event(double now)
@@ -472,61 +465,46 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/)
  * Resource *
  ************/
 CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-        int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
-        int initiallyOn, tmgr_trace_t stateTrace)
-  : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn)
+        tmgr_trace_t speedTrace, int core)
+  : Cpu(model, host, NULL, core, 0)
 {
   xbt_assert(core==1,"Multi-core not handled by this model yet");
-  m_core = core;
+  coresAmount_ = core;
 
-  p_speed.scale = speedScale;
-  availTrace_ = new CpuTiTgmr(speedTrace, speedScale);
 
   actionSet_ = new ActionTiList();
 
-  xbt_dynar_get_cpy(speedPeak, 0, &p_speed.peak);
-  XBT_DEBUG("CPU create: peak=%f", p_speed.peak);
+  xbt_dynar_get_cpy(speedPeak, 0, &speed_.peak);
+  XBT_DEBUG("CPU create: peak=%f", speed_.peak);
 
-  if (stateTrace)
-    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
-
-  if (speedTrace && xbt_dynar_length(speedTrace->event_list) > 1) {
-  s_tmgr_event_t val;
-    // add a fake trace event if periodicity == 0
-    xbt_dynar_get_cpy(speedTrace->event_list,
-                      xbt_dynar_length(speedTrace->event_list) - 1, &val);
-    if (val.delta == 0) {
-      p_speed.event =
-          future_evt_set->add_trace(tmgr_empty_trace_new(), availTrace_->lastTime_, this);
-    }
-  }
+  setSpeedTrace(speedTrace);
 }
 
 CpuTi::~CpuTi()
 {
   modified(false);
-  delete availTrace_;
+  delete speedIntegratedTrace_;
   delete actionSet_;
 }
-void CpuTi::set_speed_trace(tmgr_trace_t trace)
+void CpuTi::setSpeedTrace(tmgr_trace_t trace)
 {
-  if (availTrace_)
-    delete availTrace_;
+  if (speedIntegratedTrace_)
+    delete speedIntegratedTrace_;
 
-  availTrace_ = new CpuTiTgmr(trace, p_speed.scale);
+  speedIntegratedTrace_ = new CpuTiTgmr(trace, speed_.scale);
 
   /* add a fake trace event if periodicity == 0 */
   if (trace && xbt_dynar_length(trace->event_list) > 1) {
     s_tmgr_event_t val;
     xbt_dynar_get_cpy(trace->event_list, xbt_dynar_length(trace->event_list) - 1, &val);
     if (val.delta == 0)
-      p_speed.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this);
+      speed_.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this);
   }
 }
 
 void CpuTi::apply_event(tmgr_trace_iterator_t event, double value)
 {
-  if (event == p_speed.event) {
+  if (event == speed_.event) {
     tmgr_trace_t speedTrace;
     CpuTiTgmr *trace;
     s_tmgr_event_t val;
@@ -537,19 +515,19 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value)
 
     modified(true);
 
-    speedTrace = availTrace_->speedTrace_;
+    speedTrace = speedIntegratedTrace_->speedTrace_;
     xbt_dynar_get_cpy(speedTrace->event_list, xbt_dynar_length(speedTrace->event_list) - 1, &val);
-    delete availTrace_;
-    p_speed.scale = val.value;
+    delete speedIntegratedTrace_;
+    speed_.scale = val.value;
 
     trace = new CpuTiTgmr(TRACE_FIXED, val.value);
     XBT_DEBUG("value %f", val.value);
 
-    availTrace_ = trace;
+    speedIntegratedTrace_ = trace;
 
-    tmgr_trace_event_unref(&p_speed.event);
+    tmgr_trace_event_unref(&speed_.event);
 
-  } else if (event == p_stateEvent) {
+  } else if (event == stateEvent_) {
     if (value > 0) {
       if(isOff())
         xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
@@ -577,7 +555,7 @@ void CpuTi::apply_event(tmgr_trace_iterator_t event, double value)
         }
       }
     }
-    tmgr_trace_event_unref(&p_stateEvent);
+    tmgr_trace_event_unref(&stateEvent_);
 
   } else {
     xbt_die("Unknown event!\n");
@@ -625,9 +603,9 @@ void CpuTi::updateActionsFinishTime(double now)
           (action->getRemains()) * sum_priority *
            action->getPriority();
 
-      total_area /= p_speed.peak;
+      total_area /= speed_.peak;
 
-      action->setFinishTime(availTrace_->solve(now, total_area));
+      action->setFinishTime(speedIntegratedTrace_->solve(now, total_area));
       /* verify which event will happen before (max_duration or finish time) */
       if (action->getMaxDuration() != NO_MAX_DURATION &&
           action->getStartTime() + action->getMaxDuration() < action->m_finish)
@@ -667,7 +645,7 @@ bool CpuTi::isUsed()
 
 double CpuTi::getAvailableSpeed()
 {
-  p_speed.scale = availTrace_->getPowerScale(surf_get_clock());
+  speed_.scale = speedIntegratedTrace_->getPowerScale(surf_get_clock());
   return Cpu::getAvailableSpeed();
 }
 
@@ -680,7 +658,7 @@ void CpuTi::updateRemainingAmount(double now)
     return;
 
   /* compute the integration area */
-  double area_total = availTrace_->integrate(lastUpdate_, now) * p_speed.peak;
+  double area_total = speedIntegratedTrace_->integrate(lastUpdate_, now) * speed_.peak;
   XBT_DEBUG("Flops total: %f, Last update %f", area_total, lastUpdate_);
 
   for(ActionTiList::iterator it(actionSet_->begin()), itend(actionSet_->end()) ; it != itend ; ++it) {