-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2021. 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 "surf/surf.hpp"
#include <algorithm>
+#include <memory>
constexpr double EPSILON = 0.000000001;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf_cpu, "Logging specific to the SURF CPU TRACE INTEGRATION module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_ti, res_cpu, "CPU resource, Trace Integration model");
namespace simgrid {
namespace kernel {
* @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]. "
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<int>(ceil(a / last_time_));
+ a_index = 1 + ceil(a / last_time_);
else
- a_index = static_cast<int>(ceil(a / last_time_));
-
- int b_index = static_cast<int>(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);
* @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);
}
* @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;
* @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)) {
XBT_DEBUG("amount %f total %f", amount, total_);
/* Reduce the problem to one where amount <= trace_total */
- int quotient = static_cast<int>(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<int>(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;
}
/* Re-map to the original b and amount */
- return (last_time_) * static_cast<int>(floor(a / last_time_)) + (quotient * last_time_) + reduced_b;
+ return last_time_ * floor(a / last_time_) + (quotient * last_time_) + reduced_b;
}
/**
* @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);
* @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);
for (auto const& val : speed_profile->event_list)
total_time += val.date_;
- profile_.reset(new CpuTiProfile(speed_profile));
+ profile_ = std::make_unique<CpuTiProfile>(speed_profile);
last_time_ = total_time;
total_ = profile_->integrate_simple(0, total_time);
surf_cpu_model_pm = nullptr;
}
-Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
- return new CpuTi(this, host, speed_per_pstate, core);
+ return (new CpuTi(host, speed_per_pstate))->set_model(this);
}
double CpuTiModel::next_occurring_event(double now)
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
- : Cpu(model, host, speed_per_pstate, core)
+CpuTi::CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate) : Cpu(host, speed_per_pstate)
{
- xbt_assert(core == 1, "Multi-core not handled by this model yet");
-
speed_.peak = speed_per_pstate.front();
XBT_DEBUG("CPU create: peak=%f", speed_.peak);
} else if (event == state_event_) {
if (value > 0) {
if (not is_on()) {
- XBT_VERB("Restart processes on host %s", get_host()->get_cname());
- get_host()->turn_on();
+ XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
+ get_iface()->turn_on();
}
} else {
- get_host()->turn_off();
+ get_iface()->turn_off();
double date = surf_get_clock();
/* put all action running on cpu to failed */
set_modified(false);
}
-bool CpuTi::is_used()
+bool CpuTi::is_used() const
{
return not action_set_.empty();
}
