plug (massive) leak with ptaskL07

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

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 26fd112..7fe5fd0 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -7,13 +7,17 @@
 #include "storage_interface.hpp"
 #include "surf_private.h"
 #include "xbt/file.h" /* xbt_getline */
+#include <boost/algorithm/string/join.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
 
 xbt_lib_t file_lib;
+int MSG_FILE_LEVEL = -1; // Msg file level
+
 xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL = -1;      //Routing for storagelevel
-int ROUTING_STORAGE_HOST_LEVEL = -1;
+int SIMIX_STORAGE_LEVEL        = -1; // Simix storage level
+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
@@ -53,7 +57,6 @@ Storage::Storage(Model* model, const char* name, lmm_system_t maxminSystem, doub
                  double bconnection, const char* type_id, const char* content_name, const char* content_type,
                  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)
@@ -85,7 +88,7 @@ xbt_dict_t Storage::parseContent(const char *filename)
   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, ":"));
+  xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
 
   char *line = nullptr;
   size_t len = 0;