X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68282355ac5ae3e6996e98a609de46aee9d866c9..17a9f17337b1d6743025cf52e7c19a469138d38f:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 62797b0d5e..4be0041845 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -10,6 +10,7 @@ #include "surf_private.h" #include "storage_private.h" #include "surf/surf_resource.h" +#include "simgrid/sg_config.h" typedef struct workstation_CLM03 { s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */ @@ -343,6 +344,22 @@ static surf_action_t ws_action_stat(void *workstation, surf_file_t stream) 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); +} + +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); + surf_model_t model = st->generic_resource.model; + return model->extension.storage.ls(st, path); +} + static void surf_workstation_model_init_internal(void) { surf_workstation_model = surf_model_init(); @@ -400,12 +417,14 @@ static void surf_workstation_model_init_internal(void) 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.ls = ws_action_ls; } void surf_workstation_model_init_current_default(void) { surf_workstation_model_init_internal(); - xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1); + xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", 1); surf_cpu_model_init_Cas01(); surf_network_model_init_LegrandVelho();