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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 3687e16c0b..33d23ebef3 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -4,15 +4,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_interface.hpp"
+#include "cpu_ti.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
 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;
-
 namespace simgrid {
 namespace kernel {
 namespace resource {
@@ -51,26 +49,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(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::vector<double>& speed_per_pstate,
-         int core)
-    : Resource(host->get_cname())
-    , core_count_(core)
-    , host_(host)
-    , speed_per_pstate_(speed_per_pstate)
+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)
 {
-  this->set_model(model)->set_constraint(constraint);
-
-  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)
@@ -81,12 +65,7 @@ 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)
+Cpu* Cpu::set_pstate(int pstate_index)
 {
   xbt_assert(pstate_index <= static_cast<int>(speed_per_pstate_.size()),
              "Invalid parameters for CPU %s (pstate %d > length of pstates %d). Please fix your platform file, or your "
@@ -98,11 +77,7 @@ void Cpu::set_pstate(int pstate_index)
   speed_.peak = new_peak_speed;
 
   on_speed_change();
-}
-
-int Cpu::get_pstate() const
-{
-  return pstate_;
+  return this;
 }
 
 double Cpu::get_pstate_peak_speed(int pstate_index) const
@@ -113,20 +88,20 @@ double Cpu::get_pstate_peak_speed(int pstate_index) const
   return speed_per_pstate_[pstate_index];
 }
 
-double Cpu::get_speed(double load) const
+void Cpu::on_speed_change()
 {
-  return load * speed_.peak;
+  s4u::Host::on_speed_change(*piface_);
 }
 
-double Cpu::get_speed_ratio()
+Cpu* Cpu::set_core_count(int core_count)
 {
-/* number between 0 and 1 */
-  return speed_.scale;
-}
+  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());
+  if (dynamic_cast<CpuTiModel*>(get_model()) != nullptr)
+    xbt_assert(core_count == 1, "Multi-core not handled by this model yet");
 
-void Cpu::on_speed_change()
-{
-  s4u::Host::on_speed_change(*host_);
+  core_count_ = core_count;
+  return this;
 }
 
 int Cpu::get_core_count()
@@ -134,13 +109,22 @@ int Cpu::get_core_count()
   return core_count_;
 }
 
-void Cpu::set_speed_profile(kernel::profile::Profile* profile)
+Cpu* 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());
-
-  speed_.event = profile->schedule(&profile::future_evt_set, this);
+  if (profile) {
+    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);
+  }
+  return this;
 }
 
+void Cpu::seal()
+{
+  lmm::System* lmm = get_model()->get_maxmin_system();
+  if (dynamic_cast<CpuTiModel*>(get_model()) == nullptr)
+    this->set_constraint(lmm->constraint_new(this, core_count_ * speed_per_pstate_.front()));
+  Resource::seal();
+}
 
 /**********
  * Action *