X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3196e54e1f004f07f2348d059f351b95146732ef..5e2dd3ecf166c2d82974beb220aeb8dd4200f105:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index c23662912b..b104f008d9 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -1,438 +1,326 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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 "workstation_private.h" -#include "cpu_private.h" -#include "network_private.h" +#include "portable.h" +#include "surf_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf, - "Logging specific to the SURF workstation module"); +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; -surf_workstation_resource_t surf_workstation_resource = NULL; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, + "Logging specific to the SURF workstation module"); -xbt_dict_t workstation_set = NULL; +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->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; + workstation->id = id; - return workstation; -} + xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, + workstation, surf_resource_free); -static void workstation_free(void *workstation) -{ - free(((workstation_CLM03_t)workstation)->name); - free(workstation); + return workstation; } -static void create_workstations(void) +void create_workstations(void) { - xbt_dict_cursor_t cursor = NULL; + 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_assert1(nw_card, "No corresponding card found for %s",name); - xbt_dict_set(workstation_set, name, - workstation_new(name, cpu, nw_card), workstation_free); + + xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) { + int *id = NULL; +// COMMENTED BY DAVID +// 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); } } -static void *name_service(const char *name) +static int ws_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 ws_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 ws_parallel_action_free(surf_action_t action) { - return ((workstation_CLM03_t) resource_id)->name; + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static int resource_used(void *resource_id) +static int ws_action_unref(surf_action_t action) { - xbt_assert0(0, - "Workstation is a virtual resource. I should not be there!"); + 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 ws_parallel_action_free(action); + else + DIE_IMPOSSIBLE; return 0; } -static int parallel_action_free(surf_action_t action) +static void ws_action_cancel(surf_action_t action) { - action->using--; - if(!action->using) { - xbt_swag_remove(action, action->state_set); - if(((surf_action_parallel_task_CSL05_t)action)->variable) - lmm_variable_free(maxmin_system, ((surf_action_parallel_task_CSL05_t)action)->variable); - free(action); - return 1; - } - return 0; + 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) + ws_parallel_action_cancel(action); + else + DIE_IMPOSSIBLE; + return; } -static void parallel_action_use(surf_action_t action) +static void ws_action_state_set(surf_action_t action, + e_surf_action_state_t state) { - action->using++; + 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; } -static int action_free(surf_action_t action) +static double ws_share_resources(double now) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - return surf_network_resource->common_public->action_free(action); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - return surf_cpu_resource->common_public->action_free(action); - else if(action->resource_type==(surf_resource_t)surf_workstation_resource) - return parallel_action_free(action); - else DIE_IMPOSSIBLE; - return 0; + return -1.0; } -static void action_use(surf_action_t action) +static void ws_update_actions_state(double now, double delta) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->action_use(action); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->action_use(action); - else if(action->resource_type==(surf_resource_t)surf_workstation_resource) - return parallel_action_use(action); - else DIE_IMPOSSIBLE; return; } -static void action_cancel(surf_action_t action) +static void ws_update_resource_state(void *id, + tmgr_trace_event_t event_type, + double value, double date) { - DIE_IMPOSSIBLE; - return; + THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ +} + +static surf_action_t ws_execute(void *workstation, double size) +{ + return surf_cpu_model->extension.cpu. + 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); +} + +static void ws_action_suspend(surf_action_t 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 ws_action_resume(surf_action_t 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 void action_recycle(surf_action_t action) +static int ws_action_is_suspended(surf_action_t 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; - return; } -static void action_change_state(surf_action_t action, - e_surf_action_state_t state) +static void ws_action_set_max_duration(surf_action_t action, double duration) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->action_change_state(action,state); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->action_change_state(action,state); - else if(action->resource_type==(surf_resource_t)surf_workstation_resource) - surf_action_change_state(action, state); - else DIE_IMPOSSIBLE; - return; + 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 double share_resources(double now) +static void ws_action_set_priority(surf_action_t action, double priority) { - return -1.0; + 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 void update_actions_state(double now, double delta) -{ - surf_action_parallel_task_CSL05_t action = NULL; - surf_action_parallel_task_CSL05_t next_action = NULL; - xbt_swag_t running_actions = - surf_workstation_resource->common_public->states.running_action_set; - xbt_swag_t failed_actions = - surf_workstation_resource->common_public->states.failed_action_set; - - xbt_swag_foreach_safe(action, next_action, running_actions) { - surf_double_update(&(action->generic_action.remains), - lmm_variable_getvalue(action->variable) * delta); - if (action->generic_action.max_duration != NO_MAX_DURATION) - surf_double_update(&(action->generic_action.max_duration), delta); - if ((action->generic_action.remains <= 0) && - (lmm_get_variable_weight(action->variable)>0)) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && - (action->generic_action.max_duration <= 0)) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else { /* Need to check that none of the resource has failed */ - lmm_constraint_t cnst = NULL; - int i = 0; - surf_resource_t resource = NULL; - - while ((cnst = - lmm_get_cnst_from_var(maxmin_system, action->variable, - i++))) { - resource = (surf_resource_t) lmm_constraint_id(cnst); - if(resource== (surf_resource_t) surf_cpu_resource) { - cpu_Cas01_t cpu = lmm_constraint_id(cnst); - if (cpu->state_current == SURF_CPU_OFF) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_FAILED); - break; - } - } else if (resource== (surf_resource_t) surf_network_resource) { - network_link_CM02_t nw_link = lmm_constraint_id(cnst); - - if (nw_link->state_current == SURF_NETWORK_LINK_OFF) { - action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_FAILED); - break; - } - } - } - } - } +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); + INFO0("You tried to ask if a non network action is limited by latency, aborting..."); + DIE_IMPOSSIBLE; +} - return; +static double ws_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 void update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value) +static surf_action_t ws_communicate(void *workstation_src, + void *workstation_dst, double size, + double rate) { - return; + 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 surf_action_t execute(void *workstation, double size) +static e_surf_resource_state_t ws_get_state(void *workstation) { - return surf_cpu_resource->extension_public-> - execute(((workstation_CLM03_t) workstation)->cpu, size); + return surf_cpu_model->extension.cpu. + get_state(((workstation_CLM03_t) workstation)->cpu); } -static surf_action_t action_sleep(void *workstation, double duration) +static double ws_get_speed(void *workstation, double load) { - return surf_cpu_resource->extension_public-> - sleep(((workstation_CLM03_t) workstation)->cpu, duration); + return surf_cpu_model->extension.cpu. + get_speed(((workstation_CLM03_t) workstation)->cpu, load); } -static void action_suspend(surf_action_t action) +static double ws_get_available_speed(void *workstation) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->suspend(action); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->suspend(action); - else DIE_IMPOSSIBLE; + return surf_cpu_model->extension.cpu. + get_available_speed(((workstation_CLM03_t) + workstation)->cpu); } -static void action_resume(surf_action_t action) +static surf_action_t ws_execute_parallel_task(int workstation_nb, + void **workstation_list, + double *computation_amount, + double *communication_amount, + double amount, double rate) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->resume(action); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->resume(action); - else DIE_IMPOSSIBLE; + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */ } -static int action_is_suspended(surf_action_t action) + +/* returns an array of network_link_CM02_t */ +static xbt_dynar_t ws_get_route(void *src, void *dst) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - return surf_network_resource->common_public->is_suspended(action); - if(action->resource_type==(surf_resource_t)surf_cpu_resource) - return surf_cpu_resource->common_public->is_suspended(action); - DIE_IMPOSSIBLE; + 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); } -static void action_set_max_duration(surf_action_t action, double duration) +static double ws_get_link_bandwidth(const void *link) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->set_max_duration(action,duration); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->set_max_duration(action,duration); - else DIE_IMPOSSIBLE; + return surf_network_model->extension.network.get_link_bandwidth(link); } -static surf_action_t communicate(void *workstation_src, - void *workstation_dst, double size, - double rate) +static double ws_get_link_latency(const void *link) { - return surf_network_resource->extension_public-> - communicate(((workstation_CLM03_t) workstation_src)->network_card, - ((workstation_CLM03_t) workstation_dst)->network_card, size, rate); + return surf_network_model->extension.network.get_link_latency(link); } -static e_surf_cpu_state_t get_state(void *workstation) +static int ws_link_shared(const void *link) { - return surf_cpu_resource->extension_public-> - get_state(((workstation_CLM03_t) workstation)->cpu); + return surf_network_model->extension.network.get_link_latency(link); } -static surf_action_t execute_parallel_task (int workstation_nb, - void **workstation_list, - double *computation_amount, - double *communication_amount, - double amount, - double rate) +static void ws_finalize(void) { - surf_action_parallel_task_CSL05_t action = NULL; - int i, j, k; - xbt_dict_t network_link_set = xbt_dict_new(); - xbt_dict_cursor_t cursor = NULL; - char *name = NULL; - int nb_link = 0; - network_link_CM02_t link; - - /* Compute the number of affected resources... */ - for(i=0; i< workstation_nb; i++) { - for(j=0; j< workstation_nb; j++) { - network_card_CM02_t card_src = ((workstation_CLM03_t*)workstation_list)[i]->network_card; - network_card_CM02_t card_dst = ((workstation_CLM03_t*)workstation_list)[j]->network_card; - int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id); - - if(communication_amount[i*workstation_nb+j]>=0) - for(k=0; k< route_size; k++) { - xbt_dict_set(network_link_set, route[k]->name, route[k], NULL); - } - } - } - - xbt_dict_foreach(network_link_set, cursor, name, link) { - nb_link++; - } - - action = xbt_new0(s_surf_action_parallel_task_CSL05_t, 1); - action->generic_action.using = 1; - action->generic_action.cost = amount; - action->generic_action.remains = amount; - action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = -1.0; - action->generic_action.finish = -1.0; - action->generic_action.resource_type = - (surf_resource_t) surf_workstation_resource; - action->suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - action->generic_action.state_set = - surf_network_resource->common_public->states.running_action_set; - - xbt_swag_insert(action, action->generic_action.state_set); - action->rate = rate; - - if(action->rate>0) - action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, - workstation_nb + nb_link); - else - action->variable = lmm_variable_new(maxmin_system, action, 1.0, action->rate, - workstation_nb + nb_link); - - if(nb_link + workstation_nb == 0) - action_change_state((surf_action_t) action, SURF_ACTION_DONE); - - for (i = 0; icpu)->constraint, - action->variable, computation_amount[i]); - - for (i=0; inetwork_card; - network_card_CM02_t card_dst = ((workstation_CLM03_t*)workstation_list)[j]->network_card; - int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id); - - for(k=0; k< route_size; k++) { - if(communication_amount[i*workstation_nb+j]>=0) { - lmm_expand_add(maxmin_system, route[k]->constraint, - action->variable, communication_amount[i*workstation_nb+j]); - } - } - } - } - - return (surf_action_t) action; -} - -static void finalize(void) -{ - xbt_dict_free(&workstation_set); - xbt_swag_free(surf_workstation_resource->common_public->states.ready_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states. - running_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states. - failed_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set); - - free(surf_workstation_resource->common_public); - free(surf_workstation_resource->common_private); - free(surf_workstation_resource->extension_public); - - free(surf_workstation_resource); - surf_workstation_resource = NULL; -} - -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_use = action_use; - 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->common_public->suspend = action_suspend; - surf_workstation_resource->common_public->resume = action_resume; - surf_workstation_resource->common_public->is_suspended = action_is_suspended; - surf_workstation_resource->common_public->set_max_duration = action_set_max_duration; - - surf_workstation_resource->extension_public->execute = execute; - surf_workstation_resource->extension_public->sleep = action_sleep; - surf_workstation_resource->extension_public->get_state = get_state; - surf_workstation_resource->extension_public->communicate = communicate; - surf_workstation_resource->extension_public->execute_parallel_task = - execute_parallel_task; - - workstation_set = xbt_dict_new(); - - xbt_assert0(maxmin_system, "surf_init has to be called first!"); + surf_model_exit(surf_workstation_model); + surf_workstation_model = NULL; +} + +static xbt_dict_t ws_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_unref = ws_action_unref; + surf_workstation_model->action_cancel = ws_action_cancel; + 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->update_actions_state = + ws_update_actions_state; + surf_workstation_model->model_private->update_resource_state = + ws_update_resource_state; + surf_workstation_model->model_private->finalize = ws_finalize; + + surf_workstation_model->suspend = ws_action_suspend; + surf_workstation_model->resume = ws_action_resume; + 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; + surf_workstation_model->get_remains = ws_action_get_remains; + surf_workstation_model->get_latency_limited = ws_get_latency_limited; + + 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; + + 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; + surf_workstation_model->extension.workstation.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; + surf_workstation_model->extension.workstation.get_properties = + ws_get_properties; + } /********************************************************************/ @@ -446,26 +334,25 @@ static void surf_workstation_resource_init_internal(void) /* month = {may}, */ /* year = {2003} */ /* } */ -void surf_workstation_resource_init_CLM03(const char *filename) -{ -/* int i ; */ -/* surf_resource_t resource = NULL; */ - - surf_workstation_resource_init_internal(); - surf_cpu_resource_init_Cas01(filename); - surf_network_resource_init_CM02(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; */ -/* } */ -/* } */ +void surf_workstation_model_init_CLM03(const char *filename) +{ + 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); + 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); }