X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d313a18f0b28380782e0f3c2ef30fd09379560f3..ae5cdc816ea4ecbc0ecc4422c80aa4a71576ecb3:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 63469da313..9d3a01522f 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) { @@ -78,11 +81,16 @@ static void *name_service(const char *name) { xbt_ex_t e; void *res=NULL; + TRY { - res = xbt_dict_get(workstation_set, name); + res = xbt_dict_get_or_null(workstation_set, name); } CATCH(e) { - RETHROW1("Host '%s' not found (dict raised this exception: %s)",name); + if (e.category != not_found_error) + RETHROW; + WARN1("Host '%s' not found, verifing if it is a router", name); + res = NULL; } + return res; } @@ -400,6 +408,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); } @@ -704,6 +713,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); + + router_KCCFLN05_t router; + router = xbt_new0(s_router_KCCFLN05_t, 1); + + router->name = xbt_strdup(name); + router->id = nb_routers++; + xbt_dict_set(router_set, name, router, router_free); +} + +static void parse_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); @@ -917,18 +952,41 @@ static double impact_on_dst_with_other_send; static void parse_route_set_endpoints(void) { - src_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_src))->id; - dst_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_dst))->id; + cpu_KCCFLN05_t cpu_tmp = NULL; + + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src); + if(cpu_tmp != NULL) { + src_id = cpu_tmp->id; + }else { + xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_src), + "Invalid name '%s': neither a cpu nor a router!", + A_surfxml_route_src); + src_id=-1; + return; + } + + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_dst); + if(cpu_tmp != NULL) { + dst_id = cpu_tmp->id; + }else { + xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_dst), + "Invalid name '%s': neither a cpu nor a router!", + A_surfxml_route_dst); + dst_id=-1; + return ; + } + surf_parse_get_double(&impact_on_src, A_surfxml_route_impact_on_src); surf_parse_get_double(&impact_on_dst, A_surfxml_route_impact_on_dst); surf_parse_get_double(&impact_on_src_with_other_recv, A_surfxml_route_impact_on_src_with_other_recv); surf_parse_get_double(&impact_on_dst_with_other_send, A_surfxml_route_impact_on_dst_with_other_send); - + nb_link = 0; - link_list_capacity = 20; + link_list_capacity = 1; link_list = xbt_new(network_link_KCCFLN05_t, link_list_capacity); + } static void parse_route_elem(void) @@ -947,6 +1005,7 @@ static void parse_route_elem(void) static void parse_route_set_route(void) { + if( src_id != -1 && dst_id != -1 ) route_new(src_id, dst_id, link_list, nb_link, impact_on_src, impact_on_dst, impact_on_src_with_other_recv, impact_on_dst_with_other_send); @@ -954,7 +1013,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(); @@ -965,6 +1024,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_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; @@ -1061,7 +1127,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!"); @@ -1099,7 +1166,7 @@ void surf_workstation_resource_init_KCCFLN05_Vegas(const char *filename) resource_init_internal(); parse_file(filename); - lmm_set_default_protocol_function(func_vegas_fpi); + lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)"; use_lagrange_solver=1; @@ -1113,7 +1180,7 @@ void surf_workstation_resource_init_KCCFLN05_Reno(const char *filename) resource_init_internal(); parse_file(filename); - lmm_set_default_protocol_function(func_reno_fpi); + lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)"; use_lagrange_solver=1;