}
static void* storage_create_resource(const char* id, const char* model,
- const char* type_id,const char* content_name){
+ const char* type_id, const char* content_name, const char* content_type){
storage_t storage = NULL;
xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
surf_storage_model, id,NULL);
+ storage->generic_resource.name = xbt_strdup(id);
storage->state_current = SURF_RESOURCE_ON;
storage->used_size = 0;
storage->size = 0;
storage->constraint_read = lmm_constraint_new(storage_maxmin_system, storage, Bread);
storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite);
storage->content = parse_storage_content((char*)content_name,&(storage->used_size));
+ storage->content_type = xbt_strdup(content_type);
storage->size = storage_type->size;
+ storage->type_id = xbt_strdup(type_id);
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
storage_type->properties,
Bread);
- if(!storage_list) storage_list=xbt_dynar_new(sizeof(char *),NULL);
+ if (!storage_list)
+ storage_list = xbt_dynar_new(sizeof(char *),NULL);
xbt_dynar_push(storage_list,&storage);
return storage;
storage_create_resource(storage->id,
((storage_type_t) stype)->model,
((storage_type_t) stype)->type_id,
- storage->content);
+ storage->content,
+ storage->content_type);
}
static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage)
storage_t storage = r;
xbt_dict_free(&storage->content);
xbt_dynar_free(&storage->write_actions);
+ free(storage->type_id);
+ free(storage->content_type);
// generic resource
surf_resource_free(r);
}