X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfa4e95e4538099a54c5afedd403264c8d99adb6..39f579ce40d3bd04d9f64a7914b07d1ec3334e4b:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 9a08026109..b97d8fa965 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -4,49 +4,40 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #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 "src/surf/trace_mgr.hpp" #include "surf/surf.hpp" -#define EPSILON 0.000000001 +#include + +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 * *********/ -CpuTiProfile::CpuTiProfile(kernel::profile::Profile* profile) +CpuTiProfile::CpuTiProfile(profile::Profile* profile) { double integral = 0; double time = 0; - int i = 0; - nb_points_ = profile->event_list.size() + 1; - time_points_ = new double[nb_points_]; - integral_ = new double[nb_points_]; + 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_[i] = time; - integral_[i] = integral; - integral += val.date_ * val.value_; + 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; -} - -CpuTiProfile::~CpuTiProfile() -{ - delete[] time_points_; - delete [] integral_; -} - -CpuTiTmgr::~CpuTiTmgr() -{ - delete profile_; + time_points_.push_back(time); + integral_.push_back(integral); } /** @@ -112,7 +103,7 @@ double CpuTiProfile::integrate_simple_point(double a) { double integral = 0; double a_aux = a; - int ind = binary_search(time_points_, a, 0, nb_points_ - 1); + 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], @@ -194,7 +185,7 @@ double CpuTiTmgr::solve(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); + 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])); @@ -212,7 +203,7 @@ double CpuTiProfile::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 = profile_->binary_search(profile_->time_points_, reduced_a, 0, profile_->nb_points_ - 1); + int point = CpuTiProfile::binary_search(profile_->time_points_, reduced_a); kernel::profile::DatedValue val = speed_profile_->event_list.at(point); return val.value_; } @@ -227,7 +218,7 @@ double CpuTiTmgr::get_power_scale(double a) CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : speed_profile_(speed_profile) { double total_time = 0.0; - profile_ = 0; + profile_.reset(nullptr); /* no availability file, fixed trace */ if (not speed_profile) { @@ -250,7 +241,7 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp for (auto const& val : speed_profile->event_list) total_time += val.date_; - profile_ = new CpuTiProfile(speed_profile); + profile_.reset(new CpuTiProfile(speed_profile)); last_time_ = total_time; total_ = profile_->integrate_simple(0, total_time); @@ -259,47 +250,30 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp /** * @brief Binary search in array. - * It returns the first point of the interval in which "a" is. + * It returns the last 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 CpuTiProfile::binary_search(double* array, double a, int low, int high) +int CpuTiProfile::binary_search(const std::vector& array, double a) { - 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; -} - -} + 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(); + 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,12 +286,12 @@ 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); } -double CpuTiModel::next_occuring_event(double now) +double CpuTiModel::next_occurring_event(double now) { double min_action_duration = -1; @@ -340,7 +314,7 @@ 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); /* update remaining amount of all actions */ @@ -351,12 +325,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*/); @@ -375,8 +349,10 @@ void CpuTi::set_speed_profile(kernel::profile::Profile* profile) /* 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) - speed_.event = future_evt_set.add_trace(new simgrid::kernel::profile::Profile(), this); + if (val.date_ < 1e-12) { + auto* prof = new simgrid::kernel::profile::Profile(); + speed_.event = prof->schedule(&profile::future_evt_set, this); + } } } @@ -398,7 +374,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } else if (event == state_event_) { if (value > 0) { - if (is_off()) { + if (not is_on()) { XBT_VERB("Restart processes on host %s", get_host()->get_cname()); get_host()->turn_on(); } @@ -438,14 +414,14 @@ void CpuTi::update_actions_finish_time(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; - sum_priority_ += 1.0 / action.get_priority(); + sum_priority_ += 1.0 / action.get_sharing_penalty(); } for (CpuTiAction& action : action_set_) { @@ -455,24 +431,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_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) + 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); @@ -511,11 +487,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 */ @@ -527,16 +503,16 @@ 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) +kernel::resource::CpuAction* CpuTi::execution_start(double size) { XBT_IN("(%s,%g)", get_cname(), size); - CpuTiAction* action = new CpuTiAction(this, size); + auto* action = new CpuTiAction(this, size); action_set_.push_back(*action); // Actually start the action @@ -544,18 +520,17 @@ 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); 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_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 +556,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 +586,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 +597,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(); @@ -649,10 +624,10 @@ void CpuTiAction::set_max_duration(double duration) XBT_OUT(); } -void CpuTiAction::set_priority(double priority) +void CpuTiAction::set_sharing_penalty(double sharing_penalty) { - 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(); } @@ -665,5 +640,6 @@ double CpuTiAction::get_remains() return get_remains_no_update(); } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid