A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill useless code
[simgrid.git]
/
src
/
surf
/
storage_interface.cpp
diff --git
a/src/surf/storage_interface.cpp
b/src/surf/storage_interface.cpp
index
799f67c
..
30b7444
100644
(file)
--- a/
src/surf/storage_interface.cpp
+++ b/
src/surf/storage_interface.cpp
@@
-14,16
+14,10
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
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;
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;
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 {
simgrid::surf::StorageModel *surf_storage_model = nullptr;
namespace simgrid {
@@
-140,16
+134,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 */
{
/* 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(){
}
sg_size_t Storage::getFreeSize(){