return surf_resource_properties(surf_cpu_resource_priv(ws));
}
-static storage_t find_storage_on_mount_list(void *workstation,const char* storage)
+static storage_t find_storage_on_mount_list(void *workstation,const char* mount)
{
storage_t st = NULL;
s_mount_t mnt;
workstation_CLM03_t ws = (workstation_CLM03_t) surf_workstation_resource_priv(workstation);
xbt_dynar_t storage_list = ws->storage;
- XBT_DEBUG("Search for storage name '%s' on '%s'",storage,ws->generic_resource.name);
+ XBT_DEBUG("Search for storage name '%s' on '%s'",mount,ws->generic_resource.name);
xbt_dynar_foreach(storage_list,cursor,mnt)
{
XBT_DEBUG("See '%s'",mnt.name);
- if(!strcmp(storage,mnt.name)){
+ if(!strcmp(mount,mnt.name)){
st = mnt.id;
break;
}
}
- if(!st) xbt_die("Can't find mount '%s' for '%s'",storage,ws->generic_resource.name);
+ if(!st) xbt_die("Can't find mount '%s' for '%s'",mount,ws->generic_resource.name);
return st;
}
static surf_action_t ws_action_close(void *workstation, surf_file_t fd)
{
- storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
XBT_DEBUG("CLOSE on disk '%s'",st->generic_resource.name);
surf_model_t model = st->generic_resource.model;
return model->extension.storage.close(st, fd);
}
-static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size,
+static surf_action_t ws_action_read(void *workstation, size_t size,
surf_file_t fd)
{
- storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ 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, ptr, size, fd);
+ return model->extension.storage.read(st, size, fd);
}
-static surf_action_t ws_action_write(void *workstation, const void* ptr,
- size_t size, surf_file_t fd)
+static surf_action_t ws_action_write(void *workstation, size_t size,
+ surf_file_t fd)
{
- storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ 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, ptr, size, fd);
+ return model->extension.storage.write(st, size, fd);
}
static int ws_file_unlink(void *workstation, surf_file_t fd)
return 0;
} else {
// XBT_INFO("%s %zu", fd->storage, fd->size);
- storage_t st = find_storage_on_mount_list(workstation, fd->storage);
+ storage_t st = find_storage_on_mount_list(workstation, fd->mount);
xbt_dict_t content_dict = (st)->content;
/* Check if the file is on this storage */
if (!xbt_dict_get_or_null(content_dict, fd->name)){
xbt_dict_remove(content_dict,fd->name);
free(fd->name);
- free(fd->storage);
+ free(fd->mount);
xbt_free(fd);
return 1;
}