#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size);
+static int storage_action_unref(surf_action_t action);
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, double size, e_surf_action_storage_type_t type);
+static void free_storage_content(void *p);
static surf_action_t storage_action_stat(void *storage, surf_file_t stream)
{
return action;
}
+static surf_action_t storage_action_ls(void *storage, const char* path)
+{
+ surf_action_t action = storage_action_execute(storage,0, LS);
+ action->ls_dict = NULL;
+ xbt_dict_t ls_dict = xbt_dict_new();
+
+ char* key;
+ surf_stat_t data = NULL;
+ xbt_dict_cursor_t cursor = NULL;
+
+ xbt_dynar_t dyn = NULL;
+ char* file = NULL;
+
+ // foreach file int the storage
+ xbt_dict_foreach(((storage_t)storage)->content,cursor,key,data){
+ // Search if file start with the prefix 'path'
+ if(xbt_str_start_with(key,path)){
+ file = &key[strlen(path)];
+
+ // Split file with '/'
+ dyn = xbt_str_split(file,"/");
+ file = xbt_dynar_get_as(dyn,0,char*);
+
+ // file
+ if(xbt_dynar_length(dyn) == 1){
+ xbt_dict_set(ls_dict,file,&(data->stat),NULL);
+ }
+ // Directory
+ else
+ {
+ // if directory does not exist yet in dict
+ if(!xbt_dict_get_or_null(ls_dict,file))
+ xbt_dict_set(ls_dict,file,NULL,NULL);
+ }
+ xbt_dynar_free(&dyn);
+ }
+ }
+
+ action->ls_dict = ls_dict;
+ return action;
+}
+
+static surf_action_t storage_action_unlink(void *storage, surf_file_t stream)
+{
+ surf_action_t action = storage_action_execute(storage,0, UNLINK);
+
+ // Add memory to storage
+ ((storage_t)storage)->used_size -= stream->content->stat.size;
+
+ // Remove the file from storage
+ xbt_dict_t content_dict = ((storage_t)storage)->content;
+ xbt_dict_remove(content_dict,stream->name);
+
+ free(stream->name);
+ stream->content = NULL;
+ xbt_free(stream);
+
+ return action;
+}
+
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 *filename = fp->name;
XBT_DEBUG("\tClose file '%s' size '%f'",filename,fp->content->stat.size);
+ // unref write actions from storage
+ surf_action_storage_t write_action;
+ unsigned int i;
+ xbt_dynar_foreach(((storage_t)storage)->write_actions,i,write_action) {
+ if ((write_action->generic_lmm_action.generic_action.file) == fp) {
+ xbt_dynar_cursor_rm(((storage_t)storage)->write_actions, &i);
+ storage_action_unref((surf_action_t) write_action);
+ }
+ }
+
free(fp->name);
fp->content = NULL;
xbt_free(fp);
case OPEN:
case CLOSE:
case STAT:
+ case UNLINK:
+ case LS:
break;
case READ:
lmm_expand(storage_maxmin_system, STORAGE->constraint_read,
lmm_expand(storage_maxmin_system, STORAGE->constraint_write,
GENERIC_LMM_ACTION(action).variable, 1.0);
xbt_dynar_push(((storage_t)storage)->write_actions,&action);
-
+ surf_action_ref((surf_action_t) action);
break;
}
action->type = type;
{
storage_t storage = NULL;
- xbt_assert(!surf_storage_resource_by_name(id),
+ xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
"Storage '%s' declared several times in the platform file",
id);
storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
surf_storage_model->extension.storage.read = storage_action_read;
surf_storage_model->extension.storage.write = storage_action_write;
surf_storage_model->extension.storage.stat = storage_action_stat;
- surf_storage_model->extension.storage.create_resource = storage_create_resource;
+ surf_storage_model->extension.storage.unlink = storage_action_unlink;
+ surf_storage_model->extension.storage.ls = storage_action_ls;
if (!storage_maxmin_system) {
storage_maxmin_system = lmm_system_new(storage_selective_update);
surf_stat_t content;
while ((read = getline(&line, &len, file)) != -1) {
+ if (read){
content = xbt_new0(s_surf_stat_t,1);
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");
- // You can generate this kind of file with command line:
- // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+ 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");
+ // You can generate this kind of file with command line:
+ // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+ }
}
}
if (line)
XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name);
s_mount_t mnt;
- mnt.id = surf_storage_resource_by_name(mount->id);
+ mnt.id = surf_storage_resource_priv(surf_storage_resource_by_name(mount->id));
mnt.name = xbt_strdup(mount->name);
if(!mount_list){
