xbt_lib_t storage_lib;
int MSG_STORAGE_LEVEL = -1; // Msg storage level
-int ROUTING_STORAGE_LEVEL = -1; // Routing for storage level
int SURF_STORAGE_LEVEL = -1;
simgrid::surf::StorageModel *surf_storage_model = nullptr;
************/
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)
- : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
- , contentType_(xbt_strdup(content_type))
+ const char* type_id, const char* content_name, sg_size_t size, const char* attach)
+ : Resource(model, name, lmm_constraint_new(maxminSystem, this, MAX(bread, bwrite)))
, size_(size)
, usedSize_(0)
, typeId_(xbt_strdup(type_id))
content_ = parseContent(content_name);
attach_ = xbt_strdup(attach);
turnOn();
- XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
+ XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
constraintRead_ = lmm_constraint_new(maxminSystem, this, bread);
constraintWrite_ = lmm_constraint_new(maxminSystem, this, bwrite);
}
delete content_;
}
free(typeId_);
- free(contentType_);
free(attach_);
}
std::map<std::string, sg_size_t*>* Storage::parseContent(const char* filename)
{
usedSize_ = 0;
- if ((!filename) || (strcmp(filename, "") == 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*>();
*psize = size;
parse_content->insert({tokens.front(), psize});
}
- } while (!fs->eof());
+ } while (not fs->eof());
delete fs;
return parse_content;
}