const char* content; /*should be a dict */
} s_surf_storage_t, *surf_storage_t;
+static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size);
static void storage_action_state_set(surf_action_t action, e_surf_action_state_t state);
static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type);
return action;
}
-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(
- storage_lib,
- ((storage_t)storage)->generic_resource.name,
- ROUTING_STORAGE_LEVEL);
- storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, storage_type_id,ROUTING_STORAGE_TYPE_LEVEL);
- xbt_dict_t content_dict = storage_type->content;
+ xbt_dict_t content_dict = ((storage_t)storage)->content;
surf_stat_t content = xbt_dict_get(content_dict,path);
surf_file_t file = xbt_new0(s_surf_file_t,1);
file->name = xbt_strdup(path);
file->content = content;
+ file->storage = mount;
surf_action_t action = storage_action_execute(storage,0, OPEN);
action->file = (void *)file;
{
char *filename = stream->name;
surf_stat_t content = stream->content;
- 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);
{
char *filename = stream->name;
surf_stat_t content = stream->content;
- 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);
+ // update file size
content->stat.size += size;
+ // update disk space
+ ((storage_t)storage)->used_size =+ size;
+
+ surf_action_t action = storage_action_execute(storage,size,WRITE);
+ // if(used_size==size) {
+ // storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED);
+ // }
return action;
}
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
- 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);
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);
+
switch(type) {
case OPEN:
case CLOSE:
case STAT:
- lmm_expand(storage_maxmin_system, STORAGE->constraint,
- GENERIC_LMM_ACTION(action).variable, 1.0);
break;
case READ:
lmm_expand(storage_maxmin_system, STORAGE->constraint_read,
return (surf_action_t) action;
}
-static void* storage_create_resource(const char* id, const char* model,const char* type_id)
+static void* storage_create_resource(const char* id, const char* model,const char* type_id,const char* content_name)
{
storage_t storage = NULL;
surf_storage_model, id,NULL);
storage->state_current = SURF_RESOURCE_ON;
+ storage->used_size = 0;
+ storage->size = 0;
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);
+ storage->content = parse_storage_content((char*)content_name,&(storage->used_size));
+ storage->size = storage_type->size;
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%Zu'\n",
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%f'\n",
id,
model,
type_id,
surf_action_storage_t next_action = NULL;
xbt_swag_t running_actions = surf_storage_model->states.running_action_set;
+ // Update the disk usage
+// foreach disk {
+// rate = 0
+// foreach write_action in disk {
+// rate += value(variable(action))
+// }
+// used_size += delta * rate
+// }
xbt_swag_foreach_safe(action, next_action, running_actions) {
double_update(&(GENERIC_ACTION(action).remains),
lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta);
if (GENERIC_LMM_ACTION(action).generic_action.max_duration != NO_MAX_DURATION)
double_update(&(GENERIC_ACTION(action).max_duration), delta);
+ // if(remains>0 and weight(variable(action))>0 && used_size == size) {
+ // GENERIC_ACTION(action).finish = surf_get_clock();
+ // storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED);
+ // } else
if ((GENERIC_ACTION(action).remains <= 0) &&
(lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) {
GENERIC_ACTION(action).finish = surf_get_clock();
{
XBT_DEBUG("storage_share_resources %f",NOW);
s_surf_action_storage_t action;
- return generic_maxmin_share_resources(surf_storage_model->states.running_action_set,
+ double min_completion = generic_maxmin_share_resources(surf_storage_model->states.running_action_set,
xbt_swag_offset(action, generic_lmm_action.variable),
storage_maxmin_system, lmm_solve);
+ /*
+ foreach(disk) {
+ rate = 0
+ foreach write_action in disk {
+ rate += value(variable(action));
+ }
+ if(rate>0) {
+ min_completion = MIN(min_completion, (size-used_size)/rate);
+ }
+ }*/
+
+ return min_completion;
}
static int storage_resource_used(void *resource_id)
storage->type_id,
ROUTING_STORAGE_TYPE_LEVEL);
if(!stype) xbt_die("No storage type '%s'",storage->type_id);
-// XBT_INFO("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",
-// storage->id,
-// ((storage_type_t) stype)->model,
-// ((storage_type_t) stype)->type_id,
-// ((storage_type_t) stype)->content,
-// ((storage_type_t) stype)->properties);
-
- storage_create_resource(storage->id,
+
+ // 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);
+ }
+
+ 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",
+ storage->id,
+ ((storage_type_t) stype)->model,
+ ((storage_type_t) stype)->type_id,
+ storage->content,
+ ((storage_type_t) stype)->properties);
+
+ storage_create_resource(storage->id,
((storage_type_t) stype)->model,
- ((storage_type_t) stype)->type_id);
+ ((storage_type_t) stype)->type_id,
+ storage->content);
}
static void parse_mstorage_init(sg_platf_mstorage_cbarg_t mstorage)
#endif
xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
- XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'",
+ XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
storage->id,
- storage->type_id);
+ storage->type_id,
+ storage->content);
xbt_lib_set(storage_lib,
storage->id,
free(content);
}
-static xbt_dict_t parse_storage_content(const char *filename)
+static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size)
{
+ *used_size = 0;
if ((!filename) || (strcmp(filename, "") == 0))
return NULL;
char date[12];
char time[12];
char path[1024];
- int nb, size;
+ int nb;
+ long size;
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);
+ *used_size += content->stat.size;
xbt_dict_set(parse_content,path,content,NULL);
} else {
xbt_die("Be sure of passing a good format for content file.\n");
}
if (line)
free(line);
-
fclose(file);
return parse_content;
}
storage_type_t stype = xbt_new0(s_storage_type_t, 1);
stype->model = xbt_strdup(storage_type->model);
stype->properties = storage_type->properties;
- stype->content = parse_storage_content(storage_type->content);
+ stype->content = xbt_strdup(storage_type->content);
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 */
- XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s' and properties '%p'",
+ XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s'",
stype->type_id,
stype->model,
- storage_type->content,
- stype->properties);
+ storage_type->content);
xbt_lib_set(storage_type_lib,
stype->type_id,
storage_type_t stype = r;
free(stype->model);
free(stype->type_id);
+ free(stype->content);
xbt_dict_free(&(stype->properties));
- xbt_dict_free(&(stype->content));
free(stype);
}
+static XBT_INLINE void surf_storage_resource_free(void *r)
+{
+ // specific to storage
+ storage_t storage = r;
+ xbt_dict_free(&storage->content);
+ // generic resource
+ surf_resource_free(r);
+}
+
static XBT_INLINE void routing_storage_host_free(void *r)
{
xbt_dynar_t dyn = r;
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_resource_free);
sg_platf_storage_add_cb(storage_parse_storage);
sg_platf_mstorage_add_cb(storage_parse_mstorage);
