factor parce_factor

[simgrid.git] / src / surf / storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 92eacad..e23abc2 100644 (file)
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -103,14 +103,9 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
   xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
 
   XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n",
-      id,
-      type_id,
-      properties,
-      Bread);
+      id, type_id, properties, Bread);
 
-  if(!p_storageList)
-    p_storageList = xbt_dynar_new(sizeof(char *),nullptr);
-  xbt_dynar_push(p_storageList, &storage);
+  p_storageList.push_back(storage);
 
   return storage;
 }
@@ -118,24 +113,19 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
 double StorageN11Model::next_occuring_event(double /*now*/)
 {
   XBT_DEBUG("storage_share_resources");
-  unsigned int i, j;
-  Storage *storage;
-  void *_write_action;
-  StorageAction *write_action;
 
   double min_completion = shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
 
   double rate;
   // Foreach disk
-  xbt_dynar_foreach(p_storageList,i,storage) {
+  for(auto storage: p_storageList) {
     rate = 0;
     // Foreach write action on disk
-    xbt_dynar_foreach(storage->p_writeActions, j, _write_action) {
-      write_action = static_cast<StorageAction*>(_write_action);
+    for (auto write_action: storage->writeActions_) {
       rate += lmm_variable_getvalue(write_action->getVariable());
     }
     if(rate > 0)
-      min_completion = MIN(min_completion, (storage->m_size-storage->m_usedSize)/rate);
+      min_completion = MIN(min_completion, (storage->size_-storage->usedSize_)/rate);
   }
 
   return min_completion;
@@ -151,8 +141,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
     ++itNext;
     action = static_cast<StorageAction*>(&*it);
 
-    if(action->m_type == WRITE)
-    {
+    if(action->m_type == WRITE){
       // Update the disk usage
       // Update the file size
       // For each action of type write
@@ -172,14 +161,14 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
 
       action->progress +=current_progress;
 
-      action->p_storage->m_usedSize += incr; // disk usage
+      action->p_storage->usedSize_ += incr; // disk usage
       action->p_file->current_position+= incr; // current_position
       //  which becomes the new file size
       action->p_file->size = action->p_file->current_position ;
 
       sg_size_t *psize = xbt_new(sg_size_t,1);
       *psize = action->p_file->size;
-      xbt_dict_t content_dict = action->p_storage->p_content;
+      xbt_dict_t content_dict = action->p_storage->content_;
       xbt_dict_set(content_dict, action->p_file->name, psize, nullptr);
     }
 
@@ -189,7 +178,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       action->updateMaxDuration(delta);
 
     if(action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 &&
-        action->p_storage->m_usedSize == action->p_storage->m_size) {
+        action->p_storage->usedSize_ == action->p_storage->size_) {
       action->finish();
       action->setState(Action::State::failed);
     } else if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) {
@@ -221,7 +210,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path)
   XBT_DEBUG("\tOpen file '%s'",path);
 
   sg_size_t size, *psize;
-  psize = (sg_size_t*) xbt_dict_get_or_null(p_content, path);
+  psize = (sg_size_t*) xbt_dict_get_or_null(content_, path);
   // if file does not exist create an empty file
   if(psize)
     size = *psize;
@@ -229,7 +218,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path)
     psize = xbt_new(sg_size_t,1);
     size = 0;
     *psize = size;
-    xbt_dict_set(p_content, path, psize, nullptr);
+    xbt_dict_set(content_, path, psize, nullptr);
     XBT_DEBUG("File '%s' was not found, file created.",path);
   }
   surf_file_t file = xbt_new0(s_surf_file_t,1);
@@ -246,17 +235,15 @@ StorageAction *StorageN11::open(const char* mount, const char* path)
 
 StorageAction *StorageN11::close(surf_file_t fd)
 {
-  char *filename = fd->name;
-  XBT_DEBUG("\tClose file '%s' size '%llu'", filename, fd->size);
+  XBT_DEBUG("\tClose file '%s' size '%llu'", fd->name, fd->size);
   // unref write actions from storage
-  void *_write_action;
-  StorageAction *write_action;
-  unsigned int i;
-  xbt_dynar_foreach(p_writeActions, i, _write_action) {
-    write_action = static_cast<StorageAction*>(_write_action);
+  for (std::vector<StorageAction*>::iterator it = writeActions_.begin(); it != writeActions_.end();) {
+    StorageAction *write_action = *it;
     if ((write_action->p_file) == fd) {
-      xbt_dynar_cursor_rm(p_writeActions, &i);
       write_action->unref();
+      it = writeActions_.erase(it);
+    } else {
+      ++it;
     }
   }
   free(fd->name);
@@ -291,9 +278,9 @@ StorageAction *StorageN11::write(surf_file_t fd, sg_size_t size)
   StorageAction *action = new StorageN11Action(getModel(), size, isOff(), this, WRITE);
   action->p_file = fd;
   /* Substract the part of the file that might disappear from the used sized on the storage element */
-  m_usedSize -= (fd->size - fd->current_position);
+  usedSize_ -= (fd->size - fd->current_position);
   // If the storage is full before even starting to write
-  if(m_usedSize==m_size) {
+  if(usedSize_==size_) {
     action->setState(Action::State::failed);
   }
   return action;
@@ -317,16 +304,14 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora
   case STAT:
     break;
   case READ:
-    lmm_expand(model->getMaxminSystem(), storage->p_constraintRead,
-        getVariable(), 1.0);
+    lmm_expand(model->getMaxminSystem(), storage->constraintRead_, getVariable(), 1.0);
     break;
   case WRITE:
-    lmm_expand(model->getMaxminSystem(), storage->p_constraintWrite,
-        getVariable(), 1.0);
+    lmm_expand(model->getMaxminSystem(), storage->constraintWrite_, getVariable(), 1.0);
 
     //TODO there is something annoying with what's below. Have to sort it out...
     //    Action *action = this;
-    //    xbt_dynar_push(storage->p_writeActions, &action);
+    //    storage->p_writeActions->push_back(action);
     //    ref();
     break;
   }