-static surf_action_t storage_action_open(void *storage, const char* path, const char* mode)
+static surf_action_t storage_action_open(void *storage, const char* mount, const char* path, const char* mode)
{
XBT_DEBUG("\tOpen file '%s'",path);
char *storage_type_id = xbt_lib_get_or_null(
{
XBT_DEBUG("\tOpen file '%s'",path);
char *storage_type_id = xbt_lib_get_or_null(
surf_file_t file = xbt_new0(s_surf_file_t,1);
file->name = xbt_strdup(path);
file->content = content;
surf_file_t file = xbt_new0(s_surf_file_t,1);
file->name = xbt_strdup(path);
file->content = content;
surf_action_t action = storage_action_execute(storage,0, OPEN);
action->file = (void *)file;
surf_action_t action = storage_action_execute(storage,0, OPEN);
action->file = (void *)file;
- XBT_DEBUG("\tRead file '%s' size '%Zu/%Zu'",filename,size,content->stat.size);
+ XBT_DEBUG("\tRead file '%s' size '%zu/%zu'",filename,size,content->stat.size);
if(size > content->stat.size)
size = content->stat.size;
surf_action_t action = storage_action_execute(storage,size,READ);
if(size > content->stat.size)
size = content->stat.size;
surf_action_t action = storage_action_execute(storage,size,READ);
- XBT_DEBUG("\tWrite file '%s' size '%Zu/%Zu'",filename,size,content->stat.size);
+ XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,content->stat.size);
surf_action_t action = storage_action_execute(storage,size,WRITE);
content->stat.size += size;
surf_action_t action = storage_action_execute(storage,size,WRITE);
content->stat.size += size;
- XBT_IN("(%s,%Zu)", surf_resource_name(STORAGE), size);
+ XBT_IN("(%s,%zu)", surf_resource_name(STORAGE), size);
action =
surf_action_new(sizeof(s_surf_action_storage_t), size, surf_storage_model,
STORAGE->state_current != SURF_RESOURCE_ON);
action =
surf_action_new(sizeof(s_surf_action_storage_t), size, surf_storage_model,
STORAGE->state_current != SURF_RESOURCE_ON);
GENERIC_LMM_ACTION(action).variable =
lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 3);
GENERIC_LMM_ACTION(action).variable =
lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 3);
+ // Must be less than the max bandwidth for all actions
+ lmm_expand(storage_maxmin_system, STORAGE->constraint,
+ GENERIC_LMM_ACTION(action).variable, 1.0);
+
storage->state_current = SURF_RESOURCE_ON;
storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
storage->state_current = SURF_RESOURCE_ON;
storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
- size_t Bread = atof(xbt_dict_get(storage_type->properties,"Bread"));
- size_t Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
- size_t Bconnection = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
- XBT_INFO("Create resource with Bconnection '%Zu' Bread '%Zu' Bwrite '%Zu'",Bconnection,Bread,Bwrite);
+ 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"));
+ XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%ld'",Bconnection,Bread,Bwrite,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);
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
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);
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
surf_stat_t content;
while ((read = getline(&line, &len, file)) != -1) {
content = xbt_new0(s_surf_stat_t,1);
surf_stat_t content;
while ((read = getline(&line, &len, file)) != -1) {
content = xbt_new0(s_surf_stat_t,1);
- if(sscanf(line,"%s %d %s %s %d %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) {
+ if(sscanf(line,"%s %d %s %s %ld %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) {
content->stat.date = xbt_strdup(date);
content->stat.group = xbt_strdup(group);
content->stat.size = size;
content->stat.time = xbt_strdup(time);
content->stat.user = xbt_strdup(user);
content->stat.user_rights = xbt_strdup(user_rights);
content->stat.date = xbt_strdup(date);
content->stat.group = xbt_strdup(group);
content->stat.size = size;
content->stat.time = xbt_strdup(time);
content->stat.user = xbt_strdup(user);
content->stat.user_rights = xbt_strdup(user_rights);
xbt_dict_set(parse_content,path,content,NULL);
} else {
xbt_die("Be sure of passing a good format for content file.\n");
xbt_dict_set(parse_content,path,content,NULL);
} else {
xbt_die("Be sure of passing a good format for content file.\n");
storage_type_t stype = xbt_new0(s_storage_type_t, 1);
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;
storage_type_t stype = xbt_new0(s_storage_type_t, 1);
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;