X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/110b155a3d6309c2f780ca870d8c14391796ccd4..d7417d92e963c0d6ed8443454a56c85a3728d214:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index c687495329..54f40fa410 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -5,87 +5,119 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "xbt/ex.h" #include "xbt/dict.h" +#include "portable.h" #include "workstation_private.h" #include "cpu_private.h" -#include "network_private.h" +#include "network_common.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf, - "Logging specific to the SURF workstation module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, + "Logging specific to the SURF workstation module"); -surf_workstation_resource_t surf_workstation_resource = NULL; +surf_model_t surf_workstation_model = NULL; -xbt_dict_t workstation_set = NULL; - -static workstation_t workstation_new(const char *name, - void *cpu, void *card) +static workstation_CLM03_t workstation_new(const char *name, + void *cpu, void *card) { - workstation_t workstation = xbt_new0(s_workstation_t, 1); + workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1); - workstation->resource = (surf_resource_t) surf_workstation_resource; - workstation->name = xbt_strdup(name); + workstation->generic_resource.model = surf_workstation_model; + workstation->generic_resource.name = xbt_strdup(name); workstation->cpu = cpu; workstation->network_card = card; + xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, + workstation, surf_resource_free); + return workstation; } -static void create_workstations(void) +void create_workstations(void) { xbt_dict_cursor_t cursor = NULL; char *name = NULL; void *cpu = NULL; void *nw_card = NULL; - xbt_dict_foreach(cpu_set, cursor, name, cpu) { - nw_card = NULL; - xbt_dict_get(network_card_set, name, (void *) &nw_card); - xbt_assert0(nw_card, "No corresponding card found"); - xbt_dict_set(workstation_set, name, - workstation_new(name, cpu, 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); + + workstation_new(name, cpu, nw_card); } } -static void *name_service(const char *name) +static int resource_used(void *resource_id) { - void *workstation = NULL; - - xbt_dict_get(workstation_set, name, &workstation); + THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ +} - return workstation; +static void parallel_action_cancel(surf_action_t action) +{ + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static const char *get_resource_name(void *resource_id) +static int parallel_action_free(surf_action_t action) { - return ((workstation_t) resource_id)->name; + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static int resource_used(void *resource_id) +static void parallel_action_use(surf_action_t action) { - xbt_assert0(0, - "Workstation is a virtual resource. I should not be there!"); - return 0; + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static void action_free(surf_action_t action) +static int action_unref(surf_action_t action) { - return; + if (action->model_type == surf_network_model) + return surf_network_model->action_unref(action); + else if (action->model_type == surf_cpu_model) + return surf_cpu_model->action_unref(action); + else if (action->model_type == surf_workstation_model) + return parallel_action_free(action); + else + DIE_IMPOSSIBLE; + return 0; } -static void action_cancel(surf_action_t action) +static void action_ref(surf_action_t action) { + if (action->model_type == surf_network_model) + surf_network_model->action_ref(action); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->action_ref(action); + else if (action->model_type == surf_workstation_model) + parallel_action_use(action); + else + DIE_IMPOSSIBLE; return; } -static void action_recycle(surf_action_t action) +static void action_cancel(surf_action_t action) { + if (action->model_type == surf_network_model) + surf_network_model->action_cancel(action); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->action_cancel(action); + else if (action->model_type == surf_workstation_model) + parallel_action_cancel(action); + else + DIE_IMPOSSIBLE; return; } -static void action_change_state(surf_action_t action, - e_surf_action_state_t state) +static void ws_action_state_set(surf_action_t action, + e_surf_action_state_t state) { - surf_action_change_state(action, state); + if (action->model_type == surf_network_model) + surf_network_model->action_state_set(action, state); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->action_state_set(action, state); + else if (action->model_type == surf_workstation_model) + surf_action_state_set(action, state); + else + DIE_IMPOSSIBLE; return; } @@ -94,152 +126,242 @@ static double share_resources(double now) return -1.0; } - static void update_actions_state(double now, double delta) { return; } static void update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value) + tmgr_trace_event_t event_type, + double value, double date) { - return; + THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ } static surf_action_t execute(void *workstation, double size) { - return surf_cpu_resource->extension_public-> - execute(((workstation_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_resource->extension_public-> - sleep(((workstation_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) { - xbt_assert0(action->resource_type == - ((surf_resource_t) surf_cpu_resource), - "Resource type mismatch"); - surf_cpu_resource->extension_public->suspend(action); + if (action->model_type == surf_network_model) + surf_network_model->suspend(action); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->suspend(action); + else + DIE_IMPOSSIBLE; } static void action_resume(surf_action_t action) { - xbt_assert0(action->resource_type == - ((surf_resource_t) surf_cpu_resource), - "Resource type mismatch"); - surf_cpu_resource->extension_public->resume(action); + if (action->model_type == surf_network_model) + surf_network_model->resume(action); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->resume(action); + else + DIE_IMPOSSIBLE; } static int action_is_suspended(surf_action_t action) { - xbt_assert0(action->resource_type == - ((surf_resource_t) surf_cpu_resource), - "Resource type mismatch"); - return surf_cpu_resource->extension_public->is_suspended(action); + if (action->model_type == surf_network_model) + return surf_network_model->is_suspended(action); + if (action->model_type == surf_cpu_model) + return surf_cpu_model->is_suspended(action); + DIE_IMPOSSIBLE; +} + +static void 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); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->set_max_duration(action, duration); + else + DIE_IMPOSSIBLE; +} + +static void action_set_priority(surf_action_t action, double priority) +{ + if (action->model_type == surf_network_model) + surf_network_model->set_priority(action, priority); + else if (action->model_type == surf_cpu_model) + surf_cpu_model->set_priority(action, priority); + else + DIE_IMPOSSIBLE; } static surf_action_t communicate(void *workstation_src, - void *workstation_dst, double size) + void *workstation_dst, double size, + double rate) { - return surf_network_resource->extension_public-> - communicate(((workstation_t) workstation_src)->network_card, - ((workstation_t) workstation_dst)->network_card, size); + return surf_network_model->extension. + network.communicate(((workstation_CLM03_t) workstation_src)->network_card, + ((workstation_CLM03_t) workstation_dst)->network_card, + size, rate); } static e_surf_cpu_state_t get_state(void *workstation) { - return surf_cpu_resource->extension_public-> - get_state(((workstation_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); +} + +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); +} + +static surf_action_t execute_parallel_task(int workstation_nb, + void **workstation_list, + double *computation_amount, + double *communication_amount, + double amount, double rate) +{ + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ +} + + +/* returns an array of network_link_CM02_t */ +static const void **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); +} + +static double get_link_bandwidth(const void *link) +{ + return surf_network_model->extension.network.get_link_bandwidth(link); +} + +static double get_link_latency(const void *link) +{ + return surf_network_model->extension.network.get_link_latency(link); +} + +static int link_shared(const void *link) +{ + return surf_network_model->extension.network.get_link_latency(link); } static void finalize(void) { + surf_model_exit(surf_workstation_model); + surf_workstation_model = NULL; +} + +static void surf_workstation_model_init_internal(void) +{ + surf_workstation_model = surf_model_init(); + + surf_workstation_model->name = "Workstation"; + surf_workstation_model->action_unref = action_unref; + surf_workstation_model->action_ref = action_ref; + surf_workstation_model->action_cancel = action_cancel; + surf_workstation_model->action_state_set = ws_action_state_set; + + surf_workstation_model->model_private->resource_used = resource_used; + surf_workstation_model->model_private->share_resources = share_resources; + surf_workstation_model->model_private->update_actions_state = + update_actions_state; + surf_workstation_model->model_private->update_resource_state = + update_resource_state; + surf_workstation_model->model_private->finalize = finalize; + + surf_workstation_model->suspend = action_suspend; + surf_workstation_model->resume = action_resume; + 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->extension.workstation.execute = execute; + surf_workstation_model->extension.workstation.sleep = action_sleep; + surf_workstation_model->extension.workstation.get_state = get_state; + surf_workstation_model->extension.workstation.get_speed = get_speed; + 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.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; } -static void surf_workstation_resource_init_internal(void) -{ - s_surf_action_t action; - - surf_workstation_resource = xbt_new0(s_surf_workstation_resource_t, 1); - - surf_workstation_resource->common_private = - xbt_new0(s_surf_resource_private_t, 1); - surf_workstation_resource->common_public = - xbt_new0(s_surf_resource_public_t, 1); -/* surf_workstation_resource->extension_private = xbt_new0(s_surf_workstation_resource_extension_private_t,1); */ - surf_workstation_resource->extension_public = - xbt_new0(s_surf_workstation_resource_extension_public_t, 1); - - surf_workstation_resource->common_public->states.ready_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.running_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.failed_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.done_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - - surf_workstation_resource->common_public->name_service = name_service; - surf_workstation_resource->common_public->get_resource_name = - get_resource_name; - surf_workstation_resource->common_public->action_get_state = - surf_action_get_state; - surf_workstation_resource->common_public->action_free = action_free; - surf_workstation_resource->common_public->action_cancel = action_cancel; - surf_workstation_resource->common_public->action_recycle = - action_recycle; - surf_workstation_resource->common_public->action_change_state = - action_change_state; - surf_workstation_resource->common_public->action_set_data = surf_action_set_data; - surf_workstation_resource->common_public->name = "Workstation"; - - surf_workstation_resource->common_private->resource_used = resource_used; - surf_workstation_resource->common_private->share_resources = - share_resources; - surf_workstation_resource->common_private->update_actions_state = - update_actions_state; - surf_workstation_resource->common_private->update_resource_state = - update_resource_state; - surf_workstation_resource->common_private->finalize = finalize; - - surf_workstation_resource->extension_public->execute = execute; - surf_workstation_resource->extension_public->sleep = action_sleep; - surf_workstation_resource->extension_public->suspend = action_suspend; - surf_workstation_resource->extension_public->resume = action_resume; - surf_workstation_resource->extension_public->is_suspended = action_is_suspended; - surf_workstation_resource->extension_public->get_state = get_state; - surf_workstation_resource->extension_public->communicate = communicate; - - workstation_set = xbt_dict_new(); - - xbt_assert0(maxmin_system, "surf_init has to be called first!"); -} - -void surf_workstation_resource_init(const char *filename) -{ -/* int i ; */ -/* surf_resource_t resource = NULL; */ - - surf_workstation_resource_init_internal(); - surf_cpu_resource_init(filename); - surf_network_resource_init(filename); - create_workstations(); - xbt_dynar_push(resource_list, &surf_workstation_resource); -/* xbt_dynar_foreach(resource_list, i, resource) { */ -/* if(resource==surf_cpu_resource) { */ -/* xbt_dynar_remove_at(resource_list, i, NULL); */ -/* i--; */ -/* continue; */ -/* } */ -/* if(resource==surf_network_resource) { */ -/* xbt_dynar_remove_at(resource_list, i, NULL); */ -/* i--; */ -/* continue; */ -/* } */ -/* } */ +/********************************************************************/ +/* The model used in MSG and presented at CCGrid03 */ +/********************************************************************/ +/* @InProceedings{Casanova.CLM_03, */ +/* author = {Henri Casanova and Arnaud Legrand and Loris Marchal}, */ +/* title = {Scheduling Distributed Applications: the SimGrid Simulation Framework}, */ +/* booktitle = {Proceedings of the third IEEE International Symposium on Cluster Computing and the Grid (CCGrid'03)}, */ +/* publisher = {"IEEE Computer Society Press"}, */ +/* month = {may}, */ +/* year = {2003} */ +/* } */ +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); + update_model_description(surf_workstation_model_description, + "CLM03", surf_workstation_model); + xbt_dynar_push(model_list, &surf_workstation_model); +} + +void surf_workstation_model_init_compound(const char *filename) +{ + + xbt_assert0(surf_cpu_model, "No CPU model defined yet!"); + xbt_assert0(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); }