X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddc2e5141b85593da4b84cc214674e68c6b49e27..92661d62eaee255e5f677a667c0f05a4f5917c24:/src/surf/storage_interface.cpp

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 26fd1126a8..1aef9a97a8 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,17 +6,17 @@
 
 #include "storage_interface.hpp"
 #include "surf_private.h"
-#include "xbt/file.h" /* xbt_getline */
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <fstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
 
-xbt_lib_t file_lib;
 xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL = -1;      //Routing for storagelevel
-int ROUTING_STORAGE_HOST_LEVEL = -1;
+int MSG_STORAGE_LEVEL          = -1; // Msg storage level
+int ROUTING_STORAGE_LEVEL      = -1; // Routing for storage level
 int SURF_STORAGE_LEVEL = -1;
-xbt_lib_t storage_type_lib;
-int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level
 simgrid::surf::StorageModel *surf_storage_model = nullptr;
 
 namespace simgrid {
@@ -50,18 +50,15 @@ StorageModel::~StorageModel(){
  ************/
 
 Storage::Storage(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
-                 double bconnection, const char* type_id, const char* content_name, const char* content_type,
-                 sg_size_t size, const char* attach)
+                 double bconnection, const char* type_id, const char* content_name, sg_size_t size, const char* attach)
     : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
-    , PropertyHolder(nullptr)
-    , contentType_(xbt_strdup(content_type))
     , size_(size)
     , usedSize_(0)
     , typeId_(xbt_strdup(type_id))
     , writeActions_(std::vector<StorageAction*>())
 {
   content_ = parseContent(content_name);
-  attach_ = xbt_strdup(attach);
+  attach_  = xbt_strdup(attach);
   turnOn();
   XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
   constraintRead_  = lmm_constraint_new(maxminSystem, this, bread);
@@ -70,41 +67,42 @@ Storage::Storage(Model* model, const char* name, lmm_system_t maxminSystem, doub
 
 Storage::~Storage(){
   storageDestructedCallbacks(this);
-  xbt_dict_free(&content_);
+  if (content_ != nullptr) {
+    for (auto entry : *content_)
+      delete entry.second;
+    delete content_;
+  }
   free(typeId_);
-  free(contentType_);
   free(attach_);
 }
 
-xbt_dict_t Storage::parseContent(const char *filename)
+std::map<std::string, sg_size_t*>* Storage::parseContent(const char* filename)
 {
   usedSize_ = 0;
   if ((!filename) || (strcmp(filename, "") == 0))
     return nullptr;
 
-  xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f);
-
-  FILE *file =  surf_fopen(filename, "r");
-  xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
+  std::map<std::string, sg_size_t*>* parse_content = new std::map<std::string, sg_size_t*>();
 
-  char *line = nullptr;
-  size_t len = 0;
-  ssize_t read;
-  char path[1024];
-  sg_size_t size;
+  std::ifstream* fs = surf_ifsopen(filename);
 
-  while ((read = xbt_getline(&line, &len, file)) != -1) {
-    if (read){
-      xbt_assert(sscanf(line,"%s %llu", path, &size) == 2, "Parse error in %s: %s",filename,line);
+  std::string line;
+  std::vector<std::string> tokens;
+  do {
+    std::getline(*fs, line);
+    boost::trim(line);
+    if (line.length() > 0) {
+      boost::split(tokens, line, boost::is_any_of(" \t"), boost::token_compress_on);
+      xbt_assert(tokens.size() == 2, "Parse error in %s: %s", filename, line.c_str());
+      sg_size_t size = std::stoull(tokens.at(1));
 
       usedSize_ += size;
-      sg_size_t *psize = xbt_new(sg_size_t, 1);
+      sg_size_t* psize = new sg_size_t;
       *psize = size;
-      xbt_dict_set(parse_content,path,psize,nullptr);
+      parse_content->insert({tokens.front(), psize});
     }
-  }
-  free(line);
-  fclose(file);
+  } while (!fs->eof());
+  delete fs;
   return parse_content;
 }
 
@@ -114,7 +112,7 @@ bool Storage::isUsed()
   return false;
 }
 
-void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/)
+void Storage::apply_event(tmgr_trace_event_t /*event*/, double /*value*/)
 {
   THROW_UNIMPLEMENTED;
 }
@@ -132,23 +130,10 @@ void Storage::turnOff() {
   }
 }
 
-xbt_dict_t Storage::getContent()
+std::map<std::string, sg_size_t*>* Storage::getContent()
 {
   /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
-
-  xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
-  xbt_dict_cursor_t cursor = nullptr;
-  char *file;
-  sg_size_t *psize;
-
-  xbt_dict_foreach(content_, cursor, file, psize){
-    xbt_dict_set(content_dict,file,psize,nullptr);
-  }
-  return content_dict;
-}
-
-sg_size_t Storage::getSize(){
-  return size_;
+  return content_;
 }
 
 sg_size_t Storage::getFreeSize(){