Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix misspelling of "occurring".
[simgrid.git] / src / surf / cpu_ti.cpp
index c9abf60..b97d8fa 100644 (file)
+/* Copyright (c) 2013-2019. 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. */
+
 #include "cpu_ti.hpp"
-#include "solver.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
+
+#include <algorithm>
 
-#ifndef SURF_MODEL_CPUTI_H_
-#define SURF_MODEL_CPUTI_H_
+constexpr double EPSILON = 0.000000001;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_tii, surf,
-                                "Logging specific to the SURF CPU TRACE INTEGRATION module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
 
-static std::vector<CpuTiActionPtr>
-    cpu_ti_running_action_set_that_does_not_need_being_checked;
-static std::vector<CpuTiPtr> cpu_ti_modified_cpu;
-static std::vector<CpuTiActionPtr> cpu_ti_action_heap;
+namespace simgrid {
+namespace kernel {
+namespace resource {
 
 /*********
  * Trace *
  *********/
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
-                                          double a, double b);
-
-
-static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
-                                      double amount);
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
-                                                      trace, double a,
-                                                      double amount);
 
-static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace);
-
-static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
-                                                 double a, double b);
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
-                                                       trace, double a);
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
-                                             double a, double amount);
-static int surf_cpu_ti_binary_search(double *array, double a, int low,
-                                     int high);
-
-static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
+CpuTiProfile::CpuTiProfile(profile::Profile* profile)
 {
-  xbt_free(trace->time_points);
-  xbt_free(trace->integral);
-  xbt_free(trace);
-}
-
-static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace)
-{
-  if (trace->trace)
-    surf_cpu_ti_free_trace(trace->trace);
-  xbt_free(trace);
-}
-
-static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace)
-{
-  surf_cpu_ti_trace_t trace;
-  s_tmgr_event_t val;
-  unsigned int cpt;
   double integral = 0;
   double time = 0;
-  int i = 0;
-  trace = xbt_new0(s_surf_cpu_ti_trace_t, 1);
-  trace->time_points = (double*) xbt_malloc0(sizeof(double) *
-                  (xbt_dynar_length(power_trace->s_list.event_list) + 1));
-  trace->integral = (double*) xbt_malloc0(sizeof(double) *
-                  (xbt_dynar_length(power_trace->s_list.event_list) + 1));
-  trace->nb_points = xbt_dynar_length(power_trace->s_list.event_list);
-  xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
-    trace->time_points[i] = time;
-    trace->integral[i] = integral;
-    integral += val.delta * val.value;
-    time += val.delta;
-    i++;
+  unsigned nb_points = profile->event_list.size() + 1;
+  time_points_.reserve(nb_points);
+  integral_.reserve(nb_points);
+  for (auto const& val : profile->event_list) {
+    time_points_.push_back(time);
+    integral_.push_back(integral);
+    time += val.date_;
+    integral += val.date_ * val.value_;
   }
-  trace->time_points[i] = time;
-  trace->integral[i] = integral;
-  return trace;
+  time_points_.push_back(time);
+  integral_.push_back(integral);
 }
 
 /**
-* \brief Integrate trace
-*
-* Wrapper around surf_cpu_integrate_trace_simple() to get
-* the cyclic effect.
-*
-* \param trace Trace structure.
-* \param a      Begin of interval
-* \param b      End of interval
-* \return the integrate value. -1 if an error occurs.
-*/
-static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
-                                          double a, double b)
-{
-  double first_chunk;
-  double middle_chunk;
-  double last_chunk;
-  int a_index, b_index;
-
+ * @brief Integrate trace
+ *
+ * Wrapper around surf_cpu_integrate_trace_simple() to get
+ * the cyclic effect.
+ *
+ * @param a      Begin of interval
+ * @param b      End of interval
+ * @return the integrate value. -1 if an error occurs.
+ */
+double CpuTiTmgr::integrate(double a, double b)
+{
   if ((a < 0.0) || (a > b)) {
-    XBT_CRITICAL
-        ("Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative computation amount. Check your code.",
-         a, b);
-    xbt_abort();
+    xbt_die("Error, invalid integration interval [%.2f,%.2f]. "
+        "You probably have a task executing with negative computation amount. Check your code.", a, b);
   }
-  if (a == b)
+  if (fabs(a - b) < EPSILON)
     return 0.0;
 
-  if (trace->type == TRACE_FIXED) {
-    return ((b - a) * trace->value);
+  if (type_ == Type::FIXED) {
+    return (b - a) * value_;
   }
 
-  if (ceil(a / trace->last_time) == a / trace->last_time)
-    a_index = 1 + (int) (ceil(a / trace->last_time));
+  int a_index;
+  if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON)
+    a_index = 1 + static_cast<int>(ceil(a / last_time_));
   else
-    a_index = (int) (ceil(a / trace->last_time));
+    a_index = static_cast<int>(ceil(a / last_time_));
 
-  b_index = (int) (floor(b / trace->last_time));
+  int b_index = static_cast<int>(floor(b / last_time_));
 
   if (a_index > b_index) {      /* Same chunk */
-    return surf_cpu_ti_integrate_trace_simple(trace->trace,
-                                              a - (a_index -
-                                                   1) * trace->last_time,
-                                              b -
-                                              (b_index) *
-                                              trace->last_time);
+    return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_);
   }
 
-  first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
-                                                   a - (a_index -
-                                                        1) *
-                                                   trace->last_time,
-                                                   trace->last_time);
-  middle_chunk = (b_index - a_index) * trace->total;
-  last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace,
-                                                  0.0,
-                                                  b -
-                                                  (b_index) *
-                                                  trace->last_time);
-
-  XBT_DEBUG("first_chunk=%.2f  middle_chunk=%.2f  last_chunk=%.2f\n",
-         first_chunk, middle_chunk, last_chunk);
+  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_);
+
+  XBT_DEBUG("first_chunk=%.2f  middle_chunk=%.2f  last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk);
 
   return (first_chunk + middle_chunk + last_chunk);
 }
 
 /**
- * \brief Auxiliary function to calculate the integral between a and b.
- *     It simply calculates the integral at point a and b and returns the difference 
- *   between them.
- * \param trace    Trace structure
- * \param a        Initial point
- * \param b  Final point
- * \return  Integral
-*/
-static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
-                                                 double a, double b)
-{
-  return surf_cpu_ti_integrate_trace_simple_point(trace,
-                                                  b) -
-      surf_cpu_ti_integrate_trace_simple_point(trace, a);
+ * @brief Auxiliary function to compute the integral between a and b.
+ *     It simply computes the integrals at point a and b and returns the difference between them.
+ * @param a  Initial point
+ * @param b  Final point
+ */
+double CpuTiProfile::integrate_simple(double a, double b)
+{
+  return integrate_simple_point(b) - integrate_simple_point(a);
 }
 
 /**
- * \brief Auxiliary function to calculate the integral at point a.
- * \param trace    Trace structure
- * \param a        point
- * \return  Integral
-*/
-static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
-                                                       trace, double a)
+ * @brief Auxiliary function to compute the integral at point a.
+ * @param a        point
+ */
+double CpuTiProfile::integrate_simple_point(double a)
 {
   double integral = 0;
-  int ind;
   double a_aux = a;
-  ind =
-      surf_cpu_ti_binary_search(trace->time_points, a, 0,
-                                trace->nb_points - 1);
-  integral += trace->integral[ind];
-  XBT_DEBUG
-      ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
-       a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
-       trace->time_points[ind + 1], trace->time_points[ind]);
-  double_update(&a_aux, trace->time_points[ind]);
+  int ind         = binary_search(time_points_, a);
+  integral += integral_[ind];
+
+  XBT_DEBUG("a %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f", a, ind, integral, integral_[ind + 1],
+            integral_[ind], time_points_[ind + 1], time_points_[ind]);
+  double_update(&a_aux, time_points_[ind], sg_maxmin_precision * sg_surf_precision);
   if (a_aux > 0)
     integral +=
-        ((trace->integral[ind + 1] -
-          trace->integral[ind]) / (trace->time_points[ind + 1] -
-                                   trace->time_points[ind])) * (a -
-                                                                trace->
-                                                                time_points
-                                                                [ind]);
-  XBT_DEBUG("Integral a %lf = %lf", a, integral);
+        ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind])) * (a - time_points_[ind]);
+  XBT_DEBUG("Integral a %f = %f", a, integral);
 
   return integral;
 }
 
 /**
-* \brief Calculate the time needed to execute "amount" on cpu.
-*
-* Here, amount can span multiple trace periods
-*
-* \param trace   CPU trace structure
-* \param a        Initial time
-* \param amount  Amount to be executed
-* \return  End time
-*/
-static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
-                                      double amount)
-{
-  int quotient;
-  double reduced_b;
-  double reduced_amount;
-  double reduced_a;
-  double b;
-
-/* Fix very small negative numbers */
+ * @brief Computes the time needed to execute "amount" on cpu.
+ *
+ * Here, amount can span multiple trace periods
+ *
+ * @param a        Initial time
+ * @param amount  Amount to be executed
+ * @return  End time
+ */
+double CpuTiTmgr::solve(double a, double amount)
+{
+  /* Fix very small negative numbers */
   if ((a < 0.0) && (a > -EPSILON)) {
     a = 0.0;
   }
@@ -220,293 +136,510 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
     amount = 0.0;
   }
 
-/* Sanity checks */
+  /* Sanity checks */
   if ((a < 0.0) || (amount < 0.0)) {
-    XBT_CRITICAL
-        ("Error, invalid parameters [a = %.2f, amount = %.2f]. You probably have a task executing with negative computation amount. Check your code.",
-         a, amount);
+    XBT_CRITICAL ("Error, invalid parameters [a = %.2f, amount = %.2f]. "
+        "You probably have a task executing with negative computation amount. Check your code.", a, amount);
     xbt_abort();
   }
 
-/* At this point, a and amount are positive */
-
+  /* At this point, a and amount are positive */
   if (amount < EPSILON)
     return a;
 
-/* Is the trace fixed ? */
-  if (trace->type == TRACE_FIXED) {
-    return (a + (amount / trace->value));
+  /* Is the trace fixed ? */
+  if (type_ == Type::FIXED) {
+    return (a + (amount / value_));
   }
 
-  XBT_DEBUG("amount %lf total %lf", amount, trace->total);
-/* Reduce the problem to one where amount <= trace_total */
-  quotient = (int) (floor(amount / trace->total));
-  reduced_amount = (trace->total) * ((amount / trace->total) -
-                                     floor(amount / trace->total));
-  reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time));
-
-  XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
-         reduced_amount, reduced_a);
-
-/* Now solve for new_amount which is <= trace_total */
-/*
-   fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
-   fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
- */
-  reduced_b =
-      surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
-                                              reduced_amount);
+  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 reduced_amount = (total_) * ((amount / total_) - floor(amount / total_));
+  double reduced_a      = a - (last_time_) * static_cast<int>(floor(a / last_time_));
 
-/* Re-map to the original b and amount */
-  b = (trace->last_time) * (int) (floor(a / trace->last_time)) +
-      (quotient * trace->last_time) + reduced_b;
-  return b;
-}
+  XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
 
-/**
-* \brief Auxiliary function to solve integral
-*
-* Here, amount is <= trace->total
-* and a <=trace->last_time
-*
-*/
-static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
-                                                      trace, double a,
-                                                      double amount)
-{
-  double amount_till_end;
-  double b;
-
-  XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount);
-  amount_till_end =
-      surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
-/*
-   fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
- */
+  /* Now solve for new_amount which is <= trace_total */
+  double reduced_b;
+  XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", reduced_a, reduced_amount);
+  double amount_till_end = integrate(reduced_a, last_time_);
 
-  if (amount_till_end > amount) {
-    b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount);
+  if (amount_till_end > reduced_amount) {
+    reduced_b = profile_->solve_simple(reduced_a, reduced_amount);
   } else {
-    b = trace->last_time +
-        surf_cpu_ti_solve_trace_simple(trace->trace, 0.0,
-                                       amount - amount_till_end);
+    reduced_b = last_time_ + profile_->solve_simple(0.0, reduced_amount - amount_till_end);
   }
-  return b;
+
+  /* Re-map to the original b and amount */
+  return (last_time_) * static_cast<int>(floor(a / last_time_)) + (quotient * last_time_) + reduced_b;
 }
 
 /**
- * \brief Auxiliary function to solve integral.
+ * @brief Auxiliary function to solve integral.
  *  It returns the date when the requested amount of flops is available
- * \param trace    Trace structure
- * \param a        Initial point
- * \param amount  Amount of flops 
- * \return The date when amount is available.
-*/
-static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
-                                             double a, double amount)
-{
-  double integral_a;
-  int ind;
-  double time;
-  integral_a = surf_cpu_ti_integrate_trace_simple_point(trace, a);
-  ind =
-      surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0,
-                                trace->nb_points - 1);
-  time = trace->time_points[ind];
-  time +=
-      (integral_a + amount -
-       trace->integral[ind]) / ((trace->integral[ind + 1] -
-                                 trace->integral[ind]) /
-                                (trace->time_points[ind + 1] -
-                                 trace->time_points[ind]));
+ * @param a        Initial point
+ * @param amount  Amount of flops
+ * @return The date when amount is available.
+ */
+double CpuTiProfile::solve_simple(double a, double amount)
+{
+  double integral_a = integrate_simple_point(a);
+  int ind           = binary_search(integral_, integral_a + amount);
+  double time       = time_points_[ind];
+  time += (integral_a + amount - integral_[ind]) /
+          ((integral_[ind + 1] - integral_[ind]) / (time_points_[ind + 1] - time_points_[ind]));
 
   return time;
 }
 
 /**
-* \brief Creates a new integration trace from a tmgr_trace_t
-*
-* \param  power_trace    CPU availability trace
-* \param  value          Percentage of CPU power available (useful to fixed tracing)
-* \param  spacing        Initial spacing
-* \return  Integration trace structure
-*/
-static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
-                                             double value)
-{
-  surf_cpu_ti_tgmr_t trace;
+ * @brief Auxiliary function to update the CPU speed scale.
+ *
+ *  This function uses the trace structure to return the speed scale at the determined time a.
+ * @param a        Time
+ * @return CPU speed scale
+ */
+double CpuTiTmgr::get_power_scale(double a)
+{
+  double reduced_a          = a - floor(a / last_time_) * last_time_;
+  int point                       = CpuTiProfile::binary_search(profile_->time_points_, reduced_a);
+  kernel::profile::DatedValue val = speed_profile_->event_list.at(point);
+  return val.value_;
+}
+
+/**
+ * @brief Creates a new integration trace from a tmgr_trace_t
+ *
+ * @param  speed_trace    CPU availability trace
+ * @param  value          Percentage of CPU speed available (useful to fixed tracing)
+ * @return  Integration trace structure
+ */
+CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : speed_profile_(speed_profile)
+{
   double total_time = 0.0;
-  s_tmgr_event_t val;
-  unsigned int cpt;
-  trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
-
-/* no availability file, fixed trace */
-  if (!power_trace) {
-    trace->type = TRACE_FIXED;
-    trace->value = value;
-    XBT_DEBUG("No availabily trace. Constant value = %lf", value);
-    return trace;
+  profile_.reset(nullptr);
+
+  /* no availability file, fixed trace */
+  if (not speed_profile) {
+    type_  = Type::FIXED;
+    value_ = value;
+    XBT_DEBUG("No availability trace. Constant value = %f", value);
+    return;
   }
 
   /* only one point available, fixed trace */
-  if (xbt_dynar_length(power_trace->s_list.event_list) == 1) {
-    xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val);
-    trace->type = TRACE_FIXED;
-    trace->value = val.value;
-    return trace;
+  if (speed_profile->event_list.size() == 1) {
+    type_  = Type::FIXED;
+    value_ = speed_profile->event_list.front().value_;
+    return;
   }
 
-  trace->type = TRACE_DYNAMIC;
-  trace->power_trace = power_trace;
+  type_ = Type::DYNAMIC;
 
   /* count the total time of trace file */
-  xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
-    total_time += val.delta;
-  }
-  trace->trace = surf_cpu_ti_trace_new(power_trace);
-  trace->last_time = total_time;
-  trace->total =
-      surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
+  for (auto const& val : speed_profile->event_list)
+    total_time += val.date_;
 
-  XBT_DEBUG("Total integral %lf, last_time %lf ",
-         trace->total, trace->last_time);
+  profile_.reset(new CpuTiProfile(speed_profile));
+  last_time_ = total_time;
+  total_     = profile_->integrate_simple(0, total_time);
 
-  return trace;
+  XBT_DEBUG("Total integral %f, last_time %f ", total_, last_time_);
 }
 
 /**
- * \brief Binary search in array.
- *  It returns the first point of the interval in which "a" is. 
- * \param array    Array
- * \param a        Value to search
- * \param low     Low bound to search in array
- * \param high    Upper bound to search in array
- * \return Index of point
-*/
-static int surf_cpu_ti_binary_search(double *array, double a, int low,
-                                     int high)
-{
-  xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than"
-      " high (%d)", low, high);
-
-  int mid;
-  do {
-    mid = low + (high - low) / 2;
-    XBT_DEBUG("a %lf low %d high %d mid %d value %lf", a, low, high, mid,
-        array[mid]);
-
-    if (array[mid] > a)
-      high = mid;
-    else
-      low = mid;
-  }
-  while (low < high - 1);
-
-  return low;
+ * @brief Binary search in array.
+ *  It returns the last point of the interval in which "a" is.
+ * @param array    Array
+ * @param a        Value to search
+ * @return Index of point
+ */
+int CpuTiProfile::binary_search(const std::vector<double>& array, double a)
+{
+  if (array[0] > a)
+    return 0;
+  auto pos = std::upper_bound(begin(array), end(array), a);
+  return std::distance(begin(array), pos) - 1;
 }
 
 /*********
  * Model *
  *********/
 
-CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
+void CpuTiModel::create_pm_vm_models()
+{
+  xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen.");
+  xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
+
+  surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel();
+  surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel();
+}
+
+CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
 {
-  
+  all_existing_models.push_back(this);
 }
 
-CpuTiPtr CpuTiModel::createResource(string name,
-                          double powerPeak,
-                           double powerScale,
-                           tmgr_trace_t powerTrace,
-                           int core,
-                           e_surf_resource_state_t stateInitial,
-                           tmgr_trace_t stateTrace,
-                           xbt_dict_t cpuProperties)
+CpuTiModel::~CpuTiModel()
 {
-  tmgr_trace_t empty_trace;
-  s_tmgr_event_t val;
-  CpuTiActionPtr cpuAction;
-  xbt_assert(core==1,"Multi-core not handled with this model yet");
-  /*TOREPAIR: xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
-              "Host '%s' declared several times in the platform file",
-              name);*/
-  CpuTiPtr cpu = new CpuTi(this, name, powerPeak, powerScale, powerTrace,
-                          core, stateInitial, stateTrace, cpuProperties);
-  xbt_lib_set(host_lib, name.c_str(), SURF_CPU_LEVEL, cpu);
-  return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name.c_str());
+  surf_cpu_model_pm = nullptr;
 }
 
-CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed)
+kernel::resource::Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
 {
-  return NULL;//new CpuTiAction(this, cost, failed);
+  return new CpuTi(this, host, speed_per_pstate, core);
 }
 
-void CpuTi::printCpuTiModel()
+double CpuTiModel::next_occurring_event(double now)
 {
-  std::cout << getModel()->getName() << "<<plop"<< std::endl;
-};
+  double min_action_duration = -1;
+
+  /* iterates over modified cpus to update share resources */
+  for (auto it = std::begin(modified_cpus_); it != std::end(modified_cpus_);) {
+    CpuTi& cpu = *it;
+    ++it; // increment iterator here since the following call to ti.update_actions_finish_time() may invalidate it
+    cpu.update_actions_finish_time(now);
+  }
+
+  /* get the min next event if heap not empty */
+  if (not get_action_heap().empty())
+    min_action_duration = get_action_heap().top_date() - now;
+
+  XBT_DEBUG("Share resources, min next event date: %f", min_action_duration);
+
+  return min_action_duration;
+}
+
+void CpuTiModel::update_actions_state(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<CpuTiAction*>(get_action_heap().pop());
+    XBT_DEBUG("Action %p: finish", action);
+    action->finish(kernel::resource::Action::State::FINISHED);
+    /* update remaining amount of all actions */
+    action->cpu_->update_remaining_amount(surf_get_clock());
+  }
+}
 
 /************
  * Resource *
  ************/
-CpuTi::CpuTi(CpuTiModelPtr model, string name, double powerPeak,
-        double powerScale, tmgr_trace_t powerTrace, int core,
-        e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
-       xbt_dict_t properties) :
-       Cpu(model, name, properties), m_powerPeak(powerPeak), m_powerScale(powerScale),
-        m_stateCurrent(stateInitial) {
-  tmgr_trace_t empty_trace;            
-  s_tmgr_event_t val;          
-  xbt_assert(core==1,"Multi-core not handled with this model yet");
-  XBT_DEBUG("power scale %lf", powerScale);
-  m_availTrace = cpu_ti_parse_trace(powerTrace, powerScale);
-  if (stateTrace)
-    /*TOREPAIR:m_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);*/
-  if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) {
-    // add a fake trace event if periodicity == 0 
-    xbt_dynar_get_cpy(powerTrace->s_list.event_list,
-                      xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val);
-    /*TOREPAIR:if (val.delta == 0) {
-      empty_trace = tmgr_empty_trace_new();
-       m_powerEvent =
-        tmgr_history_add_trace(history, empty_trace,
-                               m_availTrace->last_time, 0, this);
-    }*/
+CpuTi::CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+    : Cpu(model, host, speed_per_pstate, core)
+{
+  xbt_assert(core == 1, "Multi-core not handled by this model yet");
+
+  speed_.peak = speed_per_pstate.front();
+  XBT_DEBUG("CPU create: peak=%f", speed_.peak);
+
+  speed_integrated_trace_ = new CpuTiTmgr(nullptr, 1 /*scale*/);
+}
+
+CpuTi::~CpuTi()
+{
+  set_modified(false);
+  delete speed_integrated_trace_;
+}
+void CpuTi::set_speed_profile(kernel::profile::Profile* profile)
+{
+  delete speed_integrated_trace_;
+  speed_integrated_trace_ = new CpuTiTmgr(profile, speed_.scale);
+
+  /* add a fake trace event if periodicity == 0 */
+  if (profile && profile->event_list.size() > 1) {
+    kernel::profile::DatedValue val = profile->event_list.back();
+    if (val.date_ < 1e-12) {
+      auto* prof   = new simgrid::kernel::profile::Profile();
+      speed_.event = prof->schedule(&profile::future_evt_set, this);
+    }
+  }
+}
+
+void CpuTi::apply_event(kernel::profile::Event* event, double value)
+{
+  if (event == speed_.event) {
+    XBT_DEBUG("Speed changed in trace! New fixed value: %f", value);
+
+    /* update remaining of actions and put in modified cpu list */
+    update_remaining_amount(surf_get_clock());
+
+    set_modified(true);
+
+    delete speed_integrated_trace_;
+    speed_integrated_trace_ = new CpuTiTmgr(value);
+
+    speed_.scale = value;
+    tmgr_trace_event_unref(&speed_.event);
+
+  } else if (event == state_event_) {
+    if (value > 0) {
+      if (not is_on()) {
+        XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+        get_host()->turn_on();
+      }
+    } else {
+      get_host()->turn_off();
+      double date = surf_get_clock();
+
+      /* put all action running on cpu to failed */
+      for (CpuTiAction& action : action_set_) {
+        if (action.get_state() == kernel::resource::Action::State::INITED ||
+            action.get_state() == kernel::resource::Action::State::STARTED ||
+            action.get_state() == kernel::resource::Action::State::IGNORED) {
+          action.set_finish_time(date);
+          action.set_state(kernel::resource::Action::State::FAILED);
+          get_model()->get_action_heap().remove(&action);
+        }
+      }
+    }
+    tmgr_trace_event_unref(&state_event_);
+
+  } else {
+    xbt_die("Unknown event!\n");
+  }
+}
+
+/** Update the actions that are running on this CPU (which was modified recently) */
+void CpuTi::update_actions_finish_time(double now)
+{
+  /* update remaining amount of actions */
+  update_remaining_amount(now);
+
+  /* Compute the sum of priorities for the actions running on that CPU */
+  sum_priority_ = 0.0;
+  for (CpuTiAction const& action : action_set_) {
+    /* action not running, skip it */
+    if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
+      continue;
+
+    /* bogus priority, skip it */
+    if (action.get_sharing_penalty() <= 0)
+      continue;
+
+    /* action suspended, skip it */
+    if (not action.is_running())
+      continue;
+
+    sum_priority_ += 1.0 / action.get_sharing_penalty();
   }
-};
 
-CpuTiModelPtr CpuTi::getModel() {
-  return static_cast<CpuTiModelPtr>(p_model);
-}; 
+  for (CpuTiAction& action : action_set_) {
+    double min_finish = -1;
+    /* action not running, skip it */
+    if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
+      continue;
+
+    /* verify if the action is really running on cpu */
+    if (action.is_running() && action.get_sharing_penalty() > 0) {
+      /* total area needed to finish the action. Used in trace integration */
+      double total_area = (action.get_remains() * sum_priority_ * action.get_sharing_penalty()) / speed_.peak;
+
+      action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
+      /* verify which event will happen before (max_duration or finish time) */
+      if (action.get_max_duration() != NO_MAX_DURATION &&
+          action.get_start_time() + action.get_max_duration() < action.get_finish_time())
+        min_finish = action.get_start_time() + action.get_max_duration();
+      else
+        min_finish = action.get_finish_time();
+    } else {
+      /* put the max duration time on heap */
+      if (action.get_max_duration() != NO_MAX_DURATION)
+        min_finish = action.get_start_time() + action.get_max_duration();
+    }
+    /* add in action heap */
+    if (min_finish != NO_MAX_DURATION)
+      get_model()->get_action_heap().update(&action, min_finish, kernel::resource::ActionHeap::Type::unset);
+    else
+      get_model()->get_action_heap().remove(&action);
+
+    XBT_DEBUG("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f", get_cname(),
+              &action, action.get_start_time(), action.get_finish_time(), action.get_max_duration());
+  }
+  /* remove from modified cpu */
+  set_modified(false);
+}
 
-double CpuTi::getSpeed(double load)
+bool CpuTi::is_used()
 {
-  return load * m_powerPeak;
+  return not action_set_.empty();
 }
 
-double CpuTi::getAvailableSpeed()
+double CpuTi::get_speed_ratio()
 {
-  return 0;
+  speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock());
+  return Cpu::get_speed_ratio();
+}
+
+/** @brief Update the remaining amount of actions */
+void CpuTi::update_remaining_amount(double now)
+{
+  /* already up to date */
+  if (last_update_ >= now)
+    return;
+
+  /* compute the integration area */
+  double area_total = speed_integrated_trace_->integrate(last_update_, now) * speed_.peak;
+  XBT_DEBUG("Flops total: %f, Last update %f", area_total, last_update_);
+  for (CpuTiAction& action : action_set_) {
+    /* action not running, skip it */
+    if (action.get_state_set() != get_model()->get_started_action_set())
+      continue;
+
+    /* bogus priority, skip it */
+    if (action.get_sharing_penalty() <= 0)
+      continue;
+
+    /* action suspended, skip it */
+    if (not action.is_running())
+      continue;
+
+    /* action don't need update */
+    if (action.get_start_time() >= now)
+      continue;
+
+    /* skip action that are finishing now */
+    if (action.get_finish_time() >= 0 && action.get_finish_time() <= now)
+      continue;
+
+    /* update remaining */
+    action.update_remains(area_total / (sum_priority_ * action.get_sharing_penalty()));
+    XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update());
+  }
+  last_update_ = now;
+}
+
+kernel::resource::CpuAction* CpuTi::execution_start(double size)
+{
+  XBT_IN("(%s,%g)", get_cname(), size);
+  auto* action = new CpuTiAction(this, size);
+
+  action_set_.push_back(*action); // Actually start the action
+
+  XBT_OUT();
+  return action;
+}
+
+kernel::resource::CpuAction* CpuTi::sleep(double duration)
+{
+  if (duration > 0)
+    duration = std::max(duration, sg_surf_precision);
+
+  XBT_IN("(%s,%g)", get_cname(), duration);
+  auto* action = new CpuTiAction(this, 1.0);
+
+  action->set_max_duration(duration);
+  action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
+  if (duration == NO_MAX_DURATION)
+    action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
+
+  action_set_.push_back(*action);
+
+  XBT_OUT();
+  return action;
+}
+
+void CpuTi::set_modified(bool modified)
+{
+  CpuTiList& modified_cpus = static_cast<CpuTiModel*>(get_model())->modified_cpus_;
+  if (modified) {
+    if (not cpu_ti_hook.is_linked()) {
+      modified_cpus.push_back(*this);
+    }
+  } else {
+    if (cpu_ti_hook.is_linked())
+      simgrid::xbt::intrusive_erase(modified_cpus, *this);
+  }
 }
 
 /**********
  * Action *
  **********/
 
-double CpuTiAction::getRemains()
+CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, not cpu->is_on()), cpu_(cpu)
 {
-  return 0;
+  cpu_->set_modified(true);
+}
+CpuTiAction::~CpuTiAction()
+{
+  /* remove from action_set */
+  if (action_ti_hook.is_linked())
+    simgrid::xbt::intrusive_erase(cpu_->action_set_, *this);
+  /* remove from heap */
+  get_model()->get_action_heap().remove(this);
+  cpu_->set_modified(true);
+}
+
+void CpuTiAction::set_state(Action::State state)
+{
+  CpuAction::set_state(state);
+  cpu_->set_modified(true);
 }
 
-double CpuTiAction::getStartTime()
+void CpuTiAction::cancel()
 {
-  return 0;
+  this->set_state(Action::State::FAILED);
+  get_model()->get_action_heap().remove(this);
+  cpu_->set_modified(true);
 }
 
-double CpuTiAction::getFinishTime()
+void CpuTiAction::suspend()
 {
-  return 0;
+  XBT_IN("(%p)", this);
+  if (is_running()) {
+    set_suspend_state(Action::SuspendStates::SUSPENDED);
+    get_model()->get_action_heap().remove(this);
+    cpu_->set_modified(true);
+  }
+  XBT_OUT();
 }
 
-#endif /* SURF_MODEL_CPUTI_H_ */
+void CpuTiAction::resume()
+{
+  XBT_IN("(%p)", this);
+  if (is_suspended()) {
+    set_suspend_state(Action::SuspendStates::RUNNING);
+    cpu_->set_modified(true);
+  }
+  XBT_OUT();
+}
+
+void CpuTiAction::set_max_duration(double duration)
+{
+  double min_finish;
+
+  XBT_IN("(%p,%g)", this, duration);
+
+  Action::set_max_duration(duration);
+
+  if (duration >= 0)
+    min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
+                                                                             : get_finish_time();
+  else
+    min_finish = get_finish_time();
+
+  /* add in action heap */
+  get_model()->get_action_heap().update(this, min_finish, kernel::resource::ActionHeap::Type::unset);
+
+  XBT_OUT();
+}
+
+void CpuTiAction::set_sharing_penalty(double sharing_penalty)
+{
+  XBT_IN("(%p,%g)", this, sharing_penalty);
+  set_sharing_penalty_no_update(sharing_penalty);
+  cpu_->set_modified(true);
+  XBT_OUT();
+}
+
+double CpuTiAction::get_remains()
+{
+  XBT_IN("(%p)", this);
+  cpu_->update_remaining_amount(surf_get_clock());
+  XBT_OUT();
+  return get_remains_no_update();
+}
 
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid