X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97acefec7ab9e598ad07ac39c49dc6fab7fa0a46..14f0f468f6a34f7501aa5a30e6e78c36d2b65e74:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index ebe0a00469..3a44e5c4c1 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -8,9 +8,13 @@ #include "xbt/ex.h" #include "xbt/dict.h" #include "portable.h" -#include "workstation_private.h" -#include "cpu_private.h" -#include "network_common.h" +#include "surf_private.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"); @@ -18,14 +22,14 @@ 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, 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 +42,13 @@ 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 = NULL; + if (used_routing && used_routing->host_id) + id = xbt_dict_get_or_null(used_routing->host_id,name); - workstation_new(name, cpu, nw_card); + workstation_new(name, cpu, id ? *id : 0); } } @@ -122,14 +126,14 @@ static void update_resource_state(void *id, static surf_action_t execute(void *workstation, double size) { - return surf_cpu_model->extension. - cpu.execute(((workstation_CLM03_t) workstation)->cpu, size); + return surf_cpu_model->extension.cpu. + execute(((workstation_CLM03_t) workstation)->cpu, size); } static surf_action_t action_sleep(void *workstation, double duration) { - return surf_cpu_model->extension. - cpu.sleep(((workstation_CLM03_t) workstation)->cpu, duration); + return surf_cpu_model->extension.cpu. + sleep(((workstation_CLM03_t) workstation)->cpu, duration); } static void action_suspend(surf_action_t action) @@ -181,39 +185,43 @@ static void action_set_priority(surf_action_t action, double priority) DIE_IMPOSSIBLE; } +static double action_get_remains(surf_action_t action) +{ + if (action->model_type == surf_network_model) + return surf_network_model->get_remains(action); + if (action->model_type == surf_cpu_model) + return surf_cpu_model->get_remains(action); + DIE_IMPOSSIBLE; +} + static surf_action_t communicate(void *workstation_src, void *workstation_dst, double size, double rate) { - return surf_network_model->extension. - network.communicate(((workstation_CLM03_t) workstation_src)->network_card, - ((workstation_CLM03_t) workstation_dst)->network_card, - size, 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(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); + return surf_cpu_model->extension.cpu. + get_state(((workstation_CLM03_t) workstation)->cpu); } static double get_speed(void *workstation, double load) { - return surf_cpu_model->extension. - cpu.get_speed(((workstation_CLM03_t) workstation)->cpu, load); + return surf_cpu_model->extension.cpu. + get_speed(((workstation_CLM03_t) workstation)->cpu, load); } static double get_available_speed(void *workstation) { - return surf_cpu_model->extension. - cpu.get_available_speed(((workstation_CLM03_t) - workstation)->cpu); -} - -static xbt_dict_t get_properties(void *workstation) -{ - return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)-> - cpu); + return surf_cpu_model->extension.cpu. + get_available_speed(((workstation_CLM03_t) + workstation)->cpu); } static surf_action_t execute_parallel_task(int workstation_nb, @@ -231,10 +239,8 @@ 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); + return surf_network_model->extension.network.get_route(workstation_src->id, + workstation_dst->id); } static double get_link_bandwidth(const void *link) @@ -258,6 +264,11 @@ static void finalize(void) 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(); @@ -280,6 +291,7 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->is_suspended = action_is_suspended; surf_workstation_model->set_max_duration = action_set_max_duration; surf_workstation_model->set_priority = action_set_priority; + surf_workstation_model->get_remains = action_get_remains; surf_workstation_model->extension.workstation.execute = execute; surf_workstation_model->extension.workstation.sleep = action_sleep; @@ -288,18 +300,17 @@ 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_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; } /********************************************************************/ @@ -316,8 +327,8 @@ static void surf_workstation_model_init_internal(void) void surf_workstation_model_init_CLM03(const char *filename) { surf_workstation_model_init_internal(); - surf_cpu_model_init_Cas01(filename); - surf_network_model_init_CM02(filename); + surf_cpu_model_init_Cas01_im(filename); + surf_network_model_init_LegrandVelho(filename); update_model_description(surf_workstation_model_description, "CLM03", surf_workstation_model); xbt_dynar_push(model_list, &surf_workstation_model);