X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f61360c08e9c687b08b57ad2c42bc54f0708e3d8..7fdb9c9ac44fba9f76a3b45d032561995bec2e0d:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index ac8f058eca..af94958d67 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -43,21 +43,24 @@ int NS3_ASR_LEVEL; //host node for ns3 static xbt_dict_t random_value = NULL; -xbt_lib_t storage_lib; -int ROUTING_STORAGE_LEVEL; //Routing for storagelevel -int ROUTING_STORAGE_HOST_LEVEL; -int SURF_STORAGE_LEVEL; - -xbt_lib_t storage_type_lib; -int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level +/** @brief Retrieve a routing edge from its name + * + * Routing edges are either CPU/workstation and routers, whatever + */ +sg_routing_edge_t sg_routing_edge_by_name_or_null(const char *name) { + sg_routing_edge_t net_elm = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); + if(!net_elm) net_elm = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + return net_elm; +} /* Global vars */ -routing_global_t global_routing = NULL; +routing_platf_t routing_platf = NULL; AS_t current_routing = NULL; /* global parse functions */ xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ -xbt_dynar_t mount_list = NULL; /* temporary store of current mount storage */ +extern xbt_dynar_t mount_list; + static const char *src = NULL; /* temporary store the source name of a route */ static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ @@ -95,7 +98,7 @@ struct s_model_type routing_models[] = { {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", model_dijkstracache_create, model_dijkstra_both_end}, - {"none", "No routing (usable with Constant network only)", + {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).", model_none_create, NULL}, {"RuleBased", "Rule-Based routing data (...)", model_rulebased_create, NULL}, @@ -111,7 +114,7 @@ struct s_model_type routing_models[] = { */ static void parse_S_host(sg_platf_host_cbarg_t host) { - network_element_t info = NULL; + sg_routing_edge_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), @@ -155,7 +158,7 @@ static void parse_S_host(sg_platf_host_cbarg_t host) */ static void parse_S_router(sg_platf_router_cbarg_t router) { - network_element_t info = NULL; + sg_routing_edge_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), @@ -196,13 +199,10 @@ static void parse_S_router(sg_platf_router_cbarg_t router) */ static void routing_parse_S_route(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_route_src, A_surfxml_route_dst); src = A_surfxml_route_src; dst = A_surfxml_route_dst; xbt_assert(strlen(src) > 0 || strlen(dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", + "Missing end-points while defining route \"%s\"->\"%s\"", src, dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -212,17 +212,13 @@ static void routing_parse_S_route(void) */ static void routing_parse_S_ASroute(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_ASroute_src, A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; dst = A_surfxml_ASroute_dst; gw_src = A_surfxml_ASroute_gw_src; gw_dst = A_surfxml_ASroute_gw_dst; - xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 - || strlen(gw_dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", - src, dst); + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -231,21 +227,30 @@ static void routing_parse_S_ASroute(void) */ static void routing_parse_S_bypassRoute(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, - "Bypass Route between %s to %s can not be defined", - A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); src = A_surfxml_bypassRoute_src; dst = A_surfxml_bypassRoute_dst; - gw_src = A_surfxml_bypassRoute_gw_src; - gw_dst = A_surfxml_bypassRoute_gw_dst; - xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 - || strlen(gw_dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", - src, dst); + gw_src = NULL; + gw_dst = NULL; + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } +/** + * \brief Set the end points for a bypassASroute + */ +static void routing_parse_S_bypassASroute(void) +{ + src = A_surfxml_bypassASroute_src; + dst = A_surfxml_bypassASroute_dst; + gw_src = A_surfxml_bypassASroute_gw_src; + gw_dst = A_surfxml_bypassASroute_gw_dst; + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +} /** * \brief Set a new link on the actual list of link for a route or ASroute from XML */ @@ -293,17 +298,16 @@ static void routing_parse_E_ASroute(void) route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - if(!strcmp(current_routing->model_desc->name,"RuleBased")) { - e_route->src_gateway = (network_element_t) gw_src; // DIRTY HACK possible only - e_route->dst_gateway = (network_element_t) gw_dst; // because of what is in routing_parse_E_ASroute - } - else{ - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL)); - if(!e_route->src_gateway) - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL)); - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL)); - if(!e_route->dst_gateway) - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL)); + if (!strcmp(current_routing->model_desc->name,"RuleBased")) { + // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields + // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows) + // + // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity + e_route->src_gateway = (sg_routing_edge_t) gw_src; + e_route->dst_gateway = (sg_routing_edge_t) gw_dst; + } else { + e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src); + e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst); } xbt_assert(current_routing->parse_ASroute, "no defined method \"set_ASroute\" in \"%s\"", @@ -324,12 +328,27 @@ static void routing_parse_E_bypassRoute(void) { route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_src,ROUTING_ASR_LEVEL)); - if(!e_route->src_gateway) - e_route->src_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_src,ROUTING_HOST_LEVEL)); - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(as_router_lib,gw_dst,ROUTING_ASR_LEVEL)); - if(!e_route->dst_gateway) - e_route->dst_gateway = ((network_element_t)xbt_lib_get_or_null(host_lib,gw_dst,ROUTING_HOST_LEVEL)); + + xbt_assert(current_routing->parse_bypassroute, + "Bypassing mechanism not implemented by routing '%s'", + current_routing->name); + + current_routing->parse_bypassroute(current_routing, src, dst, e_route); + parsed_link_list = NULL; + src = NULL; + dst = NULL; + gw_src = NULL; + gw_dst = NULL; +} +/** + * \brief Store the bypass route by calling the set_bypassroute function of the current routing component + */ +static void routing_parse_E_bypassASroute(void) +{ + route_t e_route = xbt_new0(s_route_t, 1); + e_route->link_list = parsed_link_list; + e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src); + e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst); xbt_assert(current_routing->parse_bypassroute, "Bypassing mechanism not implemented by routing '%s'", current_routing->name); @@ -354,7 +373,7 @@ static void routing_parse_E_bypassRoute(void) * @param AS_id name of this autonomous system. Must be unique in the platform * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c */ -void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) +void routing_AS_begin(const char *AS_id, int wanted_routing_type) { AS_t new_as; routing_model_description_t model = NULL; @@ -365,17 +384,15 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) "The AS \"%s\" already exists", AS_id); /* search the routing model */ - for (cpt = 0; routing_models[cpt].name; cpt++) - if (!strcmp(wanted_routing_type, routing_models[cpt].name)) - model = &routing_models[cpt]; - /* if its not exist, error */ - if (model == NULL) { - fprintf(stderr, "Routing model %s not found. Existing models:\n", - wanted_routing_type); - for (cpt = 0; routing_models[cpt].name; cpt++) - fprintf(stderr, " %s: %s\n", routing_models[cpt].name, - routing_models[cpt].desc); - xbt_die("dying"); + switch(wanted_routing_type){ + case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break; + case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break; + case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break; + case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break; + case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break; + case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break; + case A_surfxml_AS_routing_RuleBased: model = &routing_models[SURF_MODEL_RULEBASED];break; + case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break; } /* make a new routing component */ @@ -384,16 +401,16 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) new_as->hierarchy = SURF_ROUTING_NULL; new_as->name = xbt_strdup(AS_id); - network_element_t info = NULL; + sg_routing_edge_t info = NULL; info = xbt_new0(s_network_element_t, 1); - if (current_routing == NULL && global_routing->root == NULL) { + if (current_routing == NULL && routing_platf->root == NULL) { /* it is the first one */ new_as->routing_father = NULL; - global_routing->root = new_as; + routing_platf->root = new_as; info->id = -1; - } else if (current_routing != NULL && global_routing->root != NULL) { + } else if (current_routing != NULL && routing_platf->root != NULL) { xbt_assert(!xbt_dict_get_or_null (current_routing->routing_sons, AS_id), @@ -460,7 +477,7 @@ void routing_AS_end() * Get the common father of the to processing units, and the first different * father in the chain */ -static void elements_father(network_element_t src, network_element_t dst, +static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst, AS_t * res_father, AS_t * res_src, AS_t * res_dst) @@ -478,12 +495,14 @@ static void elements_father(network_element_t src, network_element_t dst, AS_t father; /* (1) find the as where the src and dst are located */ - network_element_t src_data = src; - network_element_t dst_data = dst; + sg_routing_edge_t src_data = src; + sg_routing_edge_t dst_data = dst; src_as = src_data->rc_component; dst_as = dst_data->rc_component; +#ifndef NDEBUG char* src_name = src_data->name; char* dst_name = dst_data->name; +#endif xbt_assert(src_as && dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name); @@ -533,7 +552,7 @@ static void elements_father(network_element_t src, network_element_t dst, * This function is called by "get_route" and "get_latency". It allows to walk * recursively through the ASes tree. */ -static void _get_route_and_latency(network_element_t src, network_element_t dst, +static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, xbt_dynar_t * links, double *latency) { s_route_t route; @@ -548,59 +567,51 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst, XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'", common_father->name,src_father->name,dst_father->name); - /* If src and dst are in the same AS, life is good */ - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - - route.link_list = *links; - - common_father->get_route_and_latency(common_father, src, dst, &route,latency); - return; - } - - /* If we are here, src and dst are not in the same AS; check whether a direct bypass is defined */ - + /* Check whether a direct bypass is defined */ route_t e_route_bypass = NULL; if (common_father->get_bypass_route) - e_route_bypass = common_father->get_bypass_route(common_father, src, dst); + e_route_bypass = common_father->get_bypass_route(common_father, src, dst, latency); - if (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ - if (latency) - xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route - -// // FIXME this path is never tested. I need examples to check the bypass mechanism... -// THROW_UNIMPLEMENTED; // let's warn the users of the problem - xbt_dynar_merge(links,&(e_route_bypass->link_list)); + /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ + if (e_route_bypass) { + xbt_dynar_merge(links, &e_route_bypass->link_list); generic_free_route(e_route_bypass); return; } + /* If src and dst are in the same AS, life is good */ + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ + route.link_list = *links; + common_father->get_route_and_latency(common_father, src, dst, &route,latency); + return; + } + /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ - route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); // Find the net_card corresponding to father - network_element_t src_father_net_elm = src_father->net_elem; - network_element_t dst_father_net_elm = dst_father->net_elem; + sg_routing_edge_t src_father_net_elm = src_father->net_elem; + sg_routing_edge_t dst_father_net_elm = dst_father->net_elem; - common_father->get_route_and_latency(common_father, src_father_net_elm, dst_father_net_elm, &route,latency); + common_father->get_route_and_latency(common_father, + src_father_net_elm, dst_father_net_elm, + &route, latency); xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL), "bad gateways for route from \"%s\" to \"%s\"", src->name, dst->name); - network_element_t src_gateway_net_elm = route.src_gateway; - network_element_t dst_gateway_net_elm = route.dst_gateway; + sg_routing_edge_t src_gateway_net_elm = route.src_gateway; + sg_routing_edge_t dst_gateway_net_elm = route.dst_gateway; /* If source gateway is not our source, we have to recursively find our way up to this point */ if (src != src_gateway_net_elm) _get_route_and_latency(src, src_gateway_net_elm, links, latency); - xbt_dynar_merge(links,&(route.link_list)); + xbt_dynar_merge(links, &route.link_list); /* If dest gateway is not our destination, we have to recursively find our way from this point */ - // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples?? - if (dst_gateway_net_elm != dst) { + if (dst_gateway_net_elm != dst) _get_route_and_latency(dst_gateway_net_elm, dst, links, latency); - } - xbt_dynar_free(&route.link_list); } /** @@ -617,12 +628,14 @@ static void _get_route_and_latency(network_element_t src, network_element_t dst, * walk through the routing components tree and find a route between hosts * by calling the differents "get_route" functions in each routing component. */ -void routing_get_route_and_latency(network_element_t src, network_element_t dst, +void routing_get_route_and_latency(sg_routing_edge_t src, + sg_routing_edge_t dst, xbt_dynar_t * route, double *latency) { + XBT_DEBUG("routing_get_route_and_latency from %s to %s",src->name,dst->name); if (!*route) { - xbt_dynar_reset(global_routing->last_route); - *route = global_routing->last_route; + xbt_dynar_reset(routing_platf->last_route); + *route = routing_platf->last_route; } _get_route_and_latency(src, dst, route, latency); @@ -654,18 +667,12 @@ static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) static xbt_dynar_t get_onelink_routes(void) { - return recursive_get_onelink_routes(global_routing->root); + return recursive_get_onelink_routes(routing_platf->root); } e_surf_network_element_type_t routing_get_network_element_type(const char *name) { - network_element_t rc = NULL; - - rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); - if (rc) - return rc->rc_type; - - rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + sg_routing_edge_t rc = sg_routing_edge_by_name_or_null(name); if (rc) return rc->rc_type; @@ -677,15 +684,14 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name) * * Make a global routing structure and set all the parsing functions. */ -void routing_model_create(size_t size_of_links, void *loopback) +void routing_model_create( void *loopback) { /* config the uniq global routing */ - global_routing = xbt_new0(s_routing_global_t, 1); - global_routing->root = NULL; - global_routing->get_onelink_routes = get_onelink_routes; - global_routing->loopback = loopback; - global_routing->size_of_link = size_of_links; - global_routing->last_route = xbt_dynar_new(global_routing->size_of_link,NULL); + routing_platf = xbt_new0(s_routing_platf_t, 1); + routing_platf->root = NULL; + routing_platf->get_onelink_routes = get_onelink_routes; + routing_platf->loopback = loopback; + routing_platf->last_route = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); /* no current routing at moment */ current_routing = NULL; } @@ -737,158 +743,6 @@ void routing_model_create(size_t size_of_links, void *loopback) /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -static void routing_parse_storage(sg_platf_storage_cbarg_t storage) -{ - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), - "Reading a storage, processing unit \"%s\" already exists", storage->id); - - // Verification of an existing type_id - void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); - xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); - - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'", - storage->id, - storage->type_id); - - xbt_lib_set(storage_lib, - storage->id, - ROUTING_STORAGE_LEVEL, - (void *) xbt_strdup(storage->type_id)); -} - -typedef struct s_content { - char *user_rights; - char *user; - char *group; - char *date; - char *time; - int size; -} s_content_t, *content_t; - -static void free_storage_content(void *p) -{ - content_t content = p; - free(content->date); - free(content->group); - free(content->time); - free(content->user); - free(content->user_rights); - free(content); -} - -static xbt_dict_t parse_storage_content(const char *filename) -{ - if ((!filename) || (strcmp(filename, "") == 0)) - return NULL; - - xbt_dict_t parse_content = xbt_dict_new_homogeneous(free_storage_content); - FILE *file = NULL; - - file = surf_fopen(filename, "r"); - xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename, - xbt_str_join(surf_path, ":")); - - char *line = NULL; - size_t len = 0; - ssize_t read; - char user_rights[12]; - char user[100]; - char group[100]; - char date[12]; - char time[12]; - char path[1024]; - int nb, size; - - content_t content; - - while ((read = getline(&line, &len, file)) != -1) { - content = xbt_new0(s_content_t,1); - if(sscanf(line,"%s %d %s %s %d %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) { - content->date = xbt_strdup(date); - content->group = xbt_strdup(group); - content->size = size; - content->time = xbt_strdup(time); - content->user = xbt_strdup(user); - content->user_rights = xbt_strdup(user_rights); - xbt_dict_set(parse_content,path,content,NULL); - } else { - xbt_die("Be sure of passing a good format for content file.\n"); - // You can generate tjis kind of file with command line: - // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt - } - } - if (line) - free(line); - - fclose(file); - return parse_content; -} - -static void routing_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type) -{ - xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); - - storage_type_t stype = xbt_new0(s_storage_type_t, 1); - stype->model = xbt_strdup(storage_type->model); - stype->properties = storage_type->properties; - stype->content = parse_storage_content(storage_type->content); - stype->type_id = xbt_strdup(storage_type->id); - - XBT_INFO("ROUTING Create a storage type id '%s' with model '%s' content '%s' and properties '%p'", - stype->type_id, - stype->model, - storage_type->content, - stype->properties); - - xbt_lib_set(storage_type_lib, - stype->type_id, - ROUTING_STORAGE_TYPE_LEVEL, - (void *) stype); -} -static void routing_parse_mstorage(sg_platf_mstorage_cbarg_t mstorage) -{ - THROW_UNIMPLEMENTED; -// mount_t mnt = xbt_new0(s_mount_t, 1); -// mnt->id = xbt_strdup(mstorage->type_id); -// mnt->name = xbt_strdup(mstorage->name); -// -// if(!mount_list){ -// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); -// mount_list = xbt_dynar_new(sizeof(char *), NULL); -// } -// xbt_dynar_push(mount_list,(void *) mnt); -// free(mnt->id); -// free(mnt->name); -// xbt_free(mnt); -// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); -} - -static void mount_free(void *p) -{ - mount_t mnt = p; - xbt_free(mnt->name); -} - -static void routing_parse_mount(sg_platf_mount_cbarg_t mount) -{ - // Verification of an existing storage - void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL); - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id); - - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name); - - s_mount_t mnt; - mnt.id = surf_storage_resource_by_name(mount->id); - mnt.name = xbt_strdup(mount->name); - - if(!mount_list){ - XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); - } - xbt_dynar_push(mount_list,&mnt); -} - static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) { char *host_id, *groups, *link_id = NULL; @@ -911,7 +765,7 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) } XBT_DEBUG("", cluster->id); - sg_platf_new_AS_begin(cluster->id, "Cluster"); + sg_platf_new_AS_begin(cluster->id, A_surfxml_AS_routing_Cluster); current_routing->link_up_down_list = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); @@ -947,7 +801,7 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL); char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns); XBT_DEBUG("\tavailability_file=\"%s\"", avail_file); - host.power_trace = tmgr_trace_new(avail_file); + host.power_trace = tmgr_trace_new_from_file(avail_file); xbt_free(avail_file); } else { XBT_DEBUG("\tavailability_file=\"\""); @@ -956,7 +810,7 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) if (strcmp(cluster->state_trace, "")) { char *avail_file = xbt_str_varsubst(cluster->state_trace, patterns); XBT_DEBUG("\tstate_file=\"%s\"", avail_file); - host.state_trace = tmgr_trace_new(avail_file); + host.state_trace = tmgr_trace_new_from_file(avail_file); xbt_free(avail_file); } else { XBT_DEBUG("\tstate_file=\"\""); @@ -1065,7 +919,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) surfxml_bufferstack_push(1); XBT_DEBUG("", peer->id); - sg_platf_new_AS_begin(peer->id, "Full"); + sg_platf_new_AS_begin(peer->id, A_surfxml_AS_routing_Full); XBT_DEBUG(" "); host_id = HOST_PEER(peer->id); @@ -1296,6 +1150,8 @@ void routing_register_callbacks() surfxml_add_callback(STag_surfxml_ASroute_cb_list, &routing_parse_S_ASroute); surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &routing_parse_S_bypassRoute); + surfxml_add_callback(STag_surfxml_bypassASroute_cb_list, + &routing_parse_S_bypassASroute); surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &routing_parse_link_ctn); @@ -1303,17 +1159,14 @@ void routing_register_callbacks() surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &routing_parse_E_ASroute); surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &routing_parse_E_bypassRoute); + surfxml_add_callback(ETag_surfxml_bypassASroute_cb_list, + &routing_parse_E_bypassASroute); sg_platf_cluster_add_cb(routing_parse_cluster); sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); - sg_platf_storage_add_cb(routing_parse_storage); - sg_platf_mstorage_add_cb(routing_parse_mstorage); - sg_platf_storage_type_add_cb(routing_parse_storage_type); - sg_platf_mount_add_cb(routing_parse_mount); - /* we care about the ASes while parsing the platf. Incredible, isnt it? */ sg_platf_AS_end_add_cb(routing_AS_end); sg_platf_AS_begin_add_cb(routing_AS_begin); @@ -1345,9 +1198,9 @@ static void finalize_rec(AS_t as) { /** \brief Frees all memory allocated by the routing module */ void routing_exit(void) { - if (!global_routing) + if (!routing_platf) return; - xbt_dynar_free(&global_routing->last_route); - finalize_rec(global_routing->root); - xbt_free(global_routing); + xbt_dynar_free(&routing_platf->last_route); + finalize_rec(routing_platf->root); + xbt_free(routing_platf); }