X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65e200cd6cca5e000376f689bd6b51d0a1fa886b..a9113d6f217e32068b356fa249923e0c9be5a5b7:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 9da1734eda..33644e2506 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -12,6 +12,7 @@
 #include "ptask_L07.hpp"
 
 #include "cpu_interface.hpp"
+#include "xbt/utility.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
@@ -34,23 +35,19 @@ namespace simgrid {
 namespace surf {
 
 HostL07Model::HostL07Model() : HostModel() {
-  maxminSystem_            = new s_lmm_system_t(true /* lazy */);
-  maxminSystem_->solve_fun = &bottleneck_solve;
+  maxminSystem_            = new simgrid::kernel::lmm::System(true /* lazy */);
+  maxminSystem_->solve_fun = &simgrid::kernel::lmm::bottleneck_solve;
   surf_network_model = new NetworkL07Model(this,maxminSystem_);
   surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
 }
 
 HostL07Model::~HostL07Model()
 {
-  delete maxminSystem_;
-  maxminSystem_ = nullptr;
   delete surf_network_model;
   delete surf_cpu_model_pm;
 }
 
-CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
-  : CpuModel()
-  , hostModel_(hmodel)
+CpuL07Model::CpuL07Model(HostL07Model* hmodel, lmm_system_t sys) : CpuModel(), hostModel_(hmodel)
 {
   maxminSystem_ = sys;
 }
@@ -60,9 +57,7 @@ CpuL07Model::~CpuL07Model()
   maxminSystem_ = nullptr;
 }
 
-NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
-  : NetworkModel()
-  , hostModel_(hmodel)
+NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys) : NetworkModel(), hostModel_(hmodel)
 {
   maxminSystem_ = sys;
   loopback_     = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
@@ -294,8 +289,8 @@ bool CpuL07::isUsed(){
 
 /** @brief take into account changes of speed (either load or max) */
 void CpuL07::onSpeedChange() {
-  lmm_variable_t var = nullptr;
-  lmm_element_t elem = nullptr;
+  lmm_variable_t var       = nullptr;
+  const_lmm_element_t elem = nullptr;
 
   model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale);
   while ((var = constraint()->get_variable(&elem))) {
@@ -365,7 +360,7 @@ void LinkL07::setLatency(double value)
 {
   lmm_variable_t var = nullptr;
   L07Action *action;
-  lmm_element_t elem = nullptr;
+  const_lmm_element_t elem = nullptr;
 
   latency_.peak = value;
   while ((var = constraint()->get_variable(&elem))) {
@@ -420,7 +415,7 @@ int L07Action::unref()
   refcount_--;
   if (not refcount_) {
     if (action_hook.is_linked())
-      stateSet_->erase(stateSet_->iterator_to(*this));
+      simgrid::xbt::intrusive_erase(*stateSet_, *this);
     if (getVariable())
       getModel()->getMaxminSystem()->variable_free(getVariable());
     delete this;