-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
return st;
}
-static xbt_dynar_t ws_get_storage_list(void *workstation)
+static xbt_dict_t ws_get_storage_list(void *workstation)
{
s_mount_t mnt;
unsigned int i;
- xbt_dynar_t storage_list = xbt_dynar_new(sizeof(char*), NULL);
+ xbt_dict_t storage_list = xbt_dict_new_homogeneous(NULL);
+ char *storage_name = NULL;
workstation_CLM03_t ws = (workstation_CLM03_t) surf_workstation_resource_priv(workstation);
xbt_dynar_t storages = ws->storage;
xbt_dynar_foreach(storages,i,mnt)
{
- xbt_dynar_push(storage_list, &mnt.name);
+ storage_name = ((storage_t)mnt.storage)->generic_resource.name;
+ xbt_dict_set(storage_list,mnt.name,storage_name,NULL);
}
return storage_list;
}
return model->extension.storage.close(st, fd);
}
-static surf_action_t ws_action_read(void *workstation, size_t size,
- surf_file_t fd)
+static surf_action_t ws_action_read(void *workstation, surf_file_t fd, sg_storage_size_t size)
{
storage_t st = find_storage_on_mount_list(workstation, fd->mount);
XBT_DEBUG("READ on disk '%s'",st->generic_resource.name);
surf_model_t model = st->generic_resource.model;
- return model->extension.storage.read(st, size, fd);
+ return model->extension.storage.read(st, fd, size);
}
-static surf_action_t ws_action_write(void *workstation, size_t size,
- surf_file_t fd)
+static surf_action_t ws_action_write(void *workstation, surf_file_t fd, sg_storage_size_t size)
{
storage_t st = find_storage_on_mount_list(workstation, fd->mount);
XBT_DEBUG("WRITE on disk '%s'",st->generic_resource.name);
surf_model_t model = st->generic_resource.model;
- return model->extension.storage.write(st, size, fd);
+ return model->extension.storage.write(st, fd, size);
}
static int ws_file_unlink(void *workstation, surf_file_t fd)
return model->extension.storage.ls(st, path);
}
-static size_t ws_file_get_size(void *workstation, surf_file_t fd)
+static sg_storage_size_t ws_file_get_size(void *workstation, surf_file_t fd)
{
return fd->size;
}
return info;
}
-static size_t ws_storage_get_free_size(void *workstation,const char* name)
+static sg_storage_size_t ws_storage_get_free_size(void *workstation,const char* name)
{
storage_t st = find_storage_on_mount_list(workstation, name);
return st->size - st->used_size;
}
-static size_t ws_storage_get_used_size(void *workstation,const char* name)
+static sg_storage_size_t ws_storage_get_used_size(void *workstation,const char* name)
{
storage_t st = find_storage_on_mount_list(workstation, name);
return st->used_size;