* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_ti.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/surf_interface.hpp"
{
double integral = 0;
double time = 0;
- unsigned nb_points = profile->event_list.size() + 1;
+ unsigned 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_;
*/
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;
}
/* Sanity checks */
- if ((a < 0.0) || (amount < 0.0)) {
- XBT_CRITICAL("Error, invalid parameters [a = %.2f, amount = %.2f]. "
- "You probably have a task executing with negative computation amount. Check your code.",
- a, amount);
- xbt_abort();
- }
+ xbt_assert(a >= 0.0 && amount >= 0.0,
+ "Error, invalid parameters [a = %.2f, amount = %.2f]. "
+ "You probably have a task executing with negative computation amount. Check your code.",
+ a, amount);
/* At this point, a and amount are positive */
if (amount < EPSILON)
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 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);
+ kernel::profile::DatedValue val = speed_profile_->get_event_list().at(point);
return val.value_;
}
}
/* 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<CpuTiProfile>(speed_profile);
* Model *
*********/
-void CpuTiModel::create_pm_vm_models()
-{
- xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen.");
-
- surf_cpu_model_pm = new CpuTiModel();
- models_by_type[simgrid::kernel::resource::Model::Type::CPU_PM].push_back(surf_cpu_model_pm);
- auto cpu_model_vm = new CpuTiModel();
- models_by_type[simgrid::kernel::resource::Model::Type::CPU_VM].push_back(cpu_model_vm);
-}
-
-CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
+void CpuTiModel::create_pm_models()
{
- all_existing_models.push_back(this);
-}
-
-CpuTiModel::~CpuTiModel()
-{
- surf_cpu_model_pm = nullptr;
+ auto cpu_model_pm = std::make_shared<CpuTiModel>("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);
}
Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
delete speed_integrated_trace_;
}
-void CpuTi::set_speed_profile(kernel::profile::Profile* profile)
+Cpu* 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)
sum_priority_ = 0.0;
for (CpuTiAction const& action : action_set_) {
/* action not running, skip it */
- if (action.get_state_set() != surf_cpu_model_pm->get_started_action_set())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* bogus priority, skip it */
}
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() != surf_cpu_model_pm->get_started_action_set())
+ if (action.get_state_set() != get_model()->get_started_action_set())
continue;
/* verify if the action is really running on cpu */
