move all inst declarations into their namespace

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 282b59f..026fcbb 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -54,7 +54,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
         smaller = action->getLastUpdate();
     }
     if (smaller > 0) {
-      TRACE_last_timestamp_to_dump = smaller;
+      simgrid::instr::TRACE_last_timestamp_to_dump = smaller;
     }
   }
 }
@@ -74,7 +74,7 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 
       TRACE_surf_host_set_utilization(cpu->cname(), action->getCategory(), lmm_variable_getvalue(action->getVariable()),
                                       now - delta, delta);
-      TRACE_last_timestamp_to_dump = now - delta;
+      simgrid::instr::TRACE_last_timestamp_to_dump = now - delta;
     }
 
     action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
@@ -100,17 +100,17 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPs
 
 Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
          int core)
-    : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host)
+    : Resource(model, host->getCname(), constraint), coresAmount_(core), host_(host)
 {
-  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());
+  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->getCname());
 
   speed_.peak = speedPerPstate->front();
   speed_.scale = 1;
   host->pimpl_cpu = this;
-  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());
+  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->getCname());
 
   // Copy the power peak array:
-  for (double value : *speedPerPstate) {
+  for (double const& value : *speedPerPstate) {
     speedPerPstate_.push_back(value);
   }
 }
@@ -170,13 +170,13 @@ int Cpu::coreCount()
 
 void Cpu::setStateTrace(tmgr_trace_t trace)
 {
-  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());
+  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->getCname());
 
   stateEvent_ = future_evt_set->add_trace(trace, this);
 }
 void Cpu::setSpeedTrace(tmgr_trace_t trace)
 {
-  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());
+  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->getCname());
 
   speed_.event = future_evt_set->add_trace(trace, this);
 }
@@ -210,6 +210,18 @@ void CpuAction::updateRemainingLazy(double now)
 
 simgrid::xbt::signal<void(simgrid::surf::CpuAction*, Action::State)> CpuAction::onStateChange;
 
+void CpuAction::suspend(){
+  Action::State previous = getState();
+  onStateChange(this, previous);
+  Action::suspend();
+}
+
+void CpuAction::resume(){
+  Action::State previous = getState();
+  onStateChange(this, previous);
+  Action::resume();
+}
+
 void CpuAction::setState(Action::State state){
   Action::State previous = getState();
   Action::setState(state);