*/
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;
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);
void CpuTiModel::create_pm_models()
{
- auto cpu_model_pm = std::make_shared<CpuTiModel>();
- simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm,
- true);
+ 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);
}
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);
speed_.event = prof->schedule(&profile::future_evt_set, this);
}
}
+ return this;
}
void CpuTi::apply_event(kernel::profile::Event* event, double value)
}
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;