A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add MSG_task_set_data_size function
[simgrid.git]
/
src
/
surf
/
storage.c
diff --git
a/src/surf/storage.c
b/src/surf/storage.c
index
5dd92c0
..
6c4e2ab
100644
(file)
--- a/
src/surf/storage.c
+++ b/
src/surf/storage.c
@@
-232,7
+232,7
@@
static void* storage_create_resource(const char* id, const char* model,const cha
{
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),
@@
-518,7
+518,6
@@
static void surf_storage_model_init_internal(void)
surf_storage_model->extension.storage.stat = storage_action_stat;
surf_storage_model->extension.storage.unlink = storage_action_unlink;
surf_storage_model->extension.storage.ls = storage_action_ls;
- surf_storage_model->extension.storage.create_resource = storage_create_resource;
if (!storage_maxmin_system) {
storage_maxmin_system = lmm_system_new(storage_selective_update);
@@
-595,20
+594,22
@@
static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size
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)
@@
-674,7
+675,7
@@
static void storage_parse_mount(sg_platf_mount_cbarg_t mount)
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){