XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
-xbt_lib_t storage_lib;
-int SURF_STORAGE_LEVEL = -1;
simgrid::surf::StorageModel* surf_storage_model = nullptr;
namespace simgrid {
, piface_(this)
, size_(size)
, usedSize_(0)
- , typeId_(xbt_strdup(type_id))
+ , typeId_(type_id)
+ , attach_(attach)
, writeActions_(std::vector<StorageAction*>())
{
content_ = parseContent(content_name);
- attach_ = xbt_strdup(attach);
turnOn();
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
constraintRead_ = lmm_constraint_new(maxminSystem, this, bread);
StorageImpl::~StorageImpl()
{
storageDestructedCallbacks(this);
- if (content_ != nullptr) {
- for (auto entry : *content_)
- delete entry.second;
+ if (content_ != nullptr)
delete content_;
- }
- free(typeId_);
- free(attach_);
}
-std::map<std::string, sg_size_t*>* StorageImpl::parseContent(const char* filename)
+std::map<std::string, sg_size_t>* StorageImpl::parseContent(const char* filename)
{
usedSize_ = 0;
if ((not filename) || (strcmp(filename, "") == 0))
return nullptr;
- std::map<std::string, sg_size_t*>* parse_content = new std::map<std::string, sg_size_t*>();
+ std::map<std::string, sg_size_t>* parse_content = new std::map<std::string, sg_size_t>();
std::ifstream* fs = surf_ifsopen(filename);
sg_size_t size = std::stoull(tokens.at(1));
usedSize_ += size;
- sg_size_t* psize = new sg_size_t;
- *psize = size;
- parse_content->insert({tokens.front(), psize});
+ parse_content->insert({tokens.front(), size});
}
} while (not fs->eof());
delete fs;
}
}
-std::map<std::string, sg_size_t*>* StorageImpl::getContent()
+std::map<std::string, sg_size_t>* StorageImpl::getContent()
{
/* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
return content_;