X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba5e509f6ff4c2d1ef9cb834e3275e43610d28f6..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 9f8e4bfe91..3d7be6fc91 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -12,8 +12,6 @@
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
 
-void_f_void_t surf_cpu_model_init_preparse = nullptr;
-
 simgrid::surf::CpuModel *surf_cpu_model_pm;
 simgrid::surf::CpuModel *surf_cpu_model_vm;
 
@@ -107,11 +105,6 @@ void CpuModel::updateActionsStateFull(double now, double delta)
   }
 }
 
-bool CpuModel::next_occuring_event_isIdempotent()
-{
-  return true;
-}
-
 /************
  * Resource *
  ************/
@@ -120,18 +113,16 @@ 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->name().c_str(), constraint)
- , coresAmount_(core)
- , host_(host)
+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)
 {
-  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str());
+  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());
 
   speed_.peak = speedPerPstate->front();
   speed_.scale = 1;
   host->pimpl_cpu = this;
-  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str());
+  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());
 
   // Copy the power peak array:
   for (double value : *speedPerPstate) {
@@ -193,20 +184,20 @@ void Cpu::onSpeedChange() {
   TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak);
 }
 
-int Cpu::getCoreCount()
+int Cpu::coreCount()
 {
   return coresAmount_;
 }
 
 void Cpu::setStateTrace(tmgr_trace_t trace)
 {
-  xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str());
+  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());
 
   stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
 }
 void Cpu::setSpeedTrace(tmgr_trace_t trace)
 {
-  xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str());
+  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());
 
   speed_.event = future_evt_set->add_trace(trace, 0.0, this);
 }