-#include "cpu_ti.hpp"
-//#include "solver.hpp"
-#include "trace_mgr_private.h"
-#include "xbt/heap.h"
+/* 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. */
-#ifndef SURF_MODEL_CPUTI_H_
-#define SURF_MODEL_CPUTI_H_
+#include "cpu_ti.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"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_cpu_tii, surfpp,
- "Logging specific to the SURF CPU TRACE INTEGRATION module");
+#include <algorithm>
-static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked;
-static xbt_swag_t cpu_ti_modified_cpu;
-static xbt_heap_t cpu_ti_action_heap;
+constexpr double EPSILON = 0.000000001;
-static CpuTiModelPtr surf_cpu_model = NULL;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
-static void cpu_ti_action_update_index_heap(void *action, int i);
+namespace simgrid {
+namespace kernel {
+namespace resource {
/*********
* Trace *
*********/
-CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace)
+CpuTiProfile::CpuTiProfile(profile::Profile* profile)
{
- s_tmgr_event_t val;
- unsigned int cpt;
double integral = 0;
double time = 0;
- int i = 0;
- p_timePoints = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
- p_integral = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
- m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list);
- xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
- p_timePoints[i] = time;
- p_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_;
}
- p_timePoints[i] = time;
- p_integral[i] = integral;
-}
-
-CpuTiTrace::~CpuTiTrace()
-{
- xbt_free(p_timePoints);
- xbt_free(p_integral);
-}
-
-CpuTiTgmr::~CpuTiTgmr()
-{
- if (p_trace)
- delete p_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.
-*/
-double CpuTiTgmr::integrate(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 (m_type == TRACE_FIXED) {
- return ((b - a) * m_value);
+ if (type_ == Type::FIXED) {
+ return (b - a) * value_;
}
- if (ceil(a / m_lastTime) == a / m_lastTime)
- a_index = 1 + (int) (ceil(a / m_lastTime));
+ 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 / m_lastTime));
+ a_index = static_cast<int>(ceil(a / last_time_));
- b_index = (int) (floor(b / m_lastTime));
+ int b_index = static_cast<int>(floor(b / last_time_));
if (a_index > b_index) { /* Same chunk */
- return p_trace->integrateSimple(a - (a_index -
- 1) * m_lastTime,
- b -
- (b_index) *
- m_lastTime);
+ return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_);
}
- first_chunk = p_trace->integrateSimple(a - (a_index -
- 1) *
- m_lastTime,
- m_lastTime);
- middle_chunk = (b_index - a_index) * m_total;
- last_chunk = p_trace->integrateSimple(0.0,
- b -
- (b_index) *
- m_lastTime);
+ 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);
+ 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
-*/
-double CpuTiTrace::integrateSimple(double a, double b)
+ * @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 integrateSimplePoint(b) - integrateSimplePoint(a);
+ 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
-*/
-double CpuTiTrace::integrateSimplePoint(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 = binarySearch(p_timePoints, a, 0, m_nbPoints - 1);
- integral += p_integral[ind];
- XBT_DEBUG
- ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf",
- a, ind, integral, p_integral[ind + 1], p_integral[ind],
- p_timePoints[ind + 1], p_timePoints[ind]);
- double_update(&a_aux, p_timePoints[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 +=
- ((p_integral[ind + 1] -
- p_integral[ind]) / (p_timePoints[ind + 1] -
- p_timePoints[ind])) * (a - p_timePoints[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
-*/
-double CpuTiTgmr::solve(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;
}
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 (m_type == TRACE_FIXED) {
- return (a + (amount / m_value));
+ /* Is the trace fixed ? */
+ if (type_ == Type::FIXED) {
+ return (a + (amount / value_));
}
- XBT_DEBUG("amount %lf total %lf", amount, m_total);
-/* Reduce the problem to one where amount <= trace_total */
- quotient = (int) (floor(amount / m_total));
- reduced_amount = (m_total) * ((amount / m_total) -
- floor(amount / m_total));
- reduced_a = a - (m_lastTime) * (int) (floor(a / m_lastTime));
-
- XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient,
- reduced_amount, reduced_a);
+ 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_));
-/* 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 = solveSomewhatSimple(reduced_a, reduced_amount);
+ XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
-/* Re-map to the original b and amount */
- b = (m_lastTime) * (int) (floor(a / m_lastTime)) +
- (quotient * m_lastTime) + reduced_b;
- return b;
-}
-
-/**
-* \brief Auxiliary function to solve integral
-*
-* Here, amount is <= trace->total
-* and a <=trace->last_time
-*
-*/
-double CpuTiTgmr::solveSomewhatSimple(double a, double amount)
-{
- double amount_till_end;
- double b;
-
- XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount);
- amount_till_end = integrate(a, m_lastTime);
-/*
- 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 = p_trace->solveSimple(a, amount);
+ if (amount_till_end > reduced_amount) {
+ reduced_b = profile_->solve_simple(reduced_a, reduced_amount);
} else {
- b = m_lastTime + p_trace->solveSimple(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.
-*/
-double CpuTiTrace::solveSimple(double a, double amount)
-{
- double integral_a;
- int ind;
- double time;
- integral_a = integrateSimplePoint(a);
- ind = binarySearch(p_integral, integral_a + amount, 0, m_nbPoints - 1);
- time = p_timePoints[ind];
- time +=
- (integral_a + amount -
- p_integral[ind]) / ((p_integral[ind + 1] -
- p_integral[ind]) /
- (p_timePoints[ind + 1] -
- p_timePoints[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 Auxiliary function to update the CPU power scale.
-*
-* This function uses the trace structure to return the power scale at the determined time a.
-* \param trace Trace structure to search the updated power scale
-* \param a Time
-* \return CPU power scale
-*/
-double CpuTiTgmr::getPowerScale(double a)
-{
- double reduced_a;
- int point;
- s_tmgr_event_t val;
-
- reduced_a = a - floor(a / m_lastTime) * m_lastTime;
- point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0,
- p_trace->m_nbPoints - 1);
- xbt_dynar_get_cpy(p_powerTrace->s_list.event_list, point, &val);
- return val.value;
+ * @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 power_trace CPU availability trace
-* \param value Percentage of CPU power available (useful to fixed tracing)
-* \param spacing Initial spacing
-* \return Integration trace structure
-*/
-CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double 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;
-
-/* no availability file, fixed trace */
- if (!power_trace) {
- m_type = TRACE_FIXED;
- m_value = value;
- XBT_DEBUG("No availabily trace. Constant value = %lf", value);
+ 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);
- m_type = TRACE_FIXED;
- m_value = val.value;
+ if (speed_profile->event_list.size() == 1) {
+ type_ = Type::FIXED;
+ value_ = speed_profile->event_list.front().value_;
return;
}
- m_type = TRACE_DYNAMIC;
- p_powerTrace = 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;
- }
- p_trace = new CpuTiTrace(power_trace);
- m_lastTime = total_time;
- m_total = p_trace->integrateSimple(0, total_time);
+ for (auto const& val : speed_profile->event_list)
+ total_time += val.date_;
+
+ profile_.reset(new CpuTiProfile(speed_profile));
+ last_time_ = total_time;
+ total_ = profile_->integrate_simple(0, total_time);
- XBT_DEBUG("Total integral %lf, last_time %lf ",
- m_total, m_lastTime);
+ 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
-*/
-int CpuTiTrace::binarySearch(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,"CPU model already initialized. This should not happen.");
- surf_cpu_model = this;
- CpuTiAction action;
- CpuTi cpu;
-
- cpu_ti_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, p_stateHookup));
+ 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.");
- cpu_ti_modified_cpu =
- xbt_swag_new(xbt_swag_offset(cpu, p_modifiedCpuHookup));
-
- cpu_ti_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_ti_action_heap,
- cpu_ti_action_update_index_heap);
- /* Define callbacks */
- //TODO sg_platf_host_add_cb(parse_cpu_ti_init);
- //TODO sg_platf_postparse_add_cb(add_traces_cpu_ti);
-
- xbt_dynar_push(model_list, &surf_cpu_model);
+ surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel();
+ surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel();
}
-CpuTiModel::~CpuTiModel()
+CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
{
- void **cpu;
- xbt_lib_cursor_t cursor;
- char *key;
-
- xbt_lib_foreach(host_lib, cursor, key, cpu){
- if(cpu[SURF_CPU_LEVEL])
- {
- CpuTiPtr CPU = (CpuTiPtr) cpu[SURF_CPU_LEVEL];
- xbt_swag_free(CPU->p_actionSet);
- delete CPU->p_availTrace;
- }
- }
-
- delete surf_cpu_model;
- surf_cpu_model = NULL;
-
- xbt_swag_free
- (cpu_ti_running_action_set_that_does_not_need_being_checked);
- xbt_swag_free(cpu_ti_modified_cpu);
- cpu_ti_running_action_set_that_does_not_need_being_checked = NULL;
- xbt_heap_free(cpu_ti_action_heap);
+ all_existing_models.push_back(this);
}
-void CpuTiModel::parseInit(sg_platf_host_cbarg_t host)
-{
- createResource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
-}
-
-CpuTiPtr CpuTiModel::createResource(const char *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");
- 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, SURF_CPU_LEVEL, cpu);
- return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name);
+ 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);
}
-double CpuTiModel::shareResources(double now)
+double CpuTiModel::next_occurring_event(double now)
{
- void *_cpu, *_cpu_next;
double min_action_duration = -1;
-/* iterates over modified cpus to update share resources */
- xbt_swag_foreach_safe(_cpu, _cpu_next, cpu_ti_modified_cpu) {
- ((CpuTiPtr)_cpu)->updateActionFinishDate(now);
+ /* 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 (xbt_heap_size(cpu_ti_action_heap) > 0)
- min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
- XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration);
+ /* 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::updateActionsState(double now, double delta)
+void CpuTiModel::update_actions_state(double now, double /*delta*/)
{
- while ((xbt_heap_size(cpu_ti_action_heap) > 0)
- && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) {
- CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(cpu_ti_action_heap);
+ 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->m_finish = surf_get_clock();
- /* set the remains to 0 due to precision problems when updating the remaining amount */
- action->m_remains = 0;
- action->setState(SURF_ACTION_DONE);
- /* update remaining amout of all actions */
- action->p_cpu->updateRemainingAmount(surf_get_clock());
+ action->finish(kernel::resource::Action::State::FINISHED);
+ /* update remaining amount of all actions */
+ action->cpu_->update_remaining_amount(surf_get_clock());
}
}
-void CpuTiModel::addTraces()
+/************
+ * Resource *
+ ************/
+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_dict_cursor_t cursor = NULL;
- char *trace_name, *elm;
-
- static int called = 0;
-
- if (called)
- return;
- called = 1;
+ xbt_assert(core == 1, "Multi-core not handled by this model yet");
-/* connect all traces relative to hosts */
- xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
+ speed_.peak = speed_per_pstate.front();
+ XBT_DEBUG("CPU create: peak=%f", speed_.peak);
- xbt_assert(cpu, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- if (cpu->p_stateEvent) {
- XBT_DEBUG("Trace already configured for this CPU(%s), ignoring it",
- elm);
- continue;
- }
- XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
- cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu);
- }
+ speed_integrated_trace_ = new CpuTiTmgr(nullptr, 1 /*scale*/);
+}
- xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm));
-
- xbt_assert(cpu, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm);
- if (cpu->p_availTrace)
- delete cpu->p_availTrace;
-
- cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale);
-
- /* add a fake trace event if periodicity == 0 */
- if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) {
- s_tmgr_event_t val;
- xbt_dynar_get_cpy(trace->s_list.event_list,
- xbt_dynar_length(trace->s_list.event_list) - 1, &val);
- if (val.delta == 0) {
- tmgr_trace_t empty_trace;
- empty_trace = tmgr_empty_trace_new();
- cpu->p_powerEvent =
- tmgr_history_add_trace(history, empty_trace,
- cpu->p_availTrace->m_lastTime, 0, cpu);
- }
- }
- }
+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);
-/************
- * Resource *
- ************/
-CpuTi::CpuTi(CpuTiModelPtr model, const char *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), p_stateCurrent(stateInitial) {
- m_powerPeak = powerPeak;
- m_powerScale = powerScale;
- m_core = core;
- 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);
- p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
- if (stateTrace)
- p_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);
- if (val.delta == 0) {
- empty_trace = tmgr_empty_trace_new();
- p_powerEvent =
- tmgr_history_add_trace(history, empty_trace,
- p_availTrace->m_lastTime, 0, this);
+ /* 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::updateState(tmgr_trace_event_t event_type,
- double value, double date)
+void CpuTi::apply_event(kernel::profile::Event* event, double value)
{
- void *_action;
- CpuTiActionPtr action;
-
- surf_watched_hosts();
-
- if (event_type == p_powerEvent) {
- tmgr_trace_t power_trace;
- CpuTiTgmrPtr trace;
- s_tmgr_event_t val;
+ if (event == speed_.event) {
+ XBT_DEBUG("Speed changed in trace! New fixed value: %f", value);
- XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(),
- value, date);
- /* update remaining of actions and put in modified cpu swag */
- updateRemainingAmount(date);
- xbt_swag_insert(this, cpu_ti_modified_cpu);
+ /* update remaining of actions and put in modified cpu list */
+ update_remaining_amount(surf_get_clock());
- power_trace = p_availTrace->p_powerTrace;
- xbt_dynar_get_cpy(power_trace->s_list.event_list,
- xbt_dynar_length(power_trace->s_list.event_list) - 1, &val);
- /* free old trace */
- delete p_availTrace;
- m_powerScale = val.value;
+ set_modified(true);
- trace = new CpuTiTgmr(TRACE_FIXED, val.value);
- XBT_DEBUG("value %lf", val.value);
+ delete speed_integrated_trace_;
+ speed_integrated_trace_ = new CpuTiTmgr(value);
- p_availTrace = trace;
+ speed_.scale = value;
+ tmgr_trace_event_unref(&speed_.event);
- if (tmgr_trace_event_free(event_type))
- p_powerEvent = NULL;
-
- } else if (event_type == p_stateEvent) {
- if (value > 0)
- p_stateCurrent = SURF_RESOURCE_ON;
- else {
- p_stateCurrent = SURF_RESOURCE_OFF;
+ } 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 */
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
- if (action->getState() == SURF_ACTION_RUNNING
- || action->getState() == SURF_ACTION_READY
- || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
- action->m_finish = date;
- action->setState(SURF_ACTION_FAILED);
- if (action->m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
- if (heap_act != action)
- DIE_IMPOSSIBLE;
- }
+ 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);
}
}
}
- if (tmgr_trace_event_free(event_type))
- p_stateEvent = NULL;
+ tmgr_trace_event_unref(&state_event_);
+
} else {
- XBT_CRITICAL("Unknown event ! \n");
- xbt_abort();
+ xbt_die("Unknown event!\n");
}
-
- return;
}
-void CpuTi::updateActionFinishDate(double now)
+/** Update the actions that are running on this CPU (which was modified recently) */
+void CpuTi::update_actions_finish_time(double now)
{
- void *_action;
- CpuTiActionPtr action;
- double sum_priority = 0.0, total_area, min_finish = -1;
+ /* update remaining amount of actions */
+ update_remaining_amount(now);
-/* update remaning amount of actions */
-updateRemainingAmount(now);
-
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ /* 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->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->m_priority <= 0)
+ if (action.get_sharing_penalty() <= 0)
continue;
/* action suspended, skip it */
- if (action->m_suspended != 0)
+ if (not action.is_running())
continue;
- sum_priority += 1.0 / action->m_priority;
+ sum_priority_ += 1.0 / action.get_sharing_penalty();
}
- m_sumPriority = sum_priority;
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
- min_finish = -1;
+ for (CpuTiAction& action : action_set_) {
+ double min_finish = -1;
/* action not running, skip it */
- if (action->p_stateSet !=
- surf_cpu_model->p_runningActionSet)
+ 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->m_suspended == 0 && action->m_priority > 0) {
+ if (action.is_running() && action.get_sharing_penalty() > 0) {
/* total area needed to finish the action. Used in trace integration */
- total_area =
- (action->m_remains) * sum_priority *
- action->m_priority;
-
- total_area /= m_powerPeak;
+ double total_area = (action.get_remains() * sum_priority_ * action.get_sharing_penalty()) / speed_.peak;
- action->m_finish = p_availTrace->solve(now, total_area);
+ action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
- if (action->m_maxDuration != NO_MAX_DURATION &&
- action->m_start + action->m_maxDuration < action->m_finish)
- min_finish = action->m_start + action->m_maxDuration;
+ 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->m_finish;
+ min_finish = action.get_finish_time();
} else {
/* put the max duration time on heap */
- if (action->m_maxDuration != NO_MAX_DURATION)
- min_finish = action->m_start + action->m_maxDuration;
+ if (action.get_max_duration() != NO_MAX_DURATION)
+ min_finish = action.get_start_time() + action.get_max_duration();
}
/* add in action heap */
- XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap);
- if (action->m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap);
- if (heap_act != action)
- DIE_IMPOSSIBLE;
- }
if (min_finish != NO_MAX_DURATION)
- xbt_heap_push(cpu_ti_action_heap, action, min_finish);
+ 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: %lf Finish Time: %lf Max duration %lf",
- m_name, action, action->m_start,
- action->m_finish,
- action->m_maxDuration);
+ 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 */
- xbt_swag_remove(this, cpu_ti_modified_cpu);
+ /* remove from modified cpu */
+ set_modified(false);
}
-CpuTiModelPtr CpuTi::getModel()
-{
- return static_cast<CpuTiModelPtr>(p_model);
-};
-
-bool CpuTi::isUsed()
+bool CpuTi::is_used()
{
- return xbt_swag_size(p_actionSet);
+ return not action_set_.empty();
}
-
-
-double CpuTi::getAvailableSpeed()
+double CpuTi::get_speed_ratio()
{
- m_powerScale = p_availTrace->getPowerScale(surf_get_clock());
- return Cpu::getAvailableSpeed();
+ speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock());
+ return Cpu::get_speed_ratio();
}
-/**
-* \brief Update the remaining amount of actions
-*
-* \param now Current time
-*/
-void CpuTi::updateRemainingAmount(double now)
-{
- double area_total;
- void* _action;
- CpuTiActionPtr action;
-
- /* already updated */
- if (m_lastUpdate >= now)
+/** @brief Update the remaining amount of actions */
+void CpuTi::update_remaining_amount(double now)
+{
+ /* already up to date */
+ if (last_update_ >= now)
return;
-/* calcule the surface */
- area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
- XBT_DEBUG("Flops total: %lf, Last update %lf", area_total,
- m_lastUpdate);
-
- xbt_swag_foreach(_action, p_actionSet) {
- action = (CpuTiActionPtr) _action;
+ /* 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->p_stateSet !=
- getModel()->p_runningActionSet)
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->m_priority <= 0)
+ if (action.get_sharing_penalty() <= 0)
continue;
/* action suspended, skip it */
- if (action->m_suspended != 0)
+ if (not action.is_running())
continue;
/* action don't need update */
- if (action->m_start >= now)
+ if (action.get_start_time() >= now)
continue;
/* skip action that are finishing now */
- if (action->m_finish >= 0
- && action->m_finish <= now)
+ if (action.get_finish_time() >= 0 && action.get_finish_time() <= now)
continue;
/* update remaining */
- double_update(&(action->m_remains),
- area_total / (m_sumPriority *
- action->m_priority));
- XBT_DEBUG("Update remaining action(%p) remaining %lf", action,
- action->m_remains);
+ 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());
}
- m_lastUpdate = now;
+ last_update_ = now;
}
-CpuActionPtr CpuTi::execute(double size)
+kernel::resource::CpuAction* CpuTi::execution_start(double size)
{
- XBT_IN("(%s,%g)", m_name, size);
- CpuTiActionPtr action = new CpuTiAction(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON);
-
- action->p_cpu = this;
- action->m_indexHeap = -1;
-
- xbt_swag_insert(this, cpu_ti_modified_cpu);
+ XBT_IN("(%s,%g)", get_cname(), size);
+ auto* action = new CpuTiAction(this, size);
- xbt_swag_insert(action, p_actionSet);
-
- action->m_suspended = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
+ action_set_.push_back(*action); // Actually start the action
XBT_OUT();
return action;
}
-
-CpuActionPtr CpuTi::sleep(double duration)
+kernel::resource::CpuAction* CpuTi::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, MAXMIN_PRECISION);
-
- XBT_IN("(%s,%g)", m_name, duration);
- CpuActionPtr action = execute(1.0);
- action->m_maxDuration = duration;
- action->m_suspended = 2;
- if (duration == NO_MAX_DURATION) {
- /* Move to the *end* of the corresponding action set. This convention
- is used to speed up update_resource_state */
- xbt_swag_remove(action, action->p_stateSet);
- action->p_stateSet = cpu_ti_running_action_set_that_does_not_need_being_checked;
- xbt_swag_insert(action, action->p_stateSet);
- }
+ 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::printCpuTiModel()
+void CpuTi::set_modified(bool modified)
{
- std::cout << getModel()->getName() << "<<plop"<< std::endl;
-};
+ 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 *
**********/
-static void cpu_ti_action_update_index_heap(void *action, int i)
-{
- ((CpuTiActionPtr)action)->updateIndexHeap(i);
-}
-void CpuTiAction::updateIndexHeap(int i)
-{
- m_indexHeap = i;
-}
-void CpuTiAction::setState(e_surf_action_state_t state)
+CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, not cpu->is_on()), cpu_(cpu)
{
- Action::setState(state);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ cpu_->set_modified(true);
}
-
-int CpuTiAction::unref()
+CpuTiAction::~CpuTiAction()
{
- m_refcount--;
- if (!m_refcount) {
- xbt_swag_remove(this, p_stateSet);
- /* remove from action_set */
- xbt_swag_remove(this, ((CpuTiPtr)surf_cpu_resource_priv(p_cpu))->p_actionSet);
- /* remove from heap */
- xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
- delete this;
- return 1;
- }
- return 0;
+ /* 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::cancel()
+void CpuTiAction::set_state(Action::State state)
{
- this->setState(SURF_ACTION_FAILED);
- xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
- return;
+ CpuAction::set_state(state);
+ cpu_->set_modified(true);
}
-void CpuTiAction::recycle()
+void CpuTiAction::cancel()
{
- DIE_IMPOSSIBLE;
+ this->set_state(Action::State::FAILED);
+ get_model()->get_action_heap().remove(this);
+ cpu_->set_modified(true);
}
void CpuTiAction::suspend()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
- m_suspended = 1;
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ if (is_running()) {
+ set_suspend_state(Action::SuspendStates::SUSPENDED);
+ get_model()->get_action_heap().remove(this);
+ cpu_->set_modified(true);
}
XBT_OUT();
}
void CpuTiAction::resume()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
- m_suspended = 0;
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ if (is_suspended()) {
+ set_suspend_state(Action::SuspendStates::RUNNING);
+ cpu_->set_modified(true);
}
XBT_OUT();
}
-bool CpuTiAction::isSuspended()
-{
- return m_suspended == 1;
-}
-
-void CpuTiAction::setMaxDuration(double duration)
+void CpuTiAction::set_max_duration(double duration)
{
double min_finish;
XBT_IN("(%p,%g)", this, duration);
- m_maxDuration = duration;
+ Action::set_max_duration(duration);
if (duration >= 0)
- min_finish = (m_start + m_maxDuration) < m_finish ?
- (m_start + m_maxDuration) : m_finish;
+ min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
+ : get_finish_time();
else
- min_finish = m_finish;
-
-/* add in action heap */
- if (m_indexHeap >= 0) {
- CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(cpu_ti_action_heap, m_indexHeap);
- if (heap_act != this)
- DIE_IMPOSSIBLE;
- }
- xbt_heap_push(cpu_ti_action_heap, this, min_finish);
+ 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::setPriority(double priority)
+void CpuTiAction::set_sharing_penalty(double sharing_penalty)
{
- XBT_IN("(%p,%g)", this, priority);
- m_priority = priority;
- xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu);
+ XBT_IN("(%p,%g)", this, sharing_penalty);
+ set_sharing_penalty_no_update(sharing_penalty);
+ cpu_->set_modified(true);
XBT_OUT();
}
-double CpuTiAction::getRemains()
+double CpuTiAction::get_remains()
{
XBT_IN("(%p)", this);
- ((CpuTiPtr)p_cpu)->updateRemainingAmount(surf_get_clock());
+ cpu_->update_remaining_amount(surf_get_clock());
XBT_OUT();
- return m_remains;
+ return get_remains_no_update();
}
-static void check() {
- CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true);
-}
-
-#endif /* SURF_MODEL_CPUTI_H_ */
-
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid