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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 788dff2cf3..91cf686226 100644
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.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. */
@@ -10,10 +10,11 @@
 #include "surf/surf.hpp"
 
 #include <algorithm>
+#include <memory>
 
 constexpr double EPSILON = 0.000000001;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, res_cpu, "CPU resource, Trace Integration model");
 
 namespace simgrid {
 namespace kernel {
@@ -63,21 +64,20 @@ double CpuTiTmgr::integrate(double a, double b) const
     return (b - a) * value_;
   }
 
-  int a_index;
+  double a_index;
   if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON)
-    a_index = 1 + static_cast<int>(ceil(a / last_time_));
+    a_index = 1 + ceil(a / last_time_);
   else
-    a_index = static_cast<int>(ceil(a / last_time_));
-
-  int b_index = static_cast<int>(floor(b / last_time_));
+    a_index = ceil(a / last_time_);
+  double b_index = floor(b / last_time_);
 
   if (a_index > b_index) {      /* Same chunk */
-    return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_);
+    return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - b_index * last_time_);
   }
 
   double first_chunk  = profile_->integrate_simple(a - (a_index - 1) * last_time_, last_time_);
   double middle_chunk = (b_index - a_index) * total_;
-  double last_chunk   = profile_->integrate_simple(0.0, b - (b_index)*last_time_);
+  double last_chunk   = profile_->integrate_simple(0.0, b - b_index * last_time_);
 
   XBT_DEBUG("first_chunk=%.2f  middle_chunk=%.2f  last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk);
 
@@ -154,11 +154,11 @@ double CpuTiTmgr::solve(double a, double amount) const
 
   XBT_DEBUG("amount %f total %f", amount, total_);
   /* Reduce the problem to one where amount <= trace_total */
-  int quotient = static_cast<int>(floor(amount / total_));
+  double quotient       = floor(amount / total_);
   double reduced_amount = (total_) * ((amount / total_) - floor(amount / total_));
   double reduced_a      = a - (last_time_) * static_cast<int>(floor(a / last_time_));
 
-  XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
+  XBT_DEBUG("Quotient: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
 
   /* Now solve for new_amount which is <= trace_total */
   double reduced_b;
@@ -172,7 +172,7 @@ double CpuTiTmgr::solve(double a, double amount) const
   }
 
   /* Re-map to the original b and amount */
-  return (last_time_) * static_cast<int>(floor(a / last_time_)) + (quotient * last_time_) + reduced_b;
+  return last_time_ * floor(a / last_time_) + (quotient * last_time_) + reduced_b;
 }
 
 /**
@@ -239,7 +239,7 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp
   for (auto const& val : speed_profile->event_list)
     total_time += val.date_;
 
-  profile_.reset(new CpuTiProfile(speed_profile));
+  profile_   = std::make_unique<CpuTiProfile>(speed_profile);
   last_time_ = total_time;
   total_     = profile_->integrate_simple(0, total_time);
 
@@ -324,9 +324,10 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/)
  * Resource *
  ************/
 CpuTi::CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
-    : Cpu(model, host, speed_per_pstate, core)
+    : Cpu(host, speed_per_pstate)
 {
   xbt_assert(core == 1, "Multi-core not handled by this model yet");
+  this->set_model(model);
 
   speed_.peak = speed_per_pstate.front();
   XBT_DEBUG("CPU create: peak=%f", speed_.peak);
@@ -374,11 +375,11 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value)
   } else if (event == state_event_) {
     if (value > 0) {
       if (not is_on()) {
-        XBT_VERB("Restart actors on host %s", get_host()->get_cname());
-        get_host()->turn_on();
+        XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
+        get_iface()->turn_on();
       }
     } else {
-      get_host()->turn_off();
+      get_iface()->turn_off();
       double date = surf_get_clock();
 
       /* put all action running on cpu to failed */
@@ -458,7 +459,7 @@ void CpuTi::update_actions_finish_time(double now)
   set_modified(false);
 }
 
-bool CpuTi::is_used()
+bool CpuTi::is_used() const
 {
   return not action_set_.empty();
 }