X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d30b64ee1cb46a273b00b58ad3c97bb92157cd55..ee4826df7653877c4146666d360ce83a546ce0ec:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 1097df4e55..d06e946ca5 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -17,9 +17,12 @@ static s_route_KCCFLN05_t *routing_table = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] static network_link_KCCFLN05_t loopback = NULL; static xbt_dict_t parallel_task_network_link_set = NULL; +//added to work with GTNETS +static xbt_dict_t router_set = NULL; /*xbt_dict_t network_link_set = NULL;*/ + /* convenient function */ static void __update_cpu_usage(cpu_KCCFLN05_t cpu) { @@ -76,7 +79,31 @@ static void __update_cpu_usage(cpu_KCCFLN05_t cpu) static void *name_service(const char *name) { - return xbt_dict_get_or_null(workstation_set, name); + xbt_ex_t e; + void *res=NULL; + + + + TRY { + res = xbt_dict_get_or_null(workstation_set, name); + } CATCH(e) { + WARN1("Host '%s' not found, verifing if it is a router", name); + res = NULL; + } + + + if(res == NULL){ + TRY { + res = xbt_dict_get_or_null(router_set, name); + } CATCH(e) { + if (e.category != not_found_error) + RETHROW; + xbt_ex_free(e); + res = NULL; + } + } + + return res; } static const char *get_resource_name(void *resource_id) @@ -393,6 +420,7 @@ static void finalize(void) xbt_dict_free(&network_link_set); xbt_dict_free(&workstation_set); + xbt_dict_free(&router_set); if (parallel_task_network_link_set != NULL) { xbt_dict_free(¶llel_task_network_link_set); } @@ -697,6 +725,32 @@ static double get_link_latency(const void *link) { /*** Resource Creation & Destruction **/ /**************************************/ + +static void router_free(void *router) +{ + free( ((router_KCCFLN05_t) router)->name ); +} + +static void router_new(const char *name) +{ + static unsigned int nb_routers = 0; + + INFO1("Creating a router %s", name); + + cpu_KCCFLN05_t router; + router = xbt_new0(s_cpu_KCCFLN05_t, 1); + + router->name = xbt_strdup(name); + router->id = nb_routers++; + xbt_dict_set(router_set, name, router, router_free); +} + +static void parse_route_set_routers(void) +{ + //add a dumb router just to be GTNETS compatible + router_new(A_surfxml_router_name); +} + static void cpu_free(void *cpu) { free(((cpu_KCCFLN05_t) cpu)->name); @@ -926,11 +980,16 @@ static void parse_route_set_endpoints(void) static void parse_route_elem(void) { + xbt_ex_t e; if (nb_link == link_list_capacity) { link_list_capacity *= 2; link_list = xbt_realloc(link_list, (link_list_capacity) * sizeof(network_link_KCCFLN05_t)); } - link_list[nb_link++] = xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name); + TRY { + link_list[nb_link++] = xbt_dict_get(network_link_set, A_surfxml_route_element_name); + } CATCH(e) { + RETHROW1("Link %s not found (dict raised this exception: %s)",A_surfxml_route_element_name); + } } static void parse_route_set_route(void) @@ -942,7 +1001,7 @@ static void parse_route_set_route(void) static void parse_file(const char *file) { - int i ; + int i; /* Figuring out the cpus */ surf_parse_reset_parser(); @@ -953,6 +1012,13 @@ static void parse_file(const char *file) create_routing_table(); + /* Figuring out the router (added after GTNETS) */ + surf_parse_reset_parser(); + STag_surfxml_router_fun=parse_route_set_routers; + surf_parse_open(file); + xbt_assert1((!surf_parse()),"Parse error in %s",file); + surf_parse_close(); + /* Figuring out the network links */ surf_parse_reset_parser(); ETag_surfxml_network_link_fun = parse_network_link; @@ -1049,7 +1115,8 @@ static void resource_init_internal(void) surf_workstation_resource->extension_public->get_link_bandwidth = get_link_bandwidth; surf_workstation_resource->extension_public->get_link_latency = get_link_latency; - workstation_set = xbt_dict_new(); + workstation_set = xbt_dict_new(); + router_set = xbt_dict_new(); network_link_set = xbt_dict_new(); xbt_assert0(maxmin_system, "surf_init has to be called first!"); @@ -1068,14 +1135,45 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename) xbt_dynar_push(resource_list, &surf_workstation_resource); } -void surf_workstation_resource_init_KCCFLN05_proportionnal(const char *filename) +void surf_workstation_resource_init_KCCFLN05_proportional(const char *filename) { xbt_assert0(!surf_cpu_resource, "CPU resource type already defined"); xbt_assert0(!surf_network_resource, "network resource type already defined"); resource_init_internal(); parse_file(filename); - surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportionnal)"; + surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportional)"; use_sdp_solver=1; xbt_dynar_push(resource_list, &surf_workstation_resource); } + +void surf_workstation_resource_init_KCCFLN05_Vegas(const char *filename) +{ + xbt_assert0(!surf_cpu_resource, "CPU resource type already defined"); + xbt_assert0(!surf_network_resource, "network resource type already defined"); + resource_init_internal(); + parse_file(filename); + + lmm_set_default_protocol_function(func_vegas_fpi); + + surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)"; + use_lagrange_solver=1; + xbt_dynar_push(resource_list, &surf_workstation_resource); +} + +void surf_workstation_resource_init_KCCFLN05_Reno(const char *filename) +{ + xbt_assert0(!surf_cpu_resource, "CPU resource type already defined"); + xbt_assert0(!surf_network_resource, "network resource type already defined"); + resource_init_internal(); + parse_file(filename); + + lmm_set_default_protocol_function(func_reno_fpi); + + surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)"; + use_lagrange_solver=1; + xbt_dynar_push(resource_list, &surf_workstation_resource); +} + + +