X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/215555956513ba0d24707980da429e3c4a4a37a6..60478d1730b5d604df65e9d5b10f3b77cd770b76:/src/surf/storage_interface.cpp diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 799f67c41d..a2ef0ebc59 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -14,16 +14,11 @@ 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 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 simgrid::surf::StorageModel *surf_storage_model = nullptr; namespace simgrid { @@ -140,16 +135,10 @@ void Storage::turnOff() { } } -xbt_dict_t Storage::getContent() +std::map* 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); - - for (auto entry : *content_) { - xbt_dict_set(content_dict, entry.first.c_str(), entry.second, nullptr); - } - return content_dict; + return content_; } sg_size_t Storage::getFreeSize(){