sanitize the surf API

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

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 246b4f1..7b28ade 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -88,7 +88,7 @@ CpuCas01Model::~CpuCas01Model()
 }
 
 Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-                                 int pstate, double speedScale,
+                      int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
                           int initiallyOn,
                           tmgr_trace_t state_trace)
@@ -115,25 +115,15 @@ void CpuCas01Model::addTraces()
     return;
   called = 1;
 
-  /* connect all traces relative to hosts */
-  xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
+  /* connect host speed traces */
+  xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    CpuCas01 *host = static_cast<CpuCas01*>(sg_host_by_name(elm)->pimpl_cpu);
+    Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu;
 
-    xbt_assert(host, "Host %s undefined", elm);
+    xbt_assert(cpu, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
 
-    host->setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host));
-  }
-
-  xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
-    tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    CpuCas01 *host = static_cast<CpuCas01*>(sg_host_by_name(elm)->pimpl_cpu);
-
-    xbt_assert(host, "Host %s undefined", elm);
-    xbt_assert(trace, "Trace %s undefined", trace_name);
-
-    host->setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host));
+    cpu->set_speed_trace(trace);
   }
 }
 
@@ -144,20 +134,19 @@ CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t s
                          int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
                          int initiallyOn, tmgr_trace_t stateTrace)
 : Cpu(model, host,
-       lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)),
-       speedPeak, pstate,
-       core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
+  lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)),
+  speedPeak, pstate,
+  core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
     initiallyOn) {
-  p_speedEvent = NULL;
 
   XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
 
   m_core = core;
   if (speedTrace)
-    p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this);
+    p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this);
 
   if (stateTrace)
-    p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
+    p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
 }
 
 CpuCas01::~CpuCas01()
@@ -166,16 +155,6 @@ CpuCas01::~CpuCas01()
     xbt_dynar_free(&p_speedPeakList);
 }
 
-void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
-{
-  p_stateEvent = stateEvent;
-}
-
-void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
-{
-  p_speedEvent = powerEvent;
-}
-
 xbt_dynar_t CpuCas01::getSpeedPeakList(){
   return p_speedPeakList;
 }
@@ -187,8 +166,8 @@ bool CpuCas01::isUsed()
 
 /** @brief take into account changes of speed (either load or max) */
 void CpuCas01::onSpeedChange() {
-       lmm_variable_t var = NULL;
-       lmm_element_t elem = NULL;
+  lmm_variable_t var = NULL;
+  lmm_element_t elem = NULL;
 
     lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
                                 m_core * m_speedScale * m_speedPeak);
@@ -201,10 +180,10 @@ void CpuCas01::onSpeedChange() {
                                 m_speedScale * m_speedPeak);
     }
 
-       Cpu::onSpeedChange();
+  Cpu::onSpeedChange();
 }
 
-void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double date)
+void CpuCas01::updateState(tmgr_trace_iterator_t event_type, double value)
 {
   lmm_variable_t var = NULL;
   lmm_element_t elem = NULL;
@@ -216,8 +195,7 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
     m_speedScale = value;
     onSpeedChange();
 
-    if (tmgr_trace_event_free(event_type))
-      p_speedEvent = NULL;
+    tmgr_trace_event_unref(&p_speedEvent);
   } else if (event_type == p_stateEvent) {
     /* TODO (Hypervisor): do the same thing for constraint_core[i] */
     xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
@@ -228,6 +206,7 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
       turnOn();
     } else {
       lmm_constraint_t cnst = getConstraint();
+      double date = surf_get_clock();
 
       turnOff();
 
@@ -242,17 +221,15 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
         }
       }
     }
-    if (tmgr_trace_event_free(event_type))
-      p_stateEvent = NULL;
+    tmgr_trace_event_unref(&p_stateEvent);
   } else {
-    XBT_CRITICAL("Unknown event ! \n");
-    xbt_abort();
+    xbt_die("Unknown event!\n");
   }
 
   return;
 }
 
-CpuAction *CpuCas01::execute(double size)
+CpuAction *CpuCas01::execution_start(double size)
 {
 
   XBT_IN("(%s,%g)", getName(), size);
@@ -304,8 +281,8 @@ CpuAction *CpuCas01::sleep(double duration)
 
 CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint)
  : CpuAction(model, cost, failed,
-                    lmm_variable_new(model->getMaxminSystem(), this,
-                    1.0, speed, 1))
+         lmm_variable_new(model->getMaxminSystem(), this,
+         1.0, speed, 1))
 {
   if (model->getUpdateMechanism() == UM_LAZY) {
     m_indexHeap = -1;