XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf,
"Logging specific to the SURF storage module");
+xbt_lib_t file_lib;
xbt_lib_t storage_lib;
int ROUTING_STORAGE_LEVEL; //Routing for storagelevel
int ROUTING_STORAGE_HOST_LEVEL;
int SURF_STORAGE_LEVEL;
xbt_lib_t storage_type_lib;
int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level
-
xbt_dynar_t mount_list = NULL;
StorageModelPtr surf_storage_model = NULL;
Storage::Storage(ModelPtr model, const char *name, xbt_dict_t props,
lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
- const char* type_id, char *content_name, char *content_type, sg_size_t size)
+ const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach)
: Resource(model, name, props, lmm_constraint_new(maxminSystem, this, bconnection))
, p_contentType(content_type)
, m_size(size), m_usedSize(0)
, p_writeActions(xbt_dynar_new(sizeof(ActionPtr),NULL)) {
surf_callback_emit(storageCreatedCallbacks, this);
p_content = parseContent(content_name);
+ p_attach = xbt_strdup(attach);
setState(SURF_RESOURCE_ON);
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);
xbt_dynar_free(&p_writeActions);
free(p_typeId);
free(p_contentType);
+ free(p_attach);
}
xbt_dict_t Storage::parseContent(char *filename)
FILE *file = NULL;
file = surf_fopen(filename, "r");
- xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename,
- xbt_str_join(surf_path, ":"));
+ if (file == NULL)
+ xbt_die("Cannot open file '%s' (path=%s)", filename,
+ xbt_str_join(surf_path, ":"));
char *line = NULL;
size_t len = 0;
char path[1024];
sg_size_t size;
-
while ((read = xbt_getline(&line, &len, file)) != -1) {
if (read){
- if(sscanf(line,"%s %llu", path, &size) == 2) {
+ if(sscanf(line,"%s %llu", path, &size) == 2) {
m_usedSize += size;
sg_size_t *psize = xbt_new(sg_size_t, 1);
*psize = size;