X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/685040f3a8779f848f54d8bc8f8d1d1bf003a622..2b3790827a15510aa6b18146bc01597a568b332b:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 8fafa0b4c3..899546c65b 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -50,10 +50,7 @@ void surf_cpu_model_init_Cas01() 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 { @@ -61,6 +58,8 @@ namespace surf { CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo) { + all_existing_models.push_back(this); + bool select = simgrid::config::get_value("cpu/maxmin-selective-update"); if (algo == Model::UpdateAlgo::LAZY) { @@ -116,7 +115,7 @@ void CpuCas01::on_speed_change() 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] */ @@ -131,16 +130,17 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) 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 (is_off()) { + 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(var->get_id()); @@ -171,7 +171,7 @@ 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); } -CpuAction *CpuCas01::sleep(double duration) +CpuAction* CpuCas01::sleep(double duration) { if (duration > 0) duration = std::max(duration, sg_surf_precision);