static xbt_swag_t
storage_running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_dynar_t storage_list;
+
#define GENERIC_LMM_ACTION(action) action->generic_lmm_action
#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
-typedef struct surf_storage {
- s_surf_resource_t generic_resource;
- const char* type;
- 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);
+static surf_action_t storage_action_execute (void *storage, double size, e_surf_action_storage_type_t type);
static surf_action_t storage_action_stat(void *storage, surf_file_t stream)
{
static surf_action_t storage_action_close(void *storage, surf_file_t fp)
{
char *filename = fp->name;
+ XBT_DEBUG("\tClose file '%s' size '%f'",filename,fp->content->stat.size);
free(fp->name);
fp->content = NULL;
xbt_free(fp);
surf_action_t action = storage_action_execute(storage,0, CLOSE);
- XBT_DEBUG("\tClose file '%s'",filename);
return action;
}
-static surf_action_t storage_action_read(void *storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream)
+static surf_action_t storage_action_read(void *storage, void* ptr, double size, size_t nmemb, surf_file_t stream)
{
char *filename = stream->name;
surf_stat_t content = stream->content;
- XBT_DEBUG("\tRead file '%s' size '%zu/%zu'",filename,size,content->stat.size);
+ XBT_INFO("\tRead file '%s' size '%f/%f'",filename,content->stat.size,size);
if(size > content->stat.size)
size = content->stat.size;
+ XBT_INFO("Really read file '%s' for %f",filename,size);
surf_action_t action = storage_action_execute(storage,size,READ);
return action;
}
{
char *filename = stream->name;
surf_stat_t content = stream->content;
- XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,content->stat.size);
-
- // update file size
- content->stat.size += size;
- // update disk space
- ((storage_t)storage)->used_size =+ size;
+ XBT_DEBUG("\tWrite file '%s' size '%zu/%f'",filename,size,content->stat.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);
- // }
+ action->file = stream;
+
+ // If the storage is full
+ if(((storage_t)storage)->used_size==((storage_t)storage)->size) {
+ storage_action_state_set((surf_action_t) action, SURF_ACTION_FAILED);
+ }
return action;
}
-static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type)
+static surf_action_t storage_action_execute (void *storage, double size, e_surf_action_storage_type_t type)
{
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
- XBT_IN("(%s,%zu)", surf_resource_name(STORAGE), size);
+ XBT_IN("(%s,%f)", 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);
+ // Save the storage on action
+ action->storage = storage;
GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
case WRITE:
lmm_expand(storage_maxmin_system, STORAGE->constraint_write,
GENERIC_LMM_ACTION(action).variable, 1.0);
+ xbt_dynar_push(((storage_t)storage)->write_actions,&action);
+
break;
}
-
+ action->type = type;
XBT_OUT();
return (surf_action_t) action;
}
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"));
storage_type->properties,
Bread);
+ if(!storage_list) storage_list=xbt_dynar_new(sizeof(char *),free);
+ xbt_dynar_push(storage_list,&storage);
+
return storage;
}
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
-// }
+ // Update the file size
+ // Foreach action of type write
+ xbt_swag_foreach_safe(action, next_action, running_actions) {
+ if(action->type == WRITE)
+ {
+ double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
+ XBT_INFO("Update %f + %f = %f",((surf_action_t)action)->file->content->stat.size,delta * rate,((surf_action_t)action)->file->content->stat.size+delta * rate);
+ ((storage_t)(action->storage))->used_size += delta * rate; // disk usage
+ ((surf_action_t)action)->file->content->stat.size += delta * rate; // file size
+ XBT_INFO("Have updating to %f",((surf_action_t)action)->file->content->stat.size);
+ }
+ }
+
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)) {
+
+ if(GENERIC_ACTION(action).remains > 0 &&
+ lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0 &&
+ ((storage_t)action->storage)->used_size == ((storage_t)action->storage)->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();
storage_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
} else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) &&
- (GENERIC_ACTION(action).max_duration <= 0)) {
+ (GENERIC_ACTION(action).max_duration <= 0))
+ {
GENERIC_ACTION(action).finish = surf_get_clock();
storage_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
}
{
XBT_DEBUG("storage_share_resources %f",NOW);
s_surf_action_storage_t action;
+ unsigned int i,j;
+ storage_t storage;
+ surf_action_storage_t write_action;
+
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);
- }
- }*/
+
+ double rate;
+ // Foreach disk
+ xbt_dynar_foreach(storage_list,i,storage)
+ {
+ rate = 0;
+ // Foreach write action on disk
+ xbt_dynar_foreach(storage->write_actions,j,write_action)
+ {
+ rate += lmm_variable_getvalue(write_action->generic_lmm_action.variable);
+ }
+ if(rate > 0)
+ min_completion = MIN(min_completion, (storage->size-storage->used_size)/rate);
+ }
return min_completion;
}
char time[12];
char path[1024];
int nb;
- long size;
+ unsigned long size;
surf_stat_t content;
