surf_file_t file = xbt_new0(s_surf_file_t,1);
file->name = xbt_strdup(path);
file->size = size;
- file->storage = xbt_strdup(mount);
+ file->mount = xbt_strdup(mount);
surf_action_t action = storage_action_execute(storage,0, OPEN);
action->file = (void *)file;
}
free(fd->name);
- free(fd->storage);
+ free(fd->mount);
xbt_free(fd);
surf_action_t action = storage_action_execute(storage,0, CLOSE);
return action;
}
-static surf_action_t storage_action_read(void *storage, void* ptr,
- size_t size, surf_file_t fd)
+static surf_action_t storage_action_read(void *storage, size_t size,
+ surf_file_t fd)
{
if(size > fd->size)
size = fd->size;
return action;
}
-static surf_action_t storage_action_write(void *storage, const void* ptr,
- size_t size, surf_file_t fd)
+static surf_action_t storage_action_write(void *storage, size_t size,
+ surf_file_t fd)
{
char *filename = fd->name;
XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,fd->size);
return (surf_action_t) action;
}
-static void* storage_create_resource(const char* id, const char* model,const char* type_id,const char* content_name)
-{
+static void* storage_create_resource(const char* id, const char* model,
+ 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->write_actions = xbt_dynar_new(sizeof(char *),NULL);
storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
- double Bread = atof(xbt_dict_get(storage_type->properties,"Bread"));
- double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
- double Bconnection = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
+ double Bread =
+ surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bread"));
+ double Bwrite =
+ surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,"Bwrite"));
+ double Bconnection =
+ surf_parse_get_bandwidth(xbt_dict_get(storage_type->properties,
+ "Bconnection"));
XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%lu'",Bconnection,Bread,Bwrite,(unsigned long)storage_type->size);
storage->constraint = lmm_constraint_new(storage_maxmin_system, storage, Bconnection);
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;
if(action->type == WRITE)
{
double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
- ((storage_t)(action->storage))->used_size += delta * rate; // disk usage
- ((surf_action_t)action)->file->size += delta * rate; // file size
+ /* Hack to avoid rounding differences between x86 and x86_64
+ * (note that the next sizes are of type size_t). */
+ long incr = delta * rate + MAXMIN_PRECISION;
+ ((storage_t)(action->storage))->used_size += incr; // disk usage
+ ((surf_action_t)action)->file->size += incr; // file size
}
}
// if storage content is not specified use the content of storage_type if exist
if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
storage->content = ((storage_type_t) stype)->content;
- XBT_DEBUG("For disk '%s' content is empty, use the content of storage type '%s'",storage->id,((storage_type_t) stype)->type_id);
+ storage->content_type = ((storage_type_t) stype)->content_type;
+ XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ",
+ storage->id,((storage_type_t) stype)->content_type,
+ ((storage_type_t) stype)->type_id);
}
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tproperties '%p'\n",
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
+ "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' "
+ "\n\t\tproperties '%p'\n",
storage->id,
((storage_type_t) stype)->model,
((storage_type_t) stype)->type_id,
storage->content,
+ storage->content_type,
((storage_type_t) stype)->properties);
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)
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;
stype->content = xbt_strdup(storage_type->content);
+ stype->content_type = xbt_strdup(storage_type->content_type);
stype->type_id = xbt_strdup(storage_type->id);
- stype->size = storage_type->size * 1000000000; /* storage_type->size is in Gbytes and stype->sizeis in bytes */
+ stype->size = storage_type->size;
- XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s'",
+ XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', "
+ "content '%s', and content_type '%s'",
stype->type_id,
stype->model,
- storage_type->content);
+ storage_type->content,
+ storage_type->content_type);
xbt_lib_set(storage_type_lib,
stype->type_id,
{
// Verification of an existing storage
#ifndef NDEBUG
- void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL);
+ void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId,ROUTING_STORAGE_LEVEL);
#endif
- xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id);
+ xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId);
- XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name);
+ XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name);
s_mount_t mnt;
- mnt.id = surf_storage_resource_priv(surf_storage_resource_by_name(mount->id));
+ mnt.storage =
+ surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId));
mnt.name = xbt_strdup(mount->name);
if(!mount_list){
free(stype->model);
free(stype->type_id);
free(stype->content);
+ free(stype->content_type);
xbt_dict_free(&(stype->properties));
free(stype);
}
