X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f4329821ed097d617ccb739e1dd1b22caaadf92..6c56800bdad43cabb6c870c9163bbeea694d6692:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 6492de29da..e484442437 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -10,7 +10,6 @@ #include "src/kernel/resource/profile/Event.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" #include #include @@ -31,10 +30,10 @@ CpuTiProfile::CpuTiProfile(const profile::Profile* profile) { double integral = 0; double time = 0; - unsigned nb_points = profile->event_list.size() + 1; + unsigned long nb_points = profile->get_event_list().size() + 1; time_points_.reserve(nb_points); integral_.reserve(nb_points); - for (auto const& val : profile->event_list) { + for (auto const& val : profile->get_event_list()) { time_points_.push_back(time); integral_.push_back(integral); time += val.date_; @@ -56,11 +55,10 @@ CpuTiProfile::CpuTiProfile(const profile::Profile* profile) */ double CpuTiTmgr::integrate(double a, double b) const { - 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); - } + 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; @@ -107,10 +105,10 @@ double CpuTiProfile::integrate_simple_point(double a) const { double integral = 0; double a_aux = a; - int ind = binary_search(time_points_, 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) @@ -158,8 +156,8 @@ double CpuTiTmgr::solve(double a, double amount) const XBT_DEBUG("amount %f total %f", amount, total_); /* Reduce the problem to one where amount <= trace_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_)); + double reduced_amount = total_ * ((amount / total_) - floor(amount / total_)); + double reduced_a = a - last_time_ * static_cast(floor(a / last_time_)); XBT_DEBUG("Quotient: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a); @@ -188,7 +186,7 @@ double CpuTiTmgr::solve(double a, double amount) const double CpuTiProfile::solve_simple(double a, double amount) const { double integral_a = integrate_simple_point(a); - int ind = binary_search(integral_, integral_a + amount); + 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])); @@ -205,9 +203,9 @@ double CpuTiProfile::solve_simple(double a, double amount) const */ 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); - kernel::profile::DatedValue val = speed_profile_->event_list.at(point); + double reduced_a = a - floor(a / last_time_) * last_time_; + long point = CpuTiProfile::binary_search(profile_->get_time_points(), reduced_a); + profile::DatedValue val = speed_profile_->get_event_list().at(point); return val.value_; } @@ -231,15 +229,15 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp } /* only one point available, fixed trace */ - if (speed_profile->event_list.size() == 1) { - value_ = speed_profile->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_profile->event_list) + for (auto const& val : speed_profile->get_event_list()) total_time += val.date_; profile_ = std::make_unique(speed_profile); @@ -256,7 +254,7 @@ CpuTiTmgr::CpuTiTmgr(kernel::profile::Profile* speed_profile, double value) : sp * @param a Value to search * @return Index of point */ -int CpuTiProfile::binary_search(const std::vector& array, double a) +long CpuTiProfile::binary_search(const std::vector& array, double a) { if (array[0] > a) return 0; @@ -268,21 +266,15 @@ int CpuTiProfile::binary_search(const std::vector& array, double a) * Model * *********/ -void CpuTiModel::create_pm_vm_models() +void CpuTiModel::create_pm_models() { - auto cpu_model_pm = std::make_shared(); - simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm, - true); - simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm); - auto cpu_model_vm = std::make_shared(); - simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_VM, cpu_model_vm, - true); - simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm); + 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() : CpuModel(Model::UpdateAlgo::FULL) {} - -Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) +CpuImpl* CpuTiModel::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) { return (new CpuTi(host, speed_per_pstate))->set_model(this); } @@ -314,14 +306,14 @@ void CpuTiModel::update_actions_state(double now, double /*delta*/) XBT_DEBUG("Action %p: finish", action); action->finish(Action::State::FINISHED); /* update remaining amount of all actions */ - action->cpu_->update_remaining_amount(surf_get_clock()); + action->cpu_->update_remaining_amount(EngineImpl::get_clock()); } } /************ * Resource * ************/ -CpuTi::CpuTi(s4u::Host* host, const std::vector& speed_per_pstate) : Cpu(host, speed_per_pstate) +CpuTi::CpuTi(s4u::Host* host, const std::vector& speed_per_pstate) : CpuImpl(host, speed_per_pstate) { speed_.peak = speed_per_pstate.front(); XBT_DEBUG("CPU create: peak=%f", speed_.peak); @@ -335,19 +327,20 @@ CpuTi::~CpuTi() delete speed_integrated_trace_; } -void CpuTi::set_speed_profile(kernel::profile::Profile* profile) +CpuImpl* CpuTi::set_speed_profile(kernel::profile::Profile* profile) { delete speed_integrated_trace_; speed_integrated_trace_ = new CpuTiTmgr(profile, speed_.scale); /* add a fake trace event if periodicity == 0 */ - if (profile && profile->event_list.size() > 1) { - kernel::profile::DatedValue val = profile->event_list.back(); + 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(kernel::profile::Event* event, double value) @@ -356,7 +349,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) XBT_DEBUG("Speed changed in trace! New fixed value: %f", value); /* update remaining of actions and put in modified cpu list */ - update_remaining_amount(surf_get_clock()); + update_remaining_amount(EngineImpl::get_clock()); set_modified(true); @@ -366,7 +359,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) speed_.scale = value; tmgr_trace_event_unref(&speed_.event); - } else if (event == state_event_) { + } else if (event == get_state_event()) { if (value > 0) { if (not is_on()) { XBT_VERB("Restart actors on host %s", get_iface()->get_cname()); @@ -374,7 +367,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } } else { get_iface()->turn_off(); - double date = surf_get_clock(); + double date = EngineImpl::get_clock(); /* put all action running on cpu to failed */ for (CpuTiAction& action : action_set_) { @@ -386,7 +379,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value) } } } - tmgr_trace_event_unref(&state_event_); + unref_state_event(); } else { xbt_die("Unknown event!\n"); @@ -418,7 +411,7 @@ void CpuTi::update_actions_finish_time(double now) } 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() != get_model()->get_started_action_set()) continue; @@ -460,8 +453,8 @@ bool CpuTi::is_used() const double CpuTi::get_speed_ratio() { - speed_.scale = speed_integrated_trace_->get_power_scale(surf_get_clock()); - return Cpu::get_speed_ratio(); + speed_.scale = speed_integrated_trace_->get_power_scale(EngineImpl::get_clock()); + return CpuImpl::get_speed_ratio(); } /** @brief Update the remaining amount of actions */ @@ -502,9 +495,10 @@ void CpuTi::update_remaining_amount(double now) 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); + 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 @@ -597,26 +591,6 @@ void CpuTiAction::resume() XBT_OUT(); } -void CpuTiAction::set_max_duration(double duration) -{ - 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, ActionHeap::Type::unset); - - XBT_OUT(); -} - void CpuTiAction::set_sharing_penalty(double sharing_penalty) { XBT_IN("(%p,%g)", this, sharing_penalty); @@ -628,7 +602,7 @@ void CpuTiAction::set_sharing_penalty(double sharing_penalty) double CpuTiAction::get_remains() { XBT_IN("(%p)", this); - cpu_->update_remaining_amount(surf_get_clock()); + cpu_->update_remaining_amount(EngineImpl::get_clock()); XBT_OUT(); return get_remains_no_update(); }