X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/086c8254ed7348d0058b49107a2911c445be5131..60478d1730b5d604df65e9d5b10f3b77cd770b76:/src/surf/HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 407c77fd31..85a859b018 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -3,7 +3,6 @@
 /* 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. */
 
-#include "src/surf/HostImpl.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include <string>
 
@@ -108,16 +107,18 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
 }
 
 /** @brief use destroy() instead of this destructor */
-HostImpl::~HostImpl() = default;
+HostImpl::~HostImpl()
+{
+  for (auto mnt : storage_)
+    xbt_free(mnt.name);
+}
 
 simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
 {
   simgrid::surf::Storage* st = nullptr;
-  s_mount_t mnt;
-  unsigned int cursor;
 
   XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname());
-  xbt_dynar_foreach (storage_, cursor, mnt) {
+  for (auto mnt : storage_) {
     XBT_DEBUG("See '%s'", mnt.name);
     if (!strcmp(mount, mnt.name)) {
       st = static_cast<simgrid::surf::Storage*>(mnt.storage);
@@ -131,49 +132,42 @@ simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
 
 xbt_dict_t HostImpl::getMountedStorageList()
 {
-  s_mount_t mnt;
-  unsigned int i;
   xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr);
   char* storage_name      = nullptr;
 
-  xbt_dynar_foreach (storage_, i, mnt) {
+  for (auto mnt : storage_) {
     storage_name = (char*)static_cast<simgrid::surf::Storage*>(mnt.storage)->cname();
     xbt_dict_set(storage_list, mnt.name, storage_name, nullptr);
   }
   return storage_list;
 }
 
-xbt_dynar_t HostImpl::getAttachedStorageList()
+void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
 {
   xbt_lib_cursor_t cursor;
   char* key;
   void** data;
-  xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr);
   xbt_lib_foreach(storage_lib, cursor, key, data)
   {
     if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
       simgrid::surf::Storage* storage = static_cast<simgrid::surf::Storage*>(
           xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
       if (!strcmp(static_cast<const char*>(storage->attach_), piface_->cname())) {
-        xbt_dynar_push_as(result, void*, (void*)storage->cname());
+        storages->push_back(storage->cname());
       }
     }
   }
-  return result;
 }
 
 Action* HostImpl::open(const char* fullpath)
 {
-
   simgrid::surf::Storage* st = nullptr;
-  s_mount_t mnt;
-  unsigned int cursor;
   size_t longest_prefix_length = 0;
   std::string path;
   std::string mount_name;
 
   XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname());
-  xbt_dynar_foreach (storage_, cursor, mnt) {
+  for (auto mnt : storage_) {
     XBT_DEBUG("See '%s'", mnt.name);
     std::string file_mount_name = std::string(fullpath).substr(0, strlen(mnt.name));
 
@@ -225,7 +219,7 @@ int HostImpl::unlink(surf_file_t fd)
 
     simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
     /* Check if the file is on this storage */
-    if (!xbt_dict_get_or_null(st->content_, fd->name)) {
+    if (st->content_->find(fd->name) == st->content_->end()) {
       XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->cname());
       return -1;
     } else {
@@ -233,7 +227,9 @@ int HostImpl::unlink(surf_file_t fd)
       st->usedSize_ -= fd->size;
 
       // Remove the file from storage
-      xbt_dict_remove(st->content_, fd->name);
+      sg_size_t* psize = st->content_->at(fd->name);
+      delete psize;
+      st->content_->erase(fd->name);
 
       xbt_free(fd->name);
       xbt_free(fd->mount);
@@ -270,7 +266,6 @@ sg_size_t HostImpl::fileTell(surf_file_t fd)
 
 int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin)
 {
-
   switch (origin) {
   case SEEK_SET:
     fd->current_position = offset;
@@ -290,13 +285,15 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath)
 {
   /* Check if the new full path is on the same mount point */
   if (!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) {
-    sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_, fd->name);
-    if (psize) { // src file exists
-      sg_size_t* new_psize = xbt_new(sg_size_t, 1);
+    std::map<std::string, sg_size_t*>* content = findStorageOnMountList(fd->mount)->content_;
+    if (content->find(fd->name) != content->end()) { // src file exists
+      sg_size_t* psize     = content->at(std::string(fd->name));
+      sg_size_t* new_psize = new sg_size_t;
       *new_psize           = *psize;
-      xbt_dict_remove(findStorageOnMountList(fd->mount)->content_, fd->name);
+      delete psize;
+      content->erase(fd->name);
       std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath));
-      xbt_dict_set(findStorageOnMountList(fd->mount)->content_, path.c_str(), new_psize, nullptr);
+      content->insert({path.c_str(), new_psize});
       XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->name, fullpath, *psize);
       return 0;
     } else {