#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 <algorithm>
#include <memory>
{
double integral = 0;
double time = 0;
- unsigned nb_points = profile->get_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->get_event_list()) {
*/
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;
{
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)
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<int>(floor(a / last_time_));
+ double reduced_amount = total_ * ((amount / total_) - floor(amount / total_));
+ double reduced_a = a - last_time_ * static_cast<int>(floor(a / last_time_));
XBT_DEBUG("Quotient: %g reduced_amount: %f reduced_a: %f", quotient, reduced_amount, reduced_a);
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]));
*/
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_->get_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_;
}
* @param a Value to search
* @return Index of point
*/
-int CpuTiProfile::binary_search(const std::vector<double>& array, double a)
+long CpuTiProfile::binary_search(const std::vector<double>& array, double a)
{
if (array[0] > a)
return 0;
void CpuTiModel::create_pm_models()
{
- auto cpu_model_pm = std::make_shared<CpuTiModel>();
- cpu_model_pm->set_name("Cpu_TI");
- simgrid::kernel::EngineImpl::get_instance()->add_model(cpu_model_pm, {});
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
+ auto cpu_model_pm = std::make_shared<CpuTiModel>("Cpu_TI");
+ auto* engine = EngineImpl::get_instance();
+ engine->add_model(cpu_model_pm);
+ engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm);
}
-Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+CpuImpl* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
return (new CpuTi(host, speed_per_pstate))->set_model(this);
}
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<double>& speed_per_pstate) : Cpu(host, speed_per_pstate)
+CpuTi::CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate) : CpuImpl(host, speed_per_pstate)
{
speed_.peak = speed_per_pstate.front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
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);
speed_.event = prof->schedule(&profile::future_evt_set, this);
}
}
+ return this;
}
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);
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());
}
} 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_) {
}
}
}
- tmgr_trace_event_unref(&state_event_);
+ unref_state_event();
} else {
xbt_die("Unknown event!\n");
}
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;
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 */
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
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);
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();
}
