X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c64d08d30a940a53f16f70509a6821b0f94ad8e..147c486afe8c6315e76e1dba5b8ba803636d0755:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index ac8de2f769..bfa4e5362a 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -6,8 +6,8 @@ #include "cpu_cas01.hpp" #include "cpu_ti.hpp" -#include "maxmin_private.hpp" #include "simgrid/sg_config.h" +#include "src/kernel/lmm/maxmin.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module"); @@ -53,7 +53,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() } p_cpuRunningActionSetThatDoesNotNeedBeingChecked = new ActionList(); - maxminSystem_ = new s_lmm_system_t(selectiveUpdate_); + maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { modifiedSet_ = new ActionLmmList(); @@ -104,7 +104,7 @@ bool CpuCas01::isUsed() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; + const_lmm_element_t elem = nullptr; model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak); while ((var = constraint()->get_variable(&elem))) { @@ -138,7 +138,7 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value) } else { lmm_constraint_t cnst = constraint(); lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; + const_lmm_element_t elem = nullptr; double date = surf_get_clock(); turnOff();