X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4e41762b17bf6a411ffc728bfd0e49de5eb110a..38f246c4c46920a78ea0af8233449f402c178f04:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 40c049080b..d183dc3f49 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,70 +1,65 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "cpu_ti.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/profile/Event.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/trace_mgr.hpp" #include "surf/surf.hpp" -#define EPSILON 0.000000001 +#include +#include -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(cpu_ti, res_cpu, "CPU resource, Trace Integration model"); namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /********* * Trace * *********/ -CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) +CpuTiProfile::CpuTiProfile(const profile::Profile* profile) { - double integral = 0; - double time = 0; - int i = 0; - nb_points_ = speedTrace->event_list.size() + 1; - time_points_ = new double[nb_points_]; - integral_ = new double[nb_points_]; - for (auto const& val : speedTrace->event_list) { - time_points_[i] = time; - integral_[i] = integral; - integral += val.date_ * val.value_; + double integral = 0; + double time = 0; + unsigned long nb_points = profile->get_event_list().size() + 1; + time_points_.reserve(nb_points); + integral_.reserve(nb_points); + for (auto const& val : profile->get_event_list()) { + time_points_.push_back(time); + integral_.push_back(integral); time += val.date_; - i++; + integral += val.date_ * val.value_; } - time_points_[i] = time; - integral_[i] = integral; -} - -CpuTiTrace::~CpuTiTrace() -{ - delete[] time_points_; - delete [] integral_; -} - -CpuTiTmgr::~CpuTiTmgr() -{ - delete 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 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_die("Error, invalid integration interval [%.2f,%.2f]. " - "You probably have a task executing with negative computation amount. Check your code.", a, b); - } + * @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) const +{ + xbt_assert(a >= 0.0 && a <= b, + "Error, invalid integration interval [%.2f,%.2f]. You probably have a task executing with negative " + "computation amount. Check your code.", + a, b); if (fabs(a - b) < EPSILON) return 0.0; @@ -72,21 +67,20 @@ double CpuTiTmgr::integrate(double a, double b) return (b - a) * value_; } - int a_index; + double a_index; if (fabs(ceil(a / last_time_) - a / last_time_) < EPSILON) - a_index = 1 + static_cast(ceil(a / last_time_)); + a_index = 1 + ceil(a / last_time_); else - a_index = static_cast(ceil(a / last_time_)); + a_index = ceil(a / last_time_); + double b_index = floor(b / last_time_); - int b_index = static_cast(floor(b / last_time_)); - - if (a_index > b_index) { /* Same chunk */ - return trace_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_); + if (a_index > b_index) { /* Same chunk */ + return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - b_index * last_time_); } - double first_chunk = trace_->integrate_simple(a - (a_index - 1) * last_time_, last_time_); + double first_chunk = profile_->integrate_simple(a - (a_index - 1) * last_time_, last_time_); double middle_chunk = (b_index - a_index) * total_; - double last_chunk = trace_->integrate_simple(0.0, b - (b_index)*last_time_); + double last_chunk = profile_->integrate_simple(0.0, b - b_index * last_time_); XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk); @@ -94,28 +88,28 @@ double CpuTiTmgr::integrate(double a, double b) } /** - * \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 a Initial point - * \param b Final point -*/ -double CpuTiTrace::integrate_simple(double a, double b) + * @param a Initial point + * @param b Final point + */ +double CpuTiProfile::integrate_simple(double a, double b) const { return integrate_simple_point(b) - integrate_simple_point(a); } /** - * \brief Auxiliary function to compute the integral at point a. - * \param a point + * @brief Auxiliary function to compute the integral at point a. + * @param a point */ -double CpuTiTrace::integrate_simple_point(double a) +double CpuTiProfile::integrate_simple_point(double a) const { double integral = 0; - double a_aux = a; - int ind = binary_search(time_points_, a, 0, nb_points_ - 1); + double a_aux = a; + long 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], + XBT_DEBUG("a %f ind %ld 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) @@ -127,15 +121,15 @@ double CpuTiTrace::integrate_simple_point(double a) } /** -* \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) + * @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) const { /* Fix very small negative numbers */ if ((a < 0.0) && (a > -EPSILON)) { @@ -146,11 +140,10 @@ double CpuTiTmgr::solve(double a, double amount) } /* 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_abort(); - } + xbt_assert(a >= 0.0 && amount >= 0.0, + "Error, invalid parameters [a = %.2f, amount = %.2f]. " + "You probably have a task executing with negative computation amount. Check your code.", + a, amount); /* At this point, a and amount are positive */ if (amount < EPSILON) @@ -163,11 +156,11 @@ double CpuTiTmgr::solve(double a, double amount) XBT_DEBUG("amount %f total %f", amount, total_); /* Reduce the problem to one where amount <= trace_total */ - int quotient = static_cast(floor(amount / total_)); - double reduced_amount = (total_) * ((amount / total_) - floor(amount / total_)); - double reduced_a = a - (last_time_) * static_cast(floor(a / last_time_)); + double quotient = floor(amount / total_); + double reduced_amount = total_ * ((amount / total_) - floor(amount / total_)); + double reduced_a = a - last_time_ * static_cast(floor(a / last_time_)); - XBT_DEBUG("Quotient: %d reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a); + XBT_DEBUG("Quotient: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a); /* Now solve for new_amount which is <= trace_total */ double reduced_b; @@ -175,26 +168,26 @@ double CpuTiTmgr::solve(double a, double amount) double amount_till_end = integrate(reduced_a, last_time_); if (amount_till_end > reduced_amount) { - reduced_b = trace_->solve_simple(reduced_a, reduced_amount); + reduced_b = profile_->solve_simple(reduced_a, reduced_amount); } else { - reduced_b = last_time_ + trace_->solve_simple(0.0, reduced_amount - amount_till_end); + reduced_b = last_time_ + profile_->solve_simple(0.0, reduced_amount - amount_till_end); } /* Re-map to the original b and amount */ - return (last_time_) * static_cast(floor(a / last_time_)) + (quotient * last_time_) + reduced_b; + return last_time_ * 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 a Initial point - * \param amount Amount of flops - * \return The date when amount is available. -*/ -double CpuTiTrace::solve_simple(double a, double amount) + * @param a Initial point + * @param amount Amount of flops + * @return The date when amount is available. + */ +double CpuTiProfile::solve_simple(double a, double amount) const { double integral_a = integrate_simple_point(a); - int ind = binary_search(integral_, integral_a + amount, 0, nb_points_ - 1); + long 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])); @@ -203,121 +196,91 @@ double CpuTiTrace::solve_simple(double a, double amount) } /** -* \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 = trace_->binary_search(trace_->time_points_, reduced_a, 0, trace_->nb_points_ - 1); - trace_mgr::DatedValue val = speed_trace_->event_list.at(point); + * @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) const +{ + double reduced_a = a - floor(a / last_time_) * last_time_; + long point = CpuTiProfile::binary_search(profile_->time_points_, reduced_a); + kernel::profile::DatedValue val = speed_profile_->get_event_list().at(point); return val.value_; } /** - * \brief Creates a new integration trace from a tmgr_trace_t + * @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 + * @param speed_trace CPU availability trace + * @param value Percentage of CPU speed available (useful to fixed tracing) + * @return Integration trace structure */ -CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(speed_trace) +CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : speed_profile_(speed_profile) { double total_time = 0.0; - trace_ = 0; + profile_.reset(nullptr); /* no availability file, fixed trace */ - if (not speed_trace) { - type_ = Type::FIXED; + if (not speed_profile) { value_ = value; XBT_DEBUG("No availability trace. Constant value = %f", value); return; } /* only one point available, fixed trace */ - if (speed_trace->event_list.size() == 1) { - type_ = Type::FIXED; - value_ = speed_trace->event_list.front().value_; + if (speed_profile->get_event_list().size() == 1) { + value_ = speed_profile->get_event_list().front().value_; return; } type_ = Type::DYNAMIC; /* count the total time of trace file */ - for (auto const& val : speed_trace->event_list) + for (auto const& val : speed_profile->get_event_list()) total_time += val.date_; - trace_ = new CpuTiTrace(speed_trace); + profile_ = std::make_unique(speed_profile); last_time_ = total_time; - total_ = trace_->integrate_simple(0, total_time); + total_ = profile_->integrate_simple(0, total_time); 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::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); - - do { - int 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); - - 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 + */ +long CpuTiProfile::binary_search(const std::vector& 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 * *********/ -namespace simgrid { -namespace surf { - -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::surf::CpuTiModel(); - surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); -} -CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL) +void CpuTiModel::create_pm_models() { - all_existing_models->push_back(this); + auto cpu_model_pm = std::make_shared("Cpu_TI"); + auto* engine = EngineImpl::get_instance(); + engine->add_model(cpu_model_pm); + engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm); } -CpuTiModel::~CpuTiModel() +CpuImpl* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { - surf_cpu_model_pm = nullptr; + return (new CpuTi(host, speed_per_pstate))->set_model(this); } -Cpu* CpuTiModel::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) -{ - 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; @@ -340,9 +303,9 @@ double CpuTiModel::next_occuring_event(double now) 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)) { - CpuTiAction* action = static_cast(get_action_heap().pop()); + auto* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Action %p: finish", action); - action->finish(kernel::resource::Action::State::FINISHED); + action->finish(Action::State::FINISHED); /* update remaining amount of all actions */ action->cpu_->update_remaining_amount(surf_get_clock()); } @@ -351,12 +314,9 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) - : Cpu(model, host, speedPerPstate, core) +CpuTi::CpuTi(s4u::Host* host, const std::vector& speed_per_pstate) : CpuImpl(host, speed_per_pstate) { - xbt_assert(core == 1, "Multi-core not handled by this model yet"); - - speed_.peak = speedPerPstate->front(); + speed_.peak = speed_per_pstate.front(); XBT_DEBUG("CPU create: peak=%f", speed_.peak); speed_integrated_trace_ = new CpuTiTmgr(nullptr, 1 /*scale*/); @@ -367,20 +327,24 @@ CpuTi::~CpuTi() set_modified(false); delete speed_integrated_trace_; } -void CpuTi::set_speed_trace(tmgr_trace_t trace) + +CpuImpl* CpuTi::set_speed_profile(kernel::profile::Profile* profile) { delete speed_integrated_trace_; - speed_integrated_trace_ = new CpuTiTmgr(trace, speed_.scale); + speed_integrated_trace_ = new CpuTiTmgr(profile, speed_.scale); /* add a fake trace event if periodicity == 0 */ - if (trace && trace->event_list.size() > 1) { - trace_mgr::DatedValue val = trace->event_list.back(); - if (val.date_ < 1e-12) - speed_.event = future_evt_set->add_trace(new simgrid::trace_mgr::trace(), this); + if (profile && profile->get_event_list().size() > 1) { + kernel::profile::DatedValue val = profile->get_event_list().back(); + if (val.date_ < 1e-12) { + auto* prof = new kernel::profile::Profile(); + speed_.event = prof->schedule(&profile::future_evt_set, this); + } } + return this; } -void CpuTi::apply_event(tmgr_trace_event_t event, double value) +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); @@ -398,20 +362,20 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value) } else if (event == state_event_) { if (value > 0) { - if (is_off()) - host_that_restart.push_back(get_host()); - turn_on(); + if (not is_on()) { + XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); + get_iface()->turn_on(); + } } else { - turn_off(); + get_iface()->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) { + if (action.get_state() == Action::State::INITED || action.get_state() == Action::State::STARTED || + action.get_state() == Action::State::IGNORED) { action.set_finish_time(date); - action.set_state(kernel::resource::Action::State::FAILED); + action.set_state(Action::State::FAILED); get_model()->get_action_heap().remove(&action); } } @@ -433,46 +397,46 @@ void CpuTi::update_actions_finish_time(double now) 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()) + if (action.get_state_set() != get_model()->get_started_action_set()) continue; /* bogus priority, skip it */ - if (action.get_priority() <= 0) + if (action.get_sharing_penalty() <= 0) continue; /* action suspended, skip it */ - if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended) + if (not action.is_running()) continue; - sum_priority_ += 1.0 / action.get_priority(); + sum_priority_ += 1.0 / action.get_sharing_penalty(); } for (CpuTiAction& action : action_set_) { - double min_finish = -1; + double min_finish = NO_MAX_DURATION; /* action not running, skip it */ - if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set()) + if (action.get_state_set() != get_model()->get_started_action_set()) continue; /* verify if the action is really running on cpu */ - if (action.suspended_ == kernel::resource::Action::SuspendStates::not_suspended && action.get_priority() > 0) { + 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_priority()) / speed_.peak; + 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 && + 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) + 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); + if (min_finish != NO_MAX_DURATION) + get_model()->get_action_heap().update(&action, min_finish, ActionHeap::Type::unset); else get_model()->get_action_heap().remove(&action); @@ -483,7 +447,7 @@ void CpuTi::update_actions_finish_time(double now) set_modified(false); } -bool CpuTi::is_used() +bool CpuTi::is_used() const { return not action_set_.empty(); } @@ -491,7 +455,7 @@ bool CpuTi::is_used() double CpuTi::get_speed_ratio() { speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock()); - return Cpu::get_speed_ratio(); + return CpuImpl::get_speed_ratio(); } /** @brief Update the remaining amount of actions */ @@ -510,11 +474,11 @@ void CpuTi::update_remaining_amount(double now) continue; /* bogus priority, skip it */ - if (action.get_priority() <= 0) + if (action.get_sharing_penalty() <= 0) continue; /* action suspended, skip it */ - if (action.suspended_ != kernel::resource::Action::SuspendStates::not_suspended) + if (not action.is_running()) continue; /* action don't need update */ @@ -526,16 +490,17 @@ void CpuTi::update_remaining_amount(double now) continue; /* update remaining */ - action.update_remains(area_total / (sum_priority_ * action.get_priority())); + 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; } -CpuAction *CpuTi::execution_start(double size) +CpuAction* CpuTi::execution_start(double size, double user_bound) { XBT_IN("(%s,%g)", get_cname(), size); - CpuTiAction* action = new CpuTiAction(this, size); + xbt_assert(user_bound <= 0, "Invalid user bound (%lf) in CPU TI model", user_bound); + auto* action = new CpuTiAction(this, size); action_set_.push_back(*action); // Actually start the action @@ -543,19 +508,18 @@ CpuAction *CpuTi::execution_start(double size) return action; } - -CpuAction *CpuTi::sleep(double duration) +CpuAction* CpuTi::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision); XBT_IN("(%s,%g)", get_cname(), duration); - CpuTiAction* action = new CpuTiAction(this, 1.0); + auto* action = new CpuTiAction(this, 1.0); action->set_max_duration(duration); - action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; - if (duration < 0) // NO_MAX_DURATION - action->set_state(simgrid::kernel::resource::Action::State::IGNORED); + action->set_suspend_state(Action::SuspendStates::SLEEPING); + if (duration == NO_MAX_DURATION) + action->set_state(Action::State::IGNORED); action_set_.push_back(*action); @@ -572,7 +536,7 @@ void CpuTi::set_modified(bool modified) } } else { if (cpu_ti_hook.is_linked()) - simgrid::xbt::intrusive_erase(modified_cpus, *this); + xbt::intrusive_erase(modified_cpus, *this); } } @@ -580,7 +544,7 @@ void CpuTi::set_modified(bool modified) * Action * **********/ -CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, cpu->is_off()), cpu_(cpu) +CpuTiAction::CpuTiAction(CpuTi* cpu, double cost) : CpuAction(cpu->get_model(), cost, not cpu->is_on()), cpu_(cpu) { cpu_->set_modified(true); } @@ -588,7 +552,7 @@ CpuTiAction::~CpuTiAction() { /* remove from action_set */ if (action_ti_hook.is_linked()) - simgrid::xbt::intrusive_erase(cpu_->action_set_, *this); + xbt::intrusive_erase(cpu_->action_set_, *this); /* remove from heap */ get_model()->get_action_heap().remove(this); cpu_->set_modified(true); @@ -610,8 +574,8 @@ void CpuTiAction::cancel() void CpuTiAction::suspend() { XBT_IN("(%p)", this); - if (suspended_ != Action::SuspendStates::sleeping) { - suspended_ = Action::SuspendStates::suspended; + if (is_running()) { + set_suspend_state(Action::SuspendStates::SUSPENDED); get_model()->get_action_heap().remove(this); cpu_->set_modified(true); } @@ -621,37 +585,17 @@ void CpuTiAction::suspend() void CpuTiAction::resume() { XBT_IN("(%p)", this); - if (suspended_ != Action::SuspendStates::sleeping) { - suspended_ = Action::SuspendStates::not_suspended; + if (is_suspended()) { + set_suspend_state(Action::SuspendStates::RUNNING); cpu_->set_modified(true); } XBT_OUT(); } -void CpuTiAction::set_max_duration(double duration) +void CpuTiAction::set_sharing_penalty(double sharing_penalty) { - 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_priority(double priority) -{ - XBT_IN("(%p,%g)", this, priority); - set_priority_no_update(priority); + XBT_IN("(%p,%g)", this, sharing_penalty); + set_sharing_penalty_no_update(sharing_penalty); cpu_->set_modified(true); XBT_OUT(); } @@ -664,5 +608,6 @@ double CpuTiAction::get_remains() return get_remains_no_update(); } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid