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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 0c33ed9f53..a15bc1faab 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -8,7 +8,7 @@
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, resource, "CPU resource");
+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;
@@ -51,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_T(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)
@@ -79,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()),
@@ -98,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())),
@@ -111,20 +89,17 @@ 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(not is_sealed(), "Core count cannot be changed once CPU has been sealed");
+  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()
@@ -134,11 +109,15 @@ 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);
 }
 
+void Cpu::seal()
+{
+  Resource::seal();
+}
 
 /**********
  * Action *