X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bac5d6867ff353bb05c89397a641001f43ba711..59c2ae3e710d06c54ba40fff2d290b7351fb7665:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index ff6564d3a3..187b5a0642 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -241,6 +241,37 @@ static double ws_get_available_speed(void *workstation) get_available_speed(workstation); } +static double ws_get_current_power_peak(void *workstation) +{ + return surf_cpu_model->extension.cpu. + get_current_power_peak(workstation); +} + +static double ws_get_power_peak_at(void *workstation, int pstate_index) +{ + return surf_cpu_model->extension.cpu. + get_power_peak_at(workstation, pstate_index); +} + +static int ws_get_nb_pstates(void *workstation) +{ + return surf_cpu_model->extension.cpu. + get_nb_pstates(workstation); +} + +static void ws_set_power_peak_at(void *workstation, int pstate_index) +{ + surf_cpu_model->extension.cpu. + set_power_peak_at(workstation, pstate_index); +} + +static double ws_get_consumed_energy(void *workstation) +{ + return surf_cpu_model->extension.cpu. + get_consumed_energy(workstation); +} + + static surf_action_t ws_execute_parallel_task(int workstation_nb, void **workstation_list, double *computation_amount, @@ -313,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; @@ -321,19 +352,35 @@ 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)){ - st = mnt.id; + if(!strcmp(mount,mnt.name)){ + st = mnt.storage; 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 xbt_dynar_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); + + 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); + } + return storage_list; +} + static surf_action_t ws_action_open(void *workstation, const char* mount, const char* path) { @@ -345,7 +392,7 @@ static surf_action_t ws_action_open(void *workstation, const char* mount, 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); @@ -354,7 +401,7 @@ static surf_action_t ws_action_close(void *workstation, surf_file_t fd) 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, size, fd); @@ -363,7 +410,7 @@ static surf_action_t ws_action_read(void *workstation, size_t size, 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, size, fd); @@ -376,7 +423,7 @@ 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)){ @@ -391,7 +438,7 @@ static int ws_file_unlink(void *workstation, surf_file_t fd) xbt_dict_remove(content_dict,fd->name); free(fd->name); - free(fd->storage); + free(fd->mount); xbt_free(fd); return 1; } @@ -412,6 +459,31 @@ static size_t ws_file_get_size(void *workstation, surf_file_t fd) return fd->size; } +static xbt_dynar_t ws_file_get_info(void *workstation, surf_file_t fd) +{ + storage_t st = find_storage_on_mount_list(workstation, fd->mount); + xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_push_as(info, void *, (void*)fd->size); + xbt_dynar_push_as(info, void *, fd->mount); + xbt_dynar_push_as(info, void *, st->generic_resource.name); + xbt_dynar_push_as(info, void *, st->type_id); + xbt_dynar_push_as(info, void *, st->content_type); + + return info; +} + +static 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) +{ + storage_t st = find_storage_on_mount_list(workstation, name); + return st->used_size; +} + static void surf_workstation_model_init_internal(void) { surf_workstation_model = surf_model_init(); @@ -450,6 +522,11 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->extension.workstation.get_speed = ws_get_speed; surf_workstation_model->extension.workstation.get_available_speed = ws_get_available_speed; + surf_workstation_model->extension.workstation.get_current_power_peak = ws_get_current_power_peak; + surf_workstation_model->extension.workstation.get_power_peak_at = ws_get_power_peak_at; + surf_workstation_model->extension.workstation.get_nb_pstates = ws_get_nb_pstates; + surf_workstation_model->extension.workstation.set_power_peak_at = ws_set_power_peak_at; + surf_workstation_model->extension.workstation.get_consumed_energy = ws_get_consumed_energy; surf_workstation_model->extension.workstation.communicate = ws_communicate; @@ -472,12 +549,16 @@ static void surf_workstation_model_init_internal(void) 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; + surf_workstation_model->extension.workstation.get_info = ws_file_get_info; + surf_workstation_model->extension.workstation.get_free_size = ws_storage_get_free_size; + surf_workstation_model->extension.workstation.get_used_size = ws_storage_get_used_size; + surf_workstation_model->extension.workstation.get_storage_list = ws_get_storage_list; } void surf_workstation_model_init_current_default(void) { surf_workstation_model_init_internal(); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", xbt_strdup("yes")); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes"); surf_cpu_model_init_Cas01(); surf_network_model_init_LegrandVelho();