X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3880093b08b4663a22f6ea9c35e7dfa7248a5491..e63c67321577f0816604fe730cd0bc856970454d:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 765354bbf2..36f54ff726 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -10,6 +10,7 @@ #include "surf/surf.hpp" #include +#include constexpr double EPSILON = 0.000000001; @@ -23,7 +24,7 @@ namespace resource { * Trace * *********/ -CpuTiProfile::CpuTiProfile(profile::Profile* profile) +CpuTiProfile::CpuTiProfile(const profile::Profile* profile) { double integral = 0; double time = 0; @@ -50,7 +51,7 @@ CpuTiProfile::CpuTiProfile(profile::Profile* profile) * @param b End of interval * @return the integrate value. -1 if an error occurs. */ -double CpuTiTmgr::integrate(double a, double b) +double CpuTiTmgr::integrate(double a, double b) const { if ((a < 0.0) || (a > b)) { xbt_die("Error, invalid integration interval [%.2f,%.2f]. " @@ -63,21 +64,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_)); - - int b_index = static_cast(floor(b / last_time_)); + a_index = ceil(a / last_time_); + double b_index = floor(b / last_time_); if (a_index > b_index) { /* Same chunk */ - return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - (b_index)*last_time_); + return profile_->integrate_simple(a - (a_index - 1) * last_time_, b - b_index * last_time_); } double first_chunk = profile_->integrate_simple(a - (a_index - 1) * last_time_, last_time_); double middle_chunk = (b_index - a_index) * total_; - double last_chunk = profile_->integrate_simple(0.0, b - (b_index)*last_time_); + double last_chunk = profile_->integrate_simple(0.0, b - b_index * last_time_); XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk); @@ -90,7 +90,7 @@ double CpuTiTmgr::integrate(double a, double b) * @param a Initial point * @param b Final point */ -double CpuTiProfile::integrate_simple(double a, double b) +double CpuTiProfile::integrate_simple(double a, double b) const { return integrate_simple_point(b) - integrate_simple_point(a); } @@ -99,7 +99,7 @@ double CpuTiProfile::integrate_simple(double a, double b) * @brief Auxiliary function to compute the integral at point a. * @param a point */ -double CpuTiProfile::integrate_simple_point(double a) +double CpuTiProfile::integrate_simple_point(double a) const { double integral = 0; double a_aux = a; @@ -126,7 +126,7 @@ double CpuTiProfile::integrate_simple_point(double a) * @param amount Amount to be executed * @return End time */ -double CpuTiTmgr::solve(double a, double amount) +double CpuTiTmgr::solve(double a, double amount) const { /* Fix very small negative numbers */ if ((a < 0.0) && (a > -EPSILON)) { @@ -154,11 +154,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 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; @@ -172,7 +172,7 @@ double CpuTiTmgr::solve(double a, double amount) } /* 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; } /** @@ -182,7 +182,7 @@ double CpuTiTmgr::solve(double a, double amount) * @param amount Amount of flops * @return The date when amount is available. */ -double CpuTiProfile::solve_simple(double a, double amount) +double CpuTiProfile::solve_simple(double a, double amount) const { double integral_a = integrate_simple_point(a); int ind = binary_search(integral_, integral_a + amount); @@ -200,7 +200,7 @@ double CpuTiProfile::solve_simple(double a, double amount) * @param a Time * @return CPU speed scale */ -double CpuTiTmgr::get_power_scale(double a) +double CpuTiTmgr::get_power_scale(double a) const { double reduced_a = a - floor(a / last_time_) * last_time_; int point = CpuTiProfile::binary_search(profile_->time_points_, reduced_a); @@ -222,7 +222,6 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp /* no availability file, fixed trace */ if (not speed_profile) { - type_ = Type::FIXED; value_ = value; XBT_DEBUG("No availability trace. Constant value = %f", value); return; @@ -230,7 +229,6 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp /* only one point available, fixed trace */ if (speed_profile->event_list.size() == 1) { - type_ = Type::FIXED; value_ = speed_profile->event_list.front().value_; return; } @@ -241,7 +239,7 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp for (auto const& val : speed_profile->event_list) total_time += val.date_; - profile_.reset(new CpuTiProfile(speed_profile)); + profile_ = std::make_unique(speed_profile); last_time_ = total_time; total_ = profile_->integrate_simple(0, total_time); @@ -272,8 +270,8 @@ void CpuTiModel::create_pm_vm_models() xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen."); xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen."); - surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel(); - surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel(); + surf_cpu_model_pm = new CpuTiModel(); + surf_cpu_model_vm = new CpuTiModel(); } CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL) @@ -286,12 +284,12 @@ CpuTiModel::~CpuTiModel() surf_cpu_model_pm = nullptr; } -kernel::resource::Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) +Cpu* CpuTiModel::create_cpu(s4u::Host* host, const 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; @@ -316,7 +314,7 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { auto* action = static_cast(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()); } @@ -325,7 +323,7 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, const std::vector& speed_per_pstate, int core) +CpuTi::CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector& speed_per_pstate, int core) : Cpu(model, host, speed_per_pstate, core) { xbt_assert(core == 1, "Multi-core not handled by this model yet"); @@ -341,6 +339,7 @@ CpuTi::~CpuTi() set_modified(false); delete speed_integrated_trace_; } + void CpuTi::set_speed_profile(kernel::profile::Profile* profile) { delete speed_integrated_trace_; @@ -350,7 +349,7 @@ void CpuTi::set_speed_profile(kernel::profile::Profile* profile) 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(); + auto* prof = new kernel::profile::Profile(); speed_.event = prof->schedule(&profile::future_evt_set, this); } } @@ -375,7 +374,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } else if (event == state_event_) { if (value > 0) { if (not is_on()) { - XBT_VERB("Restart processes on host %s", get_host()->get_cname()); + XBT_VERB("Restart actors on host %s", get_host()->get_cname()); get_host()->turn_on(); } } else { @@ -384,11 +383,10 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) /* 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); } } @@ -449,7 +447,7 @@ void CpuTi::update_actions_finish_time(double now) } /* add in action heap */ if (min_finish != NO_MAX_DURATION) - get_model()->get_action_heap().update(&action, min_finish, kernel::resource::ActionHeap::Type::unset); + get_model()->get_action_heap().update(&action, min_finish, ActionHeap::Type::unset); else get_model()->get_action_heap().remove(&action); @@ -509,7 +507,7 @@ void CpuTi::update_remaining_amount(double now) last_update_ = now; } -kernel::resource::CpuAction* CpuTi::execution_start(double size) +CpuAction* CpuTi::execution_start(double size) { XBT_IN("(%s,%g)", get_cname(), size); auto* action = new CpuTiAction(this, size); @@ -520,7 +518,7 @@ kernel::resource::CpuAction* CpuTi::execution_start(double size) return action; } -kernel::resource::CpuAction* CpuTi::sleep(double duration) +CpuAction* CpuTi::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision); @@ -529,9 +527,9 @@ kernel::resource::CpuAction* CpuTi::sleep(double duration) auto* action = new CpuTiAction(this, 1.0); action->set_max_duration(duration); - action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING); + action->set_suspend_state(Action::SuspendStates::SLEEPING); if (duration == NO_MAX_DURATION) - action->set_state(simgrid::kernel::resource::Action::State::IGNORED); + action->set_state(Action::State::IGNORED); action_set_.push_back(*action); @@ -548,7 +546,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); } } @@ -564,7 +562,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); @@ -619,7 +617,7 @@ void CpuTiAction::set_max_duration(double duration) min_finish = get_finish_time(); /* add in action heap */ - get_model()->get_action_heap().update(this, min_finish, kernel::resource::ActionHeap::Type::unset); + get_model()->get_action_heap().update(this, min_finish, ActionHeap::Type::unset); XBT_OUT(); }