-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* 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 "xbt/heap.h"
-#include "src/surf/trace_mgr.hpp"
-#include "src/surf/platform.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"
-#ifndef SURF_MODEL_CPUTI_H_
-#define SURF_MODEL_CPUTI_H_
+#include <algorithm>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu,
- "Logging specific to the SURF CPU TRACE INTEGRATION module");
+constexpr double EPSILON = 0.000000001;
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
namespace simgrid {
-namespace surf {
-
-static inline
-void cpu_ti_action_update_index_heap(void *action, int i)
-{
- ((simgrid::surf::CpuTiAction*)action)->updateIndexHeap(i);
-}
+namespace kernel {
+namespace resource {
/*********
* Trace *
*********/
-CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace)
+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(speedTrace->event_list) + 1));
- p_integral = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(speedTrace->event_list) + 1));
- m_nbPoints = xbt_dynar_length(speedTrace->event_list) + 1;
- xbt_dynar_foreach(speedTrace->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 compute the integral between a and 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 trace Trace structure
- * \param a Initial point
- * \param b Final point
- * \return Integral
-*/
-double CpuTiTrace::integrateSimple(double a, double b)
+ * @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 compute 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 %f ind %d integral %f ind + 1 %f ind %f time +1 %f time %f",
- a, ind, integral, p_integral[ind + 1], p_integral[ind],
- p_timePoints[ind + 1], p_timePoints[ind]);
- double_update(&a_aux, p_timePoints[ind], sg_maxmin_precision*sg_surf_precision);
+ 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]);
+ ((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 Computes 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 %f total %f", 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("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_));
- XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient,
- reduced_amount, reduced_a);
+ XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", 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 = solveSomewhatSimple(reduced_a, reduced_amount);
-
-/* 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 speed scale.
-*
-* This function uses the trace structure to return the speed scale at the determined time a.
-* \param trace Trace structure to search the updated speed scale
-* \param a Time
-* \return CPU speed 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_speedTrace->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 speedTrace CPU availability trace
-* \param value Percentage of CPU speed available (useful to fixed tracing)
-* \param spacing Initial spacing
-* \return Integration trace structure
-*/
-CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, 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;
- p_trace = 0;
-
-/* no availability file, fixed trace */
- if (!speedTrace) {
- m_type = TRACE_FIXED;
- m_value = 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(speedTrace->event_list) == 1) {
- xbt_dynar_get_cpy(speedTrace->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_speedTrace = speedTrace;
+ type_ = Type::DYNAMIC;
/* count the total time of trace file */
- xbt_dynar_foreach(speedTrace->event_list, cpt, val) {
- total_time += val.delta;
- }
- p_trace = new CpuTiTrace(speedTrace);
- m_lastTime = total_time;
- m_total = p_trace->integrateSimple(0, total_time);
+ for (auto const& val : speed_profile->event_list)
+ total_time += val.date_;
- XBT_DEBUG("Total integral %f, last_time %f ",
- m_total, m_lastTime);
-}
-
-/**
- * \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 %f low %d high %d mid %d value %f", a, low, high, mid,
- array[mid]);
-
- if (array[mid] > a)
- high = mid;
- else
- low = mid;
- }
- while (low < high - 1);
+ profile_.reset(new CpuTiProfile(speed_profile));
+ last_time_ = total_time;
+ total_ = profile_->integrate_simple(0, total_time);
- return low;
+ XBT_DEBUG("Total integral %f, last_time %f ", total_, last_time_);
}
-}
+/**
+ * @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 *
*********/
-void surf_cpu_model_init_ti()
+void CpuTiModel::create_pm_vm_models()
{
- xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen.");
- xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen.");
-
- surf_cpu_model_pm = new simgrid::surf::CpuTiModel();
- xbt_dynar_push(all_existing_models, &surf_cpu_model_pm);
+ 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_vm = new simgrid::surf::CpuTiModel();
- xbt_dynar_push(all_existing_models, &surf_cpu_model_vm);
+ surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel();
+ surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel();
}
-namespace simgrid {
-namespace surf {
-
-CpuTiModel::CpuTiModel() : CpuModel()
+CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
{
- p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
-
- p_modifiedCpu = new CpuTiList();
-
- p_tiActionHeap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(p_tiActionHeap,
- cpu_ti_action_update_index_heap);
+ all_existing_models.push_back(this);
}
CpuTiModel::~CpuTiModel()
{
- surf_cpu_model_pm = NULL;
- delete p_runningActionSetThatDoesNotNeedBeingChecked;
- delete p_modifiedCpu;
- xbt_heap_free(p_tiActionHeap);
+ surf_cpu_model_pm = nullptr;
}
-Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
- xbt_dynar_t speedPeak,
- int pstate,
- double speedScale,
- tmgr_trace_t speedTrace,
- int core,
- int initiallyOn,
- tmgr_trace_t stateTrace)
+kernel::resource::Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
{
- xbt_assert(core==1,"Multi-core not handled with this model yet");
- xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
- "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
- CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace,
- core, initiallyOn, stateTrace);
- return cpu;
+ return new CpuTi(this, host, speed_per_pstate, core);
}
-double CpuTiModel::next_occuring_event(double now)
+double CpuTiModel::next_occurring_event(double now)
{
double min_action_duration = -1;
-/* iterates over modified cpus to update share resources */
- for(CpuTiList::iterator it(p_modifiedCpu->begin()), itend(p_modifiedCpu->end())
- ; it != itend ;) {
- CpuTi *ti = &*it;
- ++it;
- ti->updateActionsFinishTime(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(p_tiActionHeap) > 0)
- min_action_duration = xbt_heap_maxkey(p_tiActionHeap) - 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::updateActionsState(double now, double /*delta*/)
+void CpuTiModel::update_actions_state(double now, double /*delta*/)
{
- while ((xbt_heap_size(p_tiActionHeap) > 0)
- && (xbt_heap_maxkey(p_tiActionHeap) <= now)) {
- CpuTiAction *action = (CpuTiAction*) xbt_heap_pop(p_tiActionHeap);
+ 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();
- /* set the remains to 0 due to precision problems when updating the remaining amount */
- action->setRemains(0);
- action->setState(SURF_ACTION_DONE);
+ action->finish(kernel::resource::Action::State::FINISHED);
/* update remaining amount of all actions */
- action->p_cpu->updateRemainingAmount(surf_get_clock());
+ action->cpu_->update_remaining_amount(surf_get_clock());
}
}
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t stateTrace)
- : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn)
+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");
- m_core = core;
-
- p_speed.scale = speedScale;
- p_availTrace = new CpuTiTgmr(speedTrace, speedScale);
-
- p_actionSet = new ActionTiList();
+ xbt_assert(core == 1, "Multi-core not handled by this model yet");
- xbt_dynar_get_cpy(speedPeak, 0, &p_speed.peak);
- XBT_DEBUG("CPU create: peak=%f", p_speed.peak);
+ speed_.peak = speed_per_pstate.front();
+ XBT_DEBUG("CPU create: peak=%f", speed_.peak);
- if (stateTrace)
- p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
-
- if (speedTrace && xbt_dynar_length(speedTrace->event_list) > 1) {
- s_tmgr_event_t val;
- // add a fake trace event if periodicity == 0
- xbt_dynar_get_cpy(speedTrace->event_list,
- xbt_dynar_length(speedTrace->event_list) - 1, &val);
- if (val.delta == 0) {
- p_speed.event =
- future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this);
- }
- }
+ speed_integrated_trace_ = new CpuTiTmgr(nullptr, 1 /*scale*/);
}
CpuTi::~CpuTi()
{
- modified(false);
- delete p_availTrace;
- delete p_actionSet;
+ set_modified(false);
+ delete speed_integrated_trace_;
}
-void CpuTi::set_speed_trace(tmgr_trace_t trace)
+void CpuTi::set_speed_profile(kernel::profile::Profile* profile)
{
- if (p_availTrace)
- delete p_availTrace;
-
- p_availTrace = new CpuTiTgmr(trace, p_speed.scale);
+ delete speed_integrated_trace_;
+ speed_integrated_trace_ = new CpuTiTmgr(profile, speed_.scale);
/* add a fake trace event if periodicity == 0 */
- if (trace && xbt_dynar_length(trace->event_list) > 1) {
- s_tmgr_event_t val;
- xbt_dynar_get_cpy(trace->event_list, xbt_dynar_length(trace->event_list) - 1, &val);
- if (val.delta == 0)
- p_speed.event = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this);
+ 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(tmgr_trace_iterator_t event, double value)
+void CpuTi::apply_event(kernel::profile::Event* event, double value)
{
- if (event == p_speed.event) {
- tmgr_trace_t speedTrace;
- CpuTiTgmr *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: value %f", value);
- /* update remaining of actions and put in modified cpu swag */
- updateRemainingAmount(surf_get_clock());
+ /* update remaining of actions and put in modified cpu list */
+ update_remaining_amount(surf_get_clock());
- modified(true);
+ set_modified(true);
- speedTrace = p_availTrace->p_speedTrace;
- xbt_dynar_get_cpy(speedTrace->event_list,
- xbt_dynar_length(speedTrace->event_list) - 1, &val);
- /* free old trace */
- delete p_availTrace;
- p_speed.scale = val.value;
+ delete speed_integrated_trace_;
+ speed_integrated_trace_ = new CpuTiTmgr(value);
- trace = new CpuTiTgmr(TRACE_FIXED, val.value);
- XBT_DEBUG("value %f", val.value);
+ speed_.scale = value;
+ tmgr_trace_event_unref(&speed_.event);
- p_availTrace = trace;
-
- tmgr_trace_event_unref(&p_speed.event);
-
- } else if (event == p_stateEvent) {
+ } else if (event == state_event_) {
if (value > 0) {
- if(isOff())
- xbt_dynar_push_as(host_that_restart, char*, (char *)getName());
- turnOn();
+ if (not is_on()) {
+ XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+ get_host()->turn_on();
+ }
} else {
- turnOff();
+ get_host()->turn_off();
double date = surf_get_clock();
/* put all action running on cpu to failed */
- for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
- ; it != itend ; ++it) {
-
- CpuTiAction *action = &*it;
- if (action->getState() == SURF_ACTION_RUNNING
- || action->getState() == SURF_ACTION_READY
- || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
- action->setFinishTime(date);
- action->setState(SURF_ACTION_FAILED);
- if (action->m_indexHeap >= 0) {
- CpuTiAction *heap_act = (CpuTiAction*)
- xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, 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);
}
}
}
- tmgr_trace_event_unref(&p_stateEvent);
+ tmgr_trace_event_unref(&state_event_);
} else {
xbt_die("Unknown event!\n");
}
}
-void CpuTi::updateActionsFinishTime(double now)
+/** Update the actions that are running on this CPU (which was modified recently) */
+void CpuTi::update_actions_finish_time(double now)
{
- CpuTiAction *action;
- double sum_priority = 0.0, total_area, min_finish = -1;
-
/* update remaining amount of actions */
- updateRemainingAmount(now);
+ update_remaining_amount(now);
- for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
- ; it != itend ; ++it) {
- action = &*it;
+ /* 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->getStateSet() !=
- surf_cpu_model_pm->getRunningActionSet())
+ if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 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->getPriority();
+ sum_priority_ += 1.0 / action.get_sharing_penalty();
}
- m_sumPriority = sum_priority;
- for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
- ; it != itend ; ++it) {
- action = &*it;
- min_finish = -1;
+ for (CpuTiAction& action : action_set_) {
+ double min_finish = -1;
/* action not running, skip it */
- if (action->getStateSet() !=
- surf_cpu_model_pm->getRunningActionSet())
+ 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->getPriority() > 0) {
+ if (action.is_running() && action.get_sharing_penalty() > 0) {
/* total area needed to finish the action. Used in trace integration */
- total_area =
- (action->getRemains()) * sum_priority *
- action->getPriority();
-
- total_area /= p_speed.peak;
+ double total_area = (action.get_remains() * sum_priority_ * action.get_sharing_penalty()) / speed_.peak;
- action->setFinishTime(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->getMaxDuration() != NO_MAX_DURATION &&
- action->getStartTime() + action->getMaxDuration() < action->m_finish)
- min_finish = action->getStartTime() + action->getMaxDuration();
+ 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->getMaxDuration() != NO_MAX_DURATION)
- min_finish = action->getStartTime() + action->getMaxDuration();
+ 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) {
- CpuTiAction *heap_act = (CpuTiAction*)
- xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, action->m_indexHeap);
- if (heap_act != action)
- DIE_IMPOSSIBLE;
- }
if (min_finish != NO_MAX_DURATION)
- xbt_heap_push(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, 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: %f Finish Time: %f Max duration %f",
- getName(), action, action->getStartTime(),
- action->m_finish,
- action->getMaxDuration());
+ 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 */
- modified(false);
+ set_modified(false);
}
-bool CpuTi::isUsed()
+bool CpuTi::is_used()
{
- return !p_actionSet->empty();
+ return not action_set_.empty();
}
-double CpuTi::getAvailableSpeed()
+double CpuTi::get_speed_ratio()
{
- p_speed.scale = 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 */
-void CpuTi::updateRemainingAmount(double now)
+void CpuTi::update_remaining_amount(double now)
{
- double area_total;
- CpuTiAction *action;
-
- /* already updated */
- if (m_lastUpdate >= now)
+ /* already up to date */
+ if (last_update_ >= now)
return;
/* compute the integration area */
- area_total = p_availTrace->integrate(m_lastUpdate, now) * p_speed.peak;
- XBT_DEBUG("Flops total: %f, Last update %f", area_total,
- m_lastUpdate);
-
- for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
- ; it != itend ; ++it) {
- action = &*it;
+ 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->getStateSet() !=
- getModel()->getRunningActionSet())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 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->getStartTime() >= 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 */
- action->updateRemains(area_total / (m_sumPriority * action->getPriority()));
- XBT_DEBUG("Update remaining action(%p) remaining %f", 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;
}
-CpuAction *CpuTi::execution_start(double size)
+kernel::resource::CpuAction* CpuTi::execution_start(double size)
{
- XBT_IN("(%s,%g)", getName(), size);
- CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, isOff(), this);
+ XBT_IN("(%s,%g)", get_cname(), size);
+ auto* action = new CpuTiAction(this, size);
- p_actionSet->push_back(*action);
+ action_set_.push_back(*action); // Actually start the action
XBT_OUT();
return action;
}
-
-CpuAction *CpuTi::sleep(double duration)
+kernel::resource::CpuAction* CpuTi::sleep(double duration)
{
if (duration > 0)
- duration = MAX(duration, sg_surf_precision);
-
- XBT_IN("(%s,%g)", getName(), duration);
- CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), 1.0, isOff(), this);
-
- 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 */
- action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
- action->p_stateSet = static_cast<CpuTiModel*>(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked;
- action->getStateSet()->push_back(*action);
- }
+ 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);
- p_actionSet->push_back(*action);
+ action_set_.push_back(*action);
XBT_OUT();
return action;
}
-void CpuTi::modified(bool modified){
- CpuTiList *modifiedCpu = static_cast<CpuTiModel*>(getModel())->p_modifiedCpu;
+void CpuTi::set_modified(bool modified)
+{
+ CpuTiList& modified_cpus = static_cast<CpuTiModel*>(get_model())->modified_cpus_;
if (modified) {
- if (!cpu_ti_hook.is_linked()) {
- modifiedCpu->push_back(*this);
+ if (not cpu_ti_hook.is_linked()) {
+ modified_cpus.push_back(*this);
}
} else {
- if (cpu_ti_hook.is_linked()) {
- modifiedCpu->erase(modifiedCpu->iterator_to(*this));
- }
+ if (cpu_ti_hook.is_linked())
+ simgrid::xbt::intrusive_erase(modified_cpus, *this);
}
}
* Action *
**********/
-CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed,
- CpuTi *cpu)
- : CpuAction(model_, cost, failed)
+CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, not cpu->is_on()), cpu_(cpu)
{
- p_cpu = cpu;
- m_indexHeap = -1;
- p_cpu->modified(true);
+ cpu_->set_modified(true);
}
-
-void CpuTiAction::updateIndexHeap(int i)
+CpuTiAction::~CpuTiAction()
{
- m_indexHeap = i;
+ /* 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::setState(e_surf_action_state_t state)
+void CpuTiAction::set_state(Action::State state)
{
- CpuAction::setState(state);
- p_cpu->modified(true);
-}
-
-int CpuTiAction::unref()
-{
- m_refcount--;
- if (!m_refcount) {
- if (action_hook.is_linked())
- getStateSet()->erase(getStateSet()->iterator_to(*this));
- /* remove from action_set */
- if (action_ti_hook.is_linked())
- p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
- /* remove from heap */
- xbt_heap_remove(static_cast<CpuTiModel*>(getModel())->p_tiActionHeap, this->m_indexHeap);
- p_cpu->modified(true);
- delete this;
- return 1;
- }
- return 0;
+ CpuAction::set_state(state);
+ cpu_->set_modified(true);
}
void CpuTiAction::cancel()
{
- this->setState(SURF_ACTION_FAILED);
- xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap);
- p_cpu->modified(true);
- return;
+ 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(getModel()->getActionHeap(), m_indexHeap);
- p_cpu->modified(true);
+ 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;
- p_cpu->modified(true);
+ if (is_suspended()) {
+ set_suspend_state(Action::SuspendStates::RUNNING);
+ cpu_->set_modified(true);
}
XBT_OUT();
}
-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 = (getStartTime() + getMaxDuration()) < getFinishTime() ?
- (getStartTime() + getMaxDuration()) : getFinishTime();
+ min_finish = (get_start_time() + get_max_duration()) < get_finish_time() ? (get_start_time() + get_max_duration())
+ : get_finish_time();
else
- min_finish = getFinishTime();
-
-/* add in action heap */
- if (m_indexHeap >= 0) {
- CpuTiAction *heap_act = (CpuTiAction*)
- xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap);
- if (heap_act != this)
- DIE_IMPOSSIBLE;
- }
- xbt_heap_push(getModel()->getActionHeap(), 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;
- p_cpu->modified(true);
+ 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);
- p_cpu->updateRemainingAmount(surf_get_clock());
+ cpu_->update_remaining_amount(surf_get_clock());
XBT_OUT();
- return m_remains;
-}
-
-}
+ return get_remains_no_update();
}
-#endif /* SURF_MODEL_CPUTI_H_ */
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid