X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/937f2eb5b429c3c03fc989a25fbc26fabd0cf529..fdab189916cad1bf47afa4f3c272c8ba26c36ed1:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index c7f6266ce2..46872d2340 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,33 +1,34 @@ -/* Copyright (c) 2013-2018. 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 "src/kernel/resource/profile/trace_mgr.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/trace_mgr.hpp" #include "surf/surf.hpp" -#define EPSILON 0.000000001 +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 { +namespace kernel { +namespace resource { /********* * Trace * *********/ -CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) +CpuTiProfile::CpuTiProfile(profile::Profile* profile) { double integral = 0; double time = 0; int i = 0; - nb_points_ = speedTrace->event_list.size() + 1; + nb_points_ = profile->event_list.size() + 1; time_points_ = new double[nb_points_]; integral_ = new double[nb_points_]; - for (auto const& val : speedTrace->event_list) { + for (auto const& val : profile->event_list) { time_points_[i] = time; integral_[i] = integral; integral += val.date_ * val.value_; @@ -38,7 +39,7 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) integral_[i] = integral; } -CpuTiTrace::~CpuTiTrace() +CpuTiProfile::~CpuTiProfile() { delete[] time_points_; delete [] integral_; @@ -46,7 +47,7 @@ CpuTiTrace::~CpuTiTrace() CpuTiTmgr::~CpuTiTmgr() { - delete trace_; + delete profile_; } /** @@ -81,12 +82,12 @@ double CpuTiTmgr::integrate(double a, double b) 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_); + 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); @@ -99,7 +100,7 @@ double CpuTiTmgr::integrate(double a, double b) * @param a Initial point * @param b Final point */ -double CpuTiTrace::integrate_simple(double a, double b) +double CpuTiProfile::integrate_simple(double a, double b) { return integrate_simple_point(b) - integrate_simple_point(a); } @@ -108,7 +109,7 @@ double CpuTiTrace::integrate_simple(double a, double b) * @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) { double integral = 0; double a_aux = a; @@ -175,9 +176,9 @@ 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 */ @@ -191,7 +192,7 @@ double CpuTiTmgr::solve(double a, double amount) * @param amount Amount of flops * @return The date when amount is available. */ -double CpuTiTrace::solve_simple(double a, double amount) +double CpuTiProfile::solve_simple(double a, double amount) { double integral_a = integrate_simple_point(a); int ind = binary_search(integral_, integral_a + amount, 0, nb_points_ - 1); @@ -212,8 +213,8 @@ double CpuTiTrace::solve_simple(double a, double amount) 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); + int point = profile_->binary_search(profile_->time_points_, reduced_a, 0, profile_->nb_points_ - 1); + kernel::profile::DatedValue val = speed_profile_->event_list.at(point); return val.value_; } @@ -224,13 +225,13 @@ double CpuTiTmgr::get_power_scale(double a) * @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_ = 0; /* no availability file, fixed trace */ - if (not speed_trace) { + if (not speed_profile) { type_ = Type::FIXED; value_ = value; XBT_DEBUG("No availability trace. Constant value = %f", value); @@ -238,21 +239,21 @@ CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(spee } /* only one point available, fixed trace */ - if (speed_trace->event_list.size() == 1) { + if (speed_profile->event_list.size() == 1) { type_ = Type::FIXED; - value_ = speed_trace->event_list.front().value_; + value_ = speed_profile->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->event_list) total_time += val.date_; - trace_ = new CpuTiTrace(speed_trace); + profile_ = new CpuTiProfile(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_); } @@ -266,7 +267,7 @@ CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(spee * @param high Upper bound to search in array * @return Index of point */ -int CpuTiTrace::binary_search(double* array, double a, int low, int high) +int CpuTiProfile::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); @@ -284,22 +285,17 @@ int CpuTiTrace::binary_search(double* array, double a, int low, int high) return low; } -} -} - /********* * 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(); + surf_cpu_model_pm = new simgrid::kernel::resource::CpuTiModel(); + surf_cpu_model_vm = new simgrid::kernel::resource::CpuTiModel(); } CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL) @@ -312,7 +308,7 @@ CpuTiModel::~CpuTiModel() surf_cpu_model_pm = nullptr; } -Cpu* CpuTiModel::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) +kernel::resource::Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) { return new CpuTi(this, host, speed_per_pstate, core); } @@ -351,12 +347,12 @@ 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(CpuTiModel* model, simgrid::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"); - 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 +363,22 @@ CpuTi::~CpuTi() 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) { 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->event_list.size() > 1) { + kernel::profile::DatedValue val = profile->event_list.back(); + if (val.date_ < 1e-12) { + simgrid::kernel::profile::Profile* prof = new simgrid::kernel::profile::Profile(); + speed_.event = prof->schedule(&future_evt_set, 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,8 +396,8 @@ 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()); + if (not is_on()) { + XBT_VERB("Restart processes on host %s", get_host()->get_cname()); get_host()->turn_on(); } } else { @@ -442,7 +440,7 @@ void CpuTi::update_actions_finish_time(double now) 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(); @@ -455,24 +453,24 @@ void CpuTi::update_actions_finish_time(double now) 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_priority() > 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; 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) + if (min_finish != NO_MAX_DURATION) get_model()->get_action_heap().update(&action, min_finish, kernel::resource::ActionHeap::Type::unset); else get_model()->get_action_heap().remove(&action); @@ -515,7 +513,7 @@ void CpuTi::update_remaining_amount(double now) 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 */ @@ -533,7 +531,7 @@ void CpuTi::update_remaining_amount(double now) last_update_ = now; } -CpuAction *CpuTi::execution_start(double size) +kernel::resource::CpuAction* CpuTi::execution_start(double size) { XBT_IN("(%s,%g)", get_cname(), size); CpuTiAction* action = new CpuTiAction(this, size); @@ -544,8 +542,7 @@ CpuAction *CpuTi::execution_start(double size) return action; } - -CpuAction *CpuTi::sleep(double duration) +kernel::resource::CpuAction* CpuTi::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision); @@ -554,8 +551,8 @@ CpuAction *CpuTi::sleep(double duration) CpuTiAction* 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_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); @@ -581,7 +578,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); } @@ -611,8 +608,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); } @@ -622,8 +619,8 @@ 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(); @@ -665,5 +662,6 @@ double CpuTiAction::get_remains() return get_remains_no_update(); } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid