-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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 "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
}),
- [](std::string const& val) {
+ [](std::string const&) {
xbt_assert(_sg_cfg_init_status < 2,
"Cannot change the optimization algorithm after the initialization");
});
*********/
void surf_cpu_model_init_Cas01()
{
- xbt_assert(not surf_cpu_model_pm);
- xbt_assert(not surf_cpu_model_vm);
+ xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen.");
+ xbt_assert(surf_cpu_model_vm == nullptr, "CPU model already initialized. This should not happen.");
if (cpu_optim_opt == "TI") {
- surf_cpu_model_init_ti();
+ simgrid::surf::CpuTiModel::create_pm_vm_models();
return;
}
simgrid::kernel::resource::Model::UpdateAlgo algo;
if (cpu_optim_opt == "Lazy")
- algo = simgrid::kernel::resource::Model::UpdateAlgo::Lazy;
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::LAZY;
else
- algo = simgrid::kernel::resource::Model::UpdateAlgo::Full;
+ algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(algo);
- all_existing_models->push_back(surf_cpu_model_pm);
-
surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(algo);
- all_existing_models->push_back(surf_cpu_model_vm);
}
namespace simgrid {
CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo)
{
+ all_existing_models.push_back(this);
+
bool select = simgrid::config::get_value<bool>("cpu/maxmin-selective-update");
- if (algo == Model::UpdateAlgo::Lazy) {
+ if (algo == Model::UpdateAlgo::LAZY) {
xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"),
"You cannot disable cpu selective update when using the lazy update mechanism");
select = true;
Cpu::on_speed_change();
}
-void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
+void CpuCas01::apply_event(kernel::profile::Event* event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
- if (is_off())
- host_that_restart.push_back(get_host());
- turn_on();
+ if (not is_on()) {
+ XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+ get_host()->turn_on();
+ }
} else {
kernel::lmm::Constraint* cnst = get_constraint();
kernel::lmm::Variable* var = nullptr;
const kernel::lmm::Element* elem = nullptr;
double date = surf_get_clock();
- turn_off();
+ get_host()->turn_off();
while ((var = cnst->get_variable(&elem))) {
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
CpuAction* CpuCas01::execution_start(double size)
{
- return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint());
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint());
}
CpuAction* CpuCas01::execution_start(double size, int requested_cores)
{
- return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores);
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(),
+ requested_cores);
}
-CpuAction *CpuCas01::sleep(double duration)
+CpuAction* CpuCas01::sleep(double duration)
{
if (duration > 0)
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
- CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off(), speed_.scale * speed_.peak, get_constraint());
+ CpuCas01Action* action =
+ new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint());
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
- if (duration < 0) // NO_MAX_DURATION
+ if (duration == NO_MAX_DURATION)
action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
- if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { // remove action from the heap
+ if (get_model()->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::LAZY) { // remove action from the heap
get_model()->get_action_heap().remove(action);
// this is necessary for a variable with weight 0 since such variables are ignored in lmm and we need to set its
// max_duration correctly at the next call to share_resources
model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
, requested_core_(requested_core)
{
- if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy)
+ if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::LAZY)
set_last_update();
model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
}
