X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1fa3ed49a1609ccfc51b69224e9effbbeb77396..6d0cb151cd89b7e5943fee937665bd98d95f765f:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 1fddb316f2..3f0b34461b 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -8,11 +8,13 @@ #include "xbt/dict.h" #include "portable.h" #include "surf_private.h" +#include "surf/surf_resource.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, @@ -20,40 +22,35 @@ 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, int id) +static workstation_CLM03_t workstation_new(const char *name, void *cpu) { 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->id = id; - xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, - workstation, surf_resource_free); + xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation); return workstation; } void create_workstations(void) { - xbt_dict_cursor_t cursor = NULL; + xbt_lib_cursor_t cursor = NULL; char *name = NULL; - void *cpu = NULL; + void **cpu = NULL; - xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) { - 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, id ? *id : 0); + xbt_lib_foreach(host_lib, cursor, name, cpu) { + if(cpu[SURF_CPU_LEVEL]) + workstation_new(name, cpu[SURF_CPU_LEVEL]); } } static int ws_resource_used(void *resource_id) { THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ + return -1; } static void ws_parallel_action_cancel(surf_action_t action) @@ -64,6 +61,7 @@ static void ws_parallel_action_cancel(surf_action_t action) static int ws_parallel_action_free(surf_action_t action) { THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ + return -1; } static int ws_action_unref(surf_action_t action) @@ -117,8 +115,8 @@ static void ws_update_actions_state(double now, double delta) } static void ws_update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value, double date) + tmgr_trace_event_t event_type, + double value, double date) { THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ } @@ -126,13 +124,13 @@ 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); + execute(((workstation_CLM03_t) workstation)->cpu, 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_CLM03_t) workstation)->cpu, duration); } static void ws_action_suspend(surf_action_t action) @@ -162,9 +160,11 @@ static int ws_action_is_suspended(surf_action_t action) if (action->model_type == surf_cpu_model) return surf_cpu_model->is_suspended(action); DIE_IMPOSSIBLE; + return -1; } -static void ws_action_set_max_duration(surf_action_t action, double duration) +static void ws_action_set_max_duration(surf_action_t action, + double duration) { if (action->model_type == surf_network_model) surf_network_model->set_max_duration(action, duration); @@ -184,6 +184,28 @@ static void ws_action_set_priority(surf_action_t action, double priority) DIE_IMPOSSIBLE; } +#ifdef HAVE_TRACING +static void ws_action_set_category(surf_action_t action, const char *category) +{ + if (action->model_type == surf_network_model) + surf_network_model->set_category(action, category); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->set_category(action, category); + else + DIE_IMPOSSIBLE; +} +#endif + +#ifdef HAVE_LATENCY_BOUND_TRACKING +static int ws_get_latency_limited(surf_action_t action) +{ + if (action->model_type == surf_network_model) + return surf_network_model->get_latency_limited(action); + else + return 0; +} +#endif + static double ws_action_get_remains(surf_action_t action) { if (action->model_type == surf_network_model) @@ -191,55 +213,55 @@ static double ws_action_get_remains(surf_action_t action) if (action->model_type == surf_cpu_model) return surf_cpu_model->get_remains(action); DIE_IMPOSSIBLE; + return -1.0; } static surf_action_t ws_communicate(void *workstation_src, - void *workstation_dst, double size, - double rate) + 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(surf_resource_name(src->cpu), surf_resource_name(dst->cpu), - src->id, dst->id, size, rate); + communicate(surf_resource_name(src->cpu), + surf_resource_name(dst->cpu), 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_CLM03_t) workstation)->cpu); } 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_CLM03_t) workstation)->cpu, load); } 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_CLM03_t) + workstation)->cpu); } static surf_action_t ws_execute_parallel_task(int workstation_nb, - void **workstation_list, - double *computation_amount, - double *communication_amount, - double amount, double rate) + void **workstation_list, + double *computation_amount, + double *communication_amount, + double amount, double rate) { 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) { - 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->id, - workstation_dst->id); + return surf_network_model->extension. + network.get_route(surf_resource_name(src), surf_resource_name(dst)); } static double ws_get_link_bandwidth(const void *link) @@ -278,11 +300,12 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->action_state_set = ws_action_state_set; surf_workstation_model->model_private->resource_used = ws_resource_used; - surf_workstation_model->model_private->share_resources = ws_share_resources; + surf_workstation_model->model_private->share_resources = + ws_share_resources; surf_workstation_model->model_private->update_actions_state = - ws_update_actions_state; + ws_update_actions_state; surf_workstation_model->model_private->update_resource_state = - ws_update_resource_state; + ws_update_resource_state; surf_workstation_model->model_private->finalize = ws_finalize; surf_workstation_model->suspend = ws_action_suspend; @@ -290,27 +313,46 @@ static void surf_workstation_model_init_internal(void) surf_workstation_model->is_suspended = ws_action_is_suspended; surf_workstation_model->set_max_duration = ws_action_set_max_duration; surf_workstation_model->set_priority = ws_action_set_priority; +#ifdef HAVE_TRACING + surf_workstation_model->set_category = ws_action_set_category; +#endif surf_workstation_model->get_remains = ws_action_get_remains; +#ifdef HAVE_LATENCY_BOUND_TRACKING + surf_workstation_model->get_latency_limited = ws_get_latency_limited; +#endif 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_speed = ws_get_speed; surf_workstation_model->extension.workstation.get_available_speed = - ws_get_available_speed; + ws_get_available_speed; - surf_workstation_model->extension.workstation.communicate = ws_communicate; + surf_workstation_model->extension.workstation.communicate = + ws_communicate; surf_workstation_model->extension.workstation.get_route = ws_get_route; surf_workstation_model->extension.workstation.execute_parallel_task = - ws_execute_parallel_task; + ws_execute_parallel_task; surf_workstation_model->extension.workstation.get_link_bandwidth = - ws_get_link_bandwidth; + ws_get_link_bandwidth; surf_workstation_model->extension.workstation.get_link_latency = - ws_get_link_latency; - surf_workstation_model->extension.workstation.link_shared = ws_link_shared; + ws_get_link_latency; + surf_workstation_model->extension.workstation.link_shared = + ws_link_shared; surf_workstation_model->extension.workstation.get_properties = - ws_get_properties; + ws_get_properties; + +} + +void surf_workstation_model_init_current_default(void) +{ + surf_workstation_model_init_internal(); + //xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1); + 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); } /********************************************************************/ @@ -324,25 +366,22 @@ static void surf_workstation_model_init_internal(void) /* month = {may}, */ /* year = {2003} */ /* } */ -void surf_workstation_model_init_CLM03(const char *filename) +void surf_workstation_model_init_CLM03(void) { surf_workstation_model_init_internal(); - surf_cpu_model_init_Cas01_im(filename); - surf_network_model_init_LegrandVelho(filename); - update_model_description(surf_workstation_model_description, - "CLM03", surf_workstation_model); + surf_cpu_model_init_Cas01(); + surf_network_model_init_CM02(); + xbt_dynar_push(model_list, &surf_workstation_model); + sg_platf_postparse_add_cb(create_workstations); } -void surf_workstation_model_init_compound(const char *filename) +void surf_workstation_model_init_compound() { - xbt_assert0(surf_cpu_model, "No CPU model defined yet!"); - xbt_assert0(surf_network_model, "No network model defined yet!"); + xbt_assert(surf_cpu_model, "No CPU model defined yet!"); + xbt_assert(surf_network_model, "No network model defined yet!"); surf_workstation_model_init_internal(); - - update_model_description(surf_workstation_model_description, - "compound", surf_workstation_model); - xbt_dynar_push(model_list, &surf_workstation_model); + sg_platf_postparse_add_cb(create_workstations); }