X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46b3f69b83f27f9958a26e19b21ce4be64914d71..4c18091c2618f718dcd672ed8391572eeb80ad99:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 6cbbe10fcc..f3a5247e08 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,8 +8,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_cpu, ker_resource, "CPU resource, fueling execution activites");
 
 simgrid::kernel::resource::CpuModel* surf_cpu_model_pm;
 simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
@@ -26,10 +25,10 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/)
 {
   while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
     auto* action = static_cast<CpuAction*>(get_action_heap().pop());
-    XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
+    XBT_DEBUG("Something happened to action %p", action);
 
     action->finish(kernel::resource::Action::State::FINISHED);
-    XBT_CDEBUG(surf_kernel, "Action %p finished", action);
+    XBT_DEBUG("Action %p finished", action);
   }
 }
 
@@ -52,24 +51,12 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta)
 /************
  * Resource *
  ************/
-Cpu::Cpu(Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
-    : Cpu(model, host, nullptr /*constraint*/, speed_per_pstate, core)
+Cpu::Cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+    : Resource(host->get_cname()), piface_(host), speed_per_pstate_(speed_per_pstate)
 {
-}
-
-Cpu::Cpu(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::vector<double>& speed_per_pstate,
-         int core)
-    : Resource(model, host->get_cname(), constraint)
-    , core_count_(core)
-    , host_(host)
-    , speed_per_pstate_(speed_per_pstate)
-{
-  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname());
-
-  speed_.peak     = speed_per_pstate_.front();
   speed_.scale = 1;
+  speed_.peak     = speed_per_pstate_.front();
   host->pimpl_cpu = this;
-  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->get_cname());
 }
 
 void Cpu::reset_vcpu(Cpu* that)
@@ -80,11 +67,6 @@ void Cpu::reset_vcpu(Cpu* that)
   this->speed_per_pstate_.assign(that->speed_per_pstate_.begin(), that->speed_per_pstate_.end());
 }
 
-int Cpu::get_pstate_count() const
-{
-  return speed_per_pstate_.size();
-}
-
 void Cpu::set_pstate(int pstate_index)
 {
   xbt_assert(pstate_index <= static_cast<int>(speed_per_pstate_.size()),
@@ -99,11 +81,6 @@ void Cpu::set_pstate(int pstate_index)
   on_speed_change();
 }
 
-int Cpu::get_pstate() const
-{
-  return pstate_;
-}
-
 double Cpu::get_pstate_peak_speed(int pstate_index) const
 {
   xbt_assert((pstate_index <= static_cast<int>(speed_per_pstate_.size())),
@@ -112,20 +89,16 @@ double Cpu::get_pstate_peak_speed(int pstate_index) const
   return speed_per_pstate_[pstate_index];
 }
 
-double Cpu::get_speed(double load) const
-{
-  return load * speed_.peak;
-}
-
-double Cpu::get_speed_ratio()
+void Cpu::on_speed_change()
 {
-/* number between 0 and 1 */
-  return speed_.scale;
+  s4u::Host::on_speed_change(*piface_);
 }
 
-void Cpu::on_speed_change()
+Cpu* Cpu::set_core_count(int core_count)
 {
-  s4u::Host::on_speed_change(*host_);
+  xbt_assert(core_count > 0, "Host %s must have at least one core, not 0.", piface_->get_cname());
+  core_count_ = core_count;
+  return this;
 }
 
 int Cpu::get_core_count()
@@ -135,12 +108,11 @@ int Cpu::get_core_count()
 
 void Cpu::set_speed_profile(kernel::profile::Profile* profile)
 {
-  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
+  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", piface_->get_cname());
 
   speed_.event = profile->schedule(&profile::future_evt_set, this);
 }
 
-
 /**********
  * Action *
  **********/
@@ -154,11 +126,11 @@ void CpuAction::update_remains_lazy(double now)
   double delta = now - get_last_update();
 
   if (get_remains_no_update() > 0) {
-    XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
-               get_last_update());
+    XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
+              get_last_update());
     update_remains(get_last_value() * delta);
 
-    XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update());
+    XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update());
   }
 
   set_last_update();
@@ -196,7 +168,7 @@ std::list<Cpu*> CpuAction::cpus() const
     /* Beware of composite actions: ptasks put links and cpus together */
     // extra pb: we cannot dynamic_cast from void*...
     Resource* resource = get_variable()->get_constraint(i)->get_id();
-    Cpu* cpu           = dynamic_cast<Cpu*>(resource);
+    auto* cpu          = dynamic_cast<Cpu*>(resource);
     if (cpu != nullptr)
       retlist.push_back(cpu);
   }