X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f227dab539a56b04a5c3ab15d4a7035db9c6cd5..985adefb9840db3a67c9d92856e861baa8a7b032:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index eb89b6f3a4..c986d51f21 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -1,4 +1,4 @@ -/* 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 @@ -8,13 +8,15 @@ #include "xbt/dict.h" #include "portable.h" #include "surf_private.h" +#include "storage_private.h" #include "surf/surf_resource.h" - - +#include "simgrid/sg_config.h" +#include typedef struct workstation_CLM03 { s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */ - void *cpu; + void *net_elm; + xbt_dynar_t storage; } s_workstation_CLM03_t, *workstation_CLM03_t; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, @@ -22,29 +24,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, surf_model_t surf_workstation_model = NULL; -static workstation_CLM03_t workstation_new(const char *name, void *cpu) +static void workstation_new(sg_platf_host_cbarg_t host) { workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1); workstation->generic_resource.model = surf_workstation_model; - workstation->generic_resource.name = xbt_strdup(name); - workstation->cpu = cpu; - - xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation); - - return workstation; -} - -void create_workstations(void) -{ - xbt_lib_cursor_t cursor = NULL; - char *name = NULL; - void **cpu = NULL; - - xbt_lib_foreach(host_lib, cursor, name, cpu) { - if(cpu[SURF_CPU_LEVEL]) - workstation_new(name, cpu[SURF_CPU_LEVEL]); - } + workstation->generic_resource.name = xbt_strdup(host->id); + workstation->storage = xbt_lib_get_or_null(storage_lib,host->id,ROUTING_STORAGE_HOST_LEVEL); + workstation->net_elm = xbt_lib_get_or_null(host_lib,host->id,ROUTING_HOST_LEVEL); + XBT_DEBUG("Create workstation %s with %ld mounted disks",host->id,xbt_dynar_length(workstation->storage)); + xbt_lib_set(host_lib, host->id, SURF_WKS_LEVEL, workstation); } static int ws_resource_used(void *resource_id) @@ -123,14 +112,14 @@ static void ws_update_resource_state(void *id, static surf_action_t ws_execute(void *workstation, double size) { - return surf_cpu_model->extension.cpu. - execute(((workstation_CLM03_t) workstation)->cpu, size); + surf_resource_t cpu = ((surf_resource_t) surf_cpu_resource_priv(workstation)); + return cpu->model->extension.cpu.execute(workstation, size); } static surf_action_t ws_action_sleep(void *workstation, double duration) { return surf_cpu_model->extension.cpu. - sleep(((workstation_CLM03_t) workstation)->cpu, duration); + sleep(workstation, duration); } static void ws_action_suspend(surf_action_t action) @@ -220,48 +209,114 @@ static surf_action_t ws_communicate(void *workstation_src, void *workstation_dst, double size, double rate) { - workstation_CLM03_t src = (workstation_CLM03_t) workstation_src; - workstation_CLM03_t dst = (workstation_CLM03_t) workstation_dst; + workstation_CLM03_t src = surf_workstation_resource_priv(workstation_src); + workstation_CLM03_t dst = surf_workstation_resource_priv(workstation_dst); return surf_network_model->extension.network. - communicate(surf_resource_name(src->cpu), - surf_resource_name(dst->cpu), size, rate); + communicate(src->net_elm, + dst->net_elm, size, rate); } static e_surf_resource_state_t ws_get_state(void *workstation) { return surf_cpu_model->extension.cpu. - get_state(((workstation_CLM03_t) workstation)->cpu); + get_state(workstation); } static double ws_get_speed(void *workstation, double load) { return surf_cpu_model->extension.cpu. - get_speed(((workstation_CLM03_t) workstation)->cpu, 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. - get_available_speed(((workstation_CLM03_t) - workstation)->cpu); + 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, double *communication_amount, - double amount, double rate) -{ + double rate) +{ +#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) + if ((workstation_nb == 1) + && (cost_or_zero(communication_amount, 0) == 0.0)) + return ws_execute(workstation_list[0], computation_amount[0]); + else if ((workstation_nb == 1) + && (cost_or_zero(computation_amount, 0) == 0.0)) + return ws_communicate(workstation_list[0], workstation_list[0],communication_amount[0], rate); + else if ((workstation_nb == 2) + && (cost_or_zero(computation_amount, 0) == 0.0) + && (cost_or_zero(computation_amount, 1) == 0.0)) { + int i,nb = 0; + double value = 0.0; + + for (i = 0; i < workstation_nb * workstation_nb; i++) { + if (cost_or_zero(communication_amount, i) > 0.0) { + nb++; + value = cost_or_zero(communication_amount, i); + } + } + if (nb == 1) + return ws_communicate(workstation_list[0], workstation_list[1],value, rate); + } +#undef cost_or_zero + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ return NULL; } /* returns an array of network_link_CM02_t */ -static xbt_dynar_t ws_get_route(void *src, void *dst) +static xbt_dynar_t ws_get_route(void *workstation_src, void *workstation_dst) { + XBT_DEBUG("ws_get_route"); + workstation_CLM03_t src = surf_workstation_resource_priv(workstation_src); + workstation_CLM03_t dst = surf_workstation_resource_priv(workstation_dst); return surf_network_model->extension. - network.get_route(surf_resource_name(src), surf_resource_name(dst)); + network.get_route(src->net_elm, + dst->net_elm); } static double ws_get_link_bandwidth(const void *link) @@ -276,7 +331,7 @@ static double ws_get_link_latency(const void *link) static int ws_link_shared(const void *link) { - return surf_network_model->extension.network.get_link_latency(link); + return surf_network_model->extension.network.link_shared(link); } static void ws_finalize(void) @@ -287,7 +342,176 @@ static void ws_finalize(void) static xbt_dict_t ws_get_properties(const void *ws) { - return surf_resource_properties(((workstation_CLM03_t) ws)->cpu); + return surf_resource_properties(surf_cpu_resource_priv(ws)); +} + +static storage_t find_storage_on_mount_list(void *workstation,const char* mount) +{ + storage_t st = NULL; + s_mount_t mnt; + unsigned int cursor; + 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'",mount,ws->generic_resource.name); + xbt_dynar_foreach(storage_list,cursor,mnt) + { + XBT_DEBUG("See '%s'",mnt.name); + if(!strcmp(mount,mnt.name)){ + st = mnt.storage; + break; + } + } + if(!st) xbt_die("Can't find mount '%s' for '%s'",mount,ws->generic_resource.name); + return st; +} + +static xbt_dict_t ws_get_storage_list(void *workstation) +{ + s_mount_t mnt; + unsigned int i; + 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){ + storage_name = ((storage_t)mnt.storage)->generic_resource.name; + xbt_dict_set(storage_list,mnt.name,storage_name,NULL); + } + return storage_list; +} + +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); +} + +static surf_action_t ws_action_close(void *workstation, surf_file_t fd) +{ + 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, 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, fd, size); +} + +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, fd, size); +} + +static int ws_file_unlink(void *workstation, surf_file_t fd) +{ + 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) +{ + 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 sg_storage_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); + sg_storage_size_t *psize = xbt_new(sg_storage_size_t, 1); + *psize = fd->size; + xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_push_as(info, sg_storage_size_t *, psize); + 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 void ws_file_rename(void *workstation, surf_file_t fd, const char* new_name) +{ + storage_t storage = find_storage_on_mount_list(workstation, fd->mount); + + const char* old_full_name = fd->name; + xbt_dynar_t dyn = NULL; + const char* separator; + const char* ctype = storage->content_type; + + // TODO: PV: use an enum and a switch case to manage content type properly + if(!strcmp(ctype, "txt_unix")) + separator = strdup("/"); + else + separator = strdup("\\"); + + // Split file with separator and replace file name + dyn = xbt_str_split(old_full_name, separator); + xbt_dynar_pop_ptr(dyn); + xbt_dynar_push(dyn, &new_name); + char *new_full_name = xbt_str_join(dyn, separator); + + sg_storage_size_t *psize; + psize = (sg_storage_size_t*) xbt_dict_get_or_null(storage->content,old_full_name); + xbt_dict_remove(storage->content, old_full_name); + xbt_dict_set(storage->content,new_full_name,psize,NULL); + XBT_DEBUG("Change file name from %s to %s, size '%" PRIu64 "'",fd->name, new_full_name, *psize); +} + +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 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; } static void surf_workstation_model_init_internal(void) @@ -324,9 +548,15 @@ 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; + 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; @@ -342,17 +572,29 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->extension.workstation.get_properties = ws_get_properties; + surf_workstation_model->extension.workstation.open = ws_action_open; + 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.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.rename = ws_file_rename; + 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_int(_surf_cfg_set, "network/crosstraffic", 1); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes"); surf_cpu_model_init_Cas01(); surf_network_model_init_LegrandVelho(); xbt_dynar_push(model_list, &surf_workstation_model); - sg_platf_postparse_add_cb(create_workstations); + sg_platf_host_add_cb(workstation_new); } void surf_workstation_model_init_compound() @@ -362,5 +604,5 @@ void surf_workstation_model_init_compound() xbt_assert(surf_network_model, "No network model defined yet!"); surf_workstation_model_init_internal(); xbt_dynar_push(model_list, &surf_workstation_model); - sg_platf_postparse_add_cb(create_workstations); + sg_platf_host_add_cb(workstation_new); }