X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/446069ad8e6d4580649af853f64ebbd259737bbe..e5926d5b5a0cc033e611562ce6668ce693a5ef15:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index bec7c64110..f5fd1610e8 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -9,7 +9,6 @@
 #include <math.h> /*ceil*/
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
 
-static int storage_selective_update = 0;
 static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = nullptr;
 
 /*************
@@ -69,9 +68,7 @@ StorageN11Model::StorageN11Model() : StorageModel() {
   XBT_DEBUG("surf_storage_model_init_internal");
 
   storage_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(*action, stateHookup_));
-  if (!maxminSystem_) {
-    maxminSystem_ = lmm_system_new(storage_selective_update);
-  }
+  maxminSystem_ = lmm_system_new(false /*lazy?*/);
 }
 
 StorageN11Model::~StorageN11Model(){
@@ -110,17 +107,13 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
   return storage;
 }
 
-double StorageN11Model::next_occuring_event(double /*now*/)
+double StorageN11Model::nextOccuringEvent(double now)
 {
-  XBT_DEBUG("storage_share_resources");
-
-  double min_completion = shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
+  double min_completion = StorageModel::nextOccuringEventFull(now);
 
-  double rate;
-  // Foreach disk
   for(auto storage: p_storageList) {
-    rate = 0;
-    // Foreach write action on disk
+    double rate = 0;
+    // Foreach write action on that disk
     for (auto write_action: storage->writeActions_) {
       rate += lmm_variable_getvalue(write_action->getVariable());
     }