X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/824b99a5272ff8ce814336ab8bc9817eecd6de60..536f11db02cf839a0af52b6d33047ca1ee7c7b8d:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index bedebf25bf..7d5a655d05 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -8,24 +8,29 @@ #include "xbt/ex.h" #include "xbt/dict.h" #include "portable.h" -#include "workstation_private.h" -#include "cpu_private.h" +#include "surf_private.h" #include "network_common.h" +typedef struct workstation_CLM03 { + s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */ + void *cpu; + int id; +} s_workstation_CLM03_t, *workstation_CLM03_t; + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, "Logging specific to the SURF workstation module"); surf_model_t surf_workstation_model = NULL; static workstation_CLM03_t workstation_new(const char *name, - void *cpu, void *card) + void *cpu, int id) { 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; - workstation->network_card = card; + workstation->id = id; xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, workstation, surf_resource_free); @@ -38,13 +43,12 @@ void create_workstations(void) xbt_dict_cursor_t cursor = NULL; char *name = NULL; void *cpu = NULL; - void *nw_card = NULL; xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) { - nw_card = surf_model_resource_by_name(surf_network_model, name); - xbt_assert1(nw_card, "No corresponding card found for %s", name); + int *id = xbt_dict_get_or_null(used_routing->host_id,name); + xbt_assert1(id, "No host %s found in the platform file", name); - workstation_new(name, cpu, nw_card); + workstation_new(name, cpu, *id); } } @@ -63,17 +67,12 @@ static int parallel_action_free(surf_action_t action) THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static void parallel_action_use(surf_action_t action) -{ - THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ -} - -static int action_free(surf_action_t action) +static int action_unref(surf_action_t action) { if (action->model_type == surf_network_model) - return surf_network_model->action_free(action); + return surf_network_model->action_unref(action); else if (action->model_type == surf_cpu_model) - return surf_cpu_model->action_free(action); + return surf_cpu_model->action_unref(action); else if (action->model_type == surf_workstation_model) return parallel_action_free(action); else @@ -81,19 +80,6 @@ static int action_free(surf_action_t action) return 0; } -static void action_use(surf_action_t action) -{ - if (action->model_type == surf_network_model) - surf_network_model->action_use(action); - else if (action->model_type == surf_cpu_model) - surf_cpu_model->action_use(action); - else if (action->model_type == surf_workstation_model) - parallel_action_use(action); - else - DIE_IMPOSSIBLE; - return; -} - static void action_cancel(surf_action_t action) { if (action->model_type == surf_network_model) @@ -203,13 +189,15 @@ static surf_action_t 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; return surf_network_model->extension. - network.communicate(((workstation_CLM03_t) workstation_src)->network_card, - ((workstation_CLM03_t) workstation_dst)->network_card, - size, rate); + network.communicate(surf_resource_name(src->cpu),surf_resource_name(dst->cpu), + src->id,dst->id, + size, rate); } -static e_surf_cpu_state_t get_state(void *workstation) +static e_surf_resource_state_t get_state(void *workstation) { return surf_cpu_model->extension. cpu.get_state(((workstation_CLM03_t) workstation)->cpu); @@ -228,12 +216,6 @@ static double get_available_speed(void *workstation) workstation)->cpu); } -static xbt_dict_t get_properties(void *workstation) -{ - return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)-> - cpu); -} - static surf_action_t execute_parallel_task(int workstation_nb, void **workstation_list, double *computation_amount, @@ -245,23 +227,12 @@ static surf_action_t execute_parallel_task(int workstation_nb, /* returns an array of network_link_CM02_t */ -static const void **get_route(void *src, void *dst) +static xbt_dynar_t get_route(void *src, void *dst) { workstation_CLM03_t workstation_src = (workstation_CLM03_t) src; workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst; - return surf_network_model->extension.network.get_route(workstation_src-> - network_card, - workstation_dst-> - network_card); -} - -static int get_route_size(void *src, void *dst) -{ - workstation_CLM03_t workstation_src = (workstation_CLM03_t) src; - workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst; - return surf_network_model->extension. - network.get_route_size(workstation_src->network_card, - workstation_dst->network_card); + return surf_network_model->extension.network.get_route(workstation_src->id, + workstation_dst->id); } static double get_link_bandwidth(const void *link) @@ -284,14 +255,16 @@ static void finalize(void) surf_model_exit(surf_workstation_model); surf_workstation_model = NULL; } +static xbt_dict_t get_properties(const void*ws){ + return surf_resource_properties(((workstation_CLM03_t)ws)->cpu); +} static void surf_workstation_model_init_internal(void) { surf_workstation_model = surf_model_init(); surf_workstation_model->name = "Workstation"; - surf_workstation_model->action_free = action_free; - surf_workstation_model->action_use = action_use; + surf_workstation_model->action_unref = action_unref; surf_workstation_model->action_cancel = action_cancel; surf_workstation_model->action_state_set = ws_action_state_set; @@ -316,20 +289,16 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->extension.workstation.get_available_speed = get_available_speed; - /*manage the properties of the workstation */ - surf_workstation_model->get_properties = get_properties; - surf_workstation_model->extension.workstation.communicate = communicate; + surf_workstation_model->extension.workstation.get_route = get_route; surf_workstation_model->extension.workstation.execute_parallel_task = execute_parallel_task; - surf_workstation_model->extension.workstation.get_route = get_route; - surf_workstation_model->extension.workstation.get_route_size = - get_route_size; surf_workstation_model->extension.workstation.get_link_bandwidth = get_link_bandwidth; surf_workstation_model->extension.workstation.get_link_latency = get_link_latency; surf_workstation_model->extension.workstation.link_shared = link_shared; + surf_workstation_model->extension.workstation.get_properties = get_properties; } /********************************************************************/