-/* Copyright (c) 2004 - 2013. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2013. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex.h"
#include "xbt/dict.h"
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 */
- /* 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_foreach(((storage_t)storage)->content, cursor, file, size){
- xbt_dict_set(content_dict,file,&size,NULL);
+ char *size;
+ xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
+ xbt_dict_set(content_dict,file,(void*)size,NULL);
}
return content_dict;
}
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;