#define GENERIC_LMM_ACTION(action) action->generic_lmm_action
#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size);
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *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, size_t size, e_surf_action_storage_type_t type);
+static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type);
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();
+ xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL);
char* key;
- size_t size = 0;
+ sg_storage_size_t size = 0;
xbt_dict_cursor_t cursor = NULL;
xbt_dynar_t dyn = NULL;
{
XBT_DEBUG("\tOpen file '%s'",path);
xbt_dict_t content_dict = ((storage_t)storage)->content;
- size_t size = (size_t) xbt_dict_get_or_null(content_dict,path);
+ sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path);
// if file does not exist create an empty file
if(!size){
return action;
}
-static surf_action_t storage_action_read(void *storage, size_t size,
+static surf_action_t storage_action_read(void *storage, sg_storage_size_t size,
surf_file_t fd)
{
if(size > fd->size)
return action;
}
-static surf_action_t storage_action_write(void *storage, size_t size,
+static surf_action_t storage_action_write(void *storage, sg_storage_size_t size,
surf_file_t fd)
{
char *filename = fd->name;
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, sg_storage_size_t size, e_surf_action_storage_type_t type)
{
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
/*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_t content_dict = xbt_dict_new_homogeneous(NULL);
xbt_dict_cursor_t cursor = NULL;
char *file;
char *size;
// Update the storage content (with file size)
double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
/* Hack to avoid rounding differences between x86 and x86_64
- * (note that the next sizes are of type size_t). */
+ * (note that the next sizes are of type sg_storage_size_t). */
long incr = delta * rate + MAXMIN_PRECISION;
((storage_t)(action->storage))->used_size += incr; // disk usage
((surf_action_t)action)->file->size += incr; // file size
(void *) xbt_strdup(storage->type_id));
}
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size)
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size)
{
*used_size = 0;
if ((!filename) || (strcmp(filename, "") == 0))
size_t len = 0;
ssize_t read;
char path[1024];
- size_t size;
-
+ sg_storage_size_t size;
while ((read = xbt_getline(&line, &len, file)) != -1) {
if (read){