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
Fix MSG_storage_get_content function
[simgrid.git]
/
src
/
surf
/
storage.c
diff --git
a/src/surf/storage.c
b/src/surf/storage.c
index
7ca79b1
..
14da9ab
100644
(file)
--- a/
src/surf/storage.c
+++ b/
src/surf/storage.c
@@
-197,16
+197,17
@@
static xbt_dict_t storage_get_properties(const void *storage)
return surf_resource_properties(surf_storage_resource_priv(storage));
}
return surf_resource_properties(surf_storage_resource_priv(storage));
}
-static xbt_dict_t storage_get_content(
const
void *storage)
+static xbt_dict_t storage_get_content(void *storage)
{
/* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
{
/* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
- /* surf_action_t action = storage_action_execute(storage,0, LS); */
+ /*surf_action_t action = storage_action_execute(storage,0, LS);*/
+
+ void *st = surf_storage_resource_priv(storage);
xbt_dict_t content_dict = xbt_dict_new();
xbt_dict_cursor_t cursor = NULL;
char *file;
size_t size;
xbt_dict_t content_dict = xbt_dict_new();
xbt_dict_cursor_t cursor = NULL;
char *file;
size_t size;
-
- xbt_dict_foreach(((storage_t)storage)->content, cursor, file, size){
+ xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
xbt_dict_set(content_dict,file,&size,NULL);
}
return content_dict;
xbt_dict_set(content_dict,file,&size,NULL);
}
return content_dict;
@@
-222,7
+223,6
@@
static void* storage_create_resource(const char* id, const char* model,
storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
surf_storage_model, id, properties, NULL);
storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
surf_storage_model, id, properties, NULL);
- storage->generic_resource.name = xbt_strdup(id);
storage->state_current = SURF_RESOURCE_ON;
storage->used_size = 0;
storage->size = 0;
storage->state_current = SURF_RESOURCE_ON;
storage->used_size = 0;
storage->size = 0;