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;
* 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)
- , contentType_(xbt_strdup(content_type))
- , size_(size), usedSize_(0)
- , typeId_(xbt_strdup(type_id))
- , writeActions_(std::vector<StorageAction*>())
-{
- 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)
- , contentType_(xbt_strdup(content_type))
- , size_(size), usedSize_(0)
- , typeId_(xbt_strdup(type_id))
- , writeActions_(std::vector<StorageAction*>())
+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*>())
{
content_ = parseContent(content_name);
attach_ = xbt_strdup(attach);