#include "surf_private.h"
#include "xbt/file.h" /* xbt_getline */
-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;
-int ROUTING_STORAGE_LEVEL = -1; //Routing for storagelevel
+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 ROUTING_STORAGE_HOST_LEVEL = -1;
int SURF_STORAGE_LEVEL = -1;
xbt_lib_t storage_type_lib;
* Model *
*********/
-StorageModel::StorageModel()
- : Model()
+StorageModel::StorageModel(): Model()
{
- p_storageList = nullptr;
+ maxminSystem_ = lmm_system_new(true /* lazy update */);
}
StorageModel::~StorageModel(){
lmm_system_free(maxminSystem_);
surf_storage_model = nullptr;
- xbt_dynar_free(&p_storageList);
}
/************
* Resource *
************/
-Storage::Storage(Model *model, const char *name, xbt_dict_t props,
- const char* type_id, const char *content_name, const char *content_type,
- sg_size_t size)
- : Resource(model, name)
- , PropertyHolder(props)
- , p_contentType(xbt_strdup(content_type))
- , m_size(size), m_usedSize(0)
- , p_typeId(xbt_strdup(type_id))
- , p_writeActions(xbt_dynar_new(sizeof(Action*),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))
+ , size_(size)
+ , usedSize_(0)
+ , typeId_(xbt_strdup(type_id))
+ , writeActions_(std::vector<StorageAction*>())
{
- p_content = parseContent(content_name);
- turnOn();
-}
-
-Storage::Storage(Model *model, const char *name, xbt_dict_t props,
- 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))
- , PropertyHolder(props)
- , p_contentType(xbt_strdup(content_type))
- , m_size(size), m_usedSize(0)
- , p_typeId(xbt_strdup(type_id))
- , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr))
-{
- p_content = parseContent(content_name);
- p_attach = xbt_strdup(attach);
+ 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);
- p_constraintRead = lmm_constraint_new(maxminSystem, this, bread);
- p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite);
+ constraintRead_ = lmm_constraint_new(maxminSystem, this, bread);
+ constraintWrite_ = lmm_constraint_new(maxminSystem, this, bwrite);
}
Storage::~Storage(){
storageDestructedCallbacks(this);
- xbt_dict_free(&p_content);
- xbt_dynar_free(&p_writeActions);
- free(p_typeId);
- free(p_contentType);
- free(p_attach);
+ xbt_dict_free(&content_);
+ free(typeId_);
+ free(contentType_);
+ free(attach_);
}
xbt_dict_t Storage::parseContent(const char *filename)
{
- m_usedSize = 0;
+ usedSize_ = 0;
if ((!filename) || (strcmp(filename, "") == 0))
return nullptr;
if (read){
xbt_assert(sscanf(line,"%s %llu", path, &size) == 2, "Parse error in %s: %s",filename,line);
- m_usedSize += size;
+ usedSize_ += size;
sg_size_t *psize = xbt_new(sg_size_t, 1);
*psize = size;
xbt_dict_set(parse_content,path,psize,nullptr);
char *file;
sg_size_t *psize;
- xbt_dict_foreach(p_content, cursor, file, psize){
+ xbt_dict_foreach(content_, cursor, file, psize){
xbt_dict_set(content_dict,file,psize,nullptr);
}
return content_dict;
}
sg_size_t Storage::getSize(){
- return m_size;
+ return size_;
}
sg_size_t Storage::getFreeSize(){
- return m_size - m_usedSize;
+ return size_ - usedSize_;
}
sg_size_t Storage::getUsedSize(){
- return m_usedSize;
+ return usedSize_;
}
/**********
* Action *
**********/
-StorageAction::StorageAction(Model *model, double cost, bool failed,
- Storage *storage, e_surf_action_storage_type_t type)
-: Action(model, cost, failed)
-, m_type(type), p_storage(storage), p_file(nullptr){
- progress = 0;
+StorageAction::StorageAction(Model* model, double cost, bool failed, Storage* storage,
+ e_surf_action_storage_type_t type)
+ : Action(model, cost, failed), type_(type), storage_(storage), file_(nullptr)
+{
+ progress_ = 0;
};
-StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variable_t var,
- Storage *storage, e_surf_action_storage_type_t type)
- : Action(model, cost, failed, var)
- , m_type(type), p_storage(storage), p_file(nullptr){
- progress = 0;
+StorageAction::StorageAction(Model* model, double cost, bool failed, lmm_variable_t var, Storage* storage,
+ e_surf_action_storage_type_t type)
+ : Action(model, cost, failed, var), type_(type), storage_(storage), file_(nullptr)
+{
+ progress_ = 0;
}
void StorageAction::setState(Action::State state){