reindent

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

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 6c8f440..008a0c0 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -8,7 +8,6 @@
 #include "cpu_ti.hpp"
 #include "maxmin_private.hpp"
 #include "simgrid/sg_config.h"
-#include "src/surf/platform.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
                                 "Logging specific to the SURF CPU IMPROVED module");
@@ -32,10 +31,6 @@ void surf_cpu_model_init_Cas01()
 
   surf_cpu_model_vm  = new simgrid::surf::CpuCas01Model();
   xbt_dynar_push(all_existing_models, &surf_cpu_model_vm);
-
-  simgrid::surf::on_postparse.connect([]() {
-    surf_cpu_model_pm->addTraces();
-  });
 }
 
 namespace simgrid {
@@ -88,15 +83,12 @@ CpuCas01Model::~CpuCas01Model()
 }
 
 Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-                      int pstate, double speedScale,
-                          tmgr_trace_t speedTrace, int core,
-                          int initiallyOn,
-                          tmgr_trace_t state_trace)
+     tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace)
 {
   xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
       "Speed has to be >0.0. Did you forget to specify the mandatory power attribute?");
   xbt_assert(core > 0, "Invalid number of cores %d. Must be larger than 0", core);
-  Cpu *cpu = new CpuCas01(this, host, speedPeak, pstate, speedScale, speedTrace, core, initiallyOn, state_trace);
+  Cpu *cpu = new CpuCas01(this, host, speedPeak, speedTrace, core, state_trace);
   return cpu;
 }
 
@@ -105,38 +97,15 @@ double CpuCas01Model::next_occuring_event_full(double /*now*/)
   return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve);
 }
 
-void CpuCas01Model::addTraces()
-{
-  xbt_dict_cursor_t cursor = NULL;
-  char *trace_name, *elm;
-  static int called = 0;
-  if (called)
-    return;
-  called = 1;
-
-  /* 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);
-    Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu;
-
-    xbt_assert(cpu, "Host %s undefined", elm);
-    xbt_assert(trace, "Trace %s undefined", trace_name);
-
-    cpu->set_speed_trace(trace);
-  }
-}
-
 /************
  * Resource *
  ************/
 CpuCas01::CpuCas01(CpuCas01Model *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)
+    tmgr_trace_t speedTrace, int core,  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,
-    initiallyOn) {
+    lmm_constraint_new(model->getMaxminSystem(), this, core * xbt_dynar_get_as(speedPeak, 0/*pstate*/, double)),
+    speedPeak, core, xbt_dynar_get_as(speedPeak, 0/*pstate*/, double))
+{
 
   XBT_DEBUG("CPU create: peak=%f, pstate=%d", p_speed.peak, m_pstate);
 
@@ -184,9 +153,6 @@ void CpuCas01::onSpeedChange() {
 
 void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value)
 {
-  lmm_variable_t var = NULL;
-  lmm_element_t elem = NULL;
-
   if (event == p_speed.event) {
     /* TODO (Hypervisor): do the same thing for constraint_core[i] */
     xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]");
@@ -205,6 +171,8 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value)
       turnOn();
     } else {
       lmm_constraint_t cnst = getConstraint();
+      lmm_variable_t var = NULL;
+      lmm_element_t elem = NULL;
       double date = surf_get_clock();
 
       turnOff();
@@ -221,11 +189,10 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value)
       }
     }
     tmgr_trace_event_unref(&p_stateEvent);
+
   } else {
     xbt_die("Unknown event!\n");
   }
-
-  return;
 }
 
 CpuAction *CpuCas01::execution_start(double size)