X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/080dc09df11aea380c679d3b3ae257826c5cbd44..a3848e5ea6b2305d6059c89705edaccbec356455:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 362092f5eb..9496b25d77 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -227,6 +227,14 @@ static double ws_get_speed(void *workstation, double load) get_speed(workstation, load); } +static int ws_get_core(void *workstation) +{ + return surf_cpu_model->extension.cpu. + get_core(workstation); +} + + + static double ws_get_available_speed(void *workstation) { return surf_cpu_model->extension.cpu. @@ -336,7 +344,7 @@ static xbt_dict_t ws_get_properties(const void *ws) 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; @@ -344,68 +352,85 @@ static storage_t find_storage_on_mount_list(void *workstation,const char* storag 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_open(void *workstation, const char* mount, const char* path, const char* mode) +static surf_action_t ws_action_open(void *workstation, const char* mount, + const char* path) { storage_t st = find_storage_on_mount_list(workstation, mount); XBT_DEBUG("OPEN on disk '%s'",st->generic_resource.name); surf_model_t model = st->generic_resource.model; - return model->extension.storage.open(st, mount, path, mode); + return model->extension.storage.open(st, mount, path); } -static surf_action_t ws_action_close(void *workstation, surf_file_t fp) +static surf_action_t ws_action_close(void *workstation, surf_file_t fd) { - storage_t st = find_storage_on_mount_list(workstation, fp->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, fp); + return model->extension.storage.close(st, fd); } -static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream) +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, stream->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, (double)size, nmemb, stream); + return model->extension.storage.read(st, size, fd); } -static surf_action_t ws_action_write(void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream) +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, stream->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, nmemb, stream); + return model->extension.storage.write(st, size, fd); } -static surf_action_t ws_action_stat(void *workstation, surf_file_t stream) +static int ws_file_unlink(void *workstation, surf_file_t fd) { - storage_t st = find_storage_on_mount_list(workstation, stream->storage); - XBT_DEBUG("STAT on disk '%s'",st->generic_resource.name); - surf_model_t model = st->generic_resource.model; - return model->extension.storage.stat(st, stream); -} - -static surf_action_t ws_action_unlink(void *workstation, surf_file_t stream) -{ - storage_t st = find_storage_on_mount_list(workstation, stream->storage); - XBT_DEBUG("UNLINK on disk '%s'",st->generic_resource.name); - surf_model_t model = st->generic_resource.model; - return model->extension.storage.unlink(st, stream); + if (!fd){ + XBT_WARN("No such file descriptor. Impossible to unlink"); + return 0; + } else { +// XBT_INFO("%s %zu", fd->storage, fd->size); + 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_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, + st->generic_resource.name); + return 0; + } else { + XBT_DEBUG("UNLINK on disk '%s'",st->generic_resource.name); + st->used_size -= fd->size; + + // Remove the file from storage + xbt_dict_remove(content_dict,fd->name); + + free(fd->name); + free(fd->mount); + xbt_free(fd); + return 1; + } + } } -static surf_action_t ws_action_ls(void *workstation, const char* mount, const char *path) +static surf_action_t ws_action_ls(void *workstation, const char* mount, + const char *path) { XBT_DEBUG("LS on mount '%s' and file '%s'",mount, path); storage_t st = find_storage_on_mount_list(workstation, mount); @@ -413,6 +438,11 @@ static surf_action_t ws_action_ls(void *workstation, const char* mount, const ch return model->extension.storage.ls(st, path); } +static size_t ws_file_get_size(void *workstation, surf_file_t fd) +{ + return fd->size; +} + static void surf_workstation_model_init_internal(void) { surf_workstation_model = surf_model_init(); @@ -447,6 +477,7 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->extension.workstation.execute = ws_execute; surf_workstation_model->extension.workstation.sleep = ws_action_sleep; surf_workstation_model->extension.workstation.get_state = ws_get_state; + surf_workstation_model->extension.workstation.get_core = ws_get_core; surf_workstation_model->extension.workstation.get_speed = ws_get_speed; surf_workstation_model->extension.workstation.get_available_speed = ws_get_available_speed; @@ -474,9 +505,9 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->extension.workstation.close = ws_action_close; surf_workstation_model->extension.workstation.read = ws_action_read; surf_workstation_model->extension.workstation.write = ws_action_write; - surf_workstation_model->extension.workstation.stat = ws_action_stat; - surf_workstation_model->extension.workstation.unlink = ws_action_unlink; + surf_workstation_model->extension.workstation.unlink = ws_file_unlink; surf_workstation_model->extension.workstation.ls = ws_action_ls; + surf_workstation_model->extension.workstation.get_size = ws_file_get_size; } void surf_workstation_model_init_current_default(void)