X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f26d744d3e443d08cb485b543f30513f7da3469..65f020ece2b5a393e49f4a8a7bdb4dc392d2ff32:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index e5afea3ef9..a4bbe30144 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,9 +12,11 @@ #include "simgrid/platf_interface.h" // platform creation API internal interface #include "simgrid/sg_config.h" +#include "storage_interface.hpp" #include "surf/surfxml_parse_values.h" + /** * @ingroup SURF_build_api * @brief A library containing all known workstations @@ -28,6 +30,7 @@ int SIMIX_HOST_LEVEL; //Simix host level int SIMIX_STORAGE_LEVEL; //Simix storage level int MSG_HOST_LEVEL; //Msg host level int MSG_STORAGE_LEVEL; //Msg storage level +int MSG_FILE_LEVEL; //Msg file level int SD_HOST_LEVEL; //Simdag host level int SD_STORAGE_LEVEL; //Simdag storage level int COORD_HOST_LEVEL=0; //Coordinates level @@ -135,12 +138,12 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); // If dynar is is greater than edge id and if the host_link is already defined - if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id && - xbt_dynar_get_as(current_routing->p_linkUpDownList, info->m_id, void*)) - xbt_die("Host_link for '%s' is already defined!",host->id); + if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() && + xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*)) + surf_parse_error("Host_link for '%s' is already defined!",host->id); - XBT_DEBUG("Push Host_link for host '%s' to position %d", info->p_name, info->m_id); - xbt_dynar_set_as(current_routing->p_linkUpDownList, info->m_id, s_surf_parsing_link_up_down_t, link_up_down); + XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId()); + xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down); } /** @@ -153,13 +156,13 @@ static void parse_S_host(sg_platf_host_cbarg_t host) xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", host->id); - RoutingEdgePtr info = new RoutingEdge(); - info->p_rcComponent = current_routing; - info->p_rcType = SURF_NETWORK_ELEMENT_HOST; - info->p_name = xbt_strdup(host->id); - info->m_id = current_routing->parsePU(info); + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(host->id), + -1, + SURF_NETWORK_ELEMENT_HOST, + current_routing); + info->setId(current_routing->parsePU(info)); xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->m_id); + XBT_DEBUG("Having set name '%s' id '%d'", host->id, info->getId()); if(mount_list){ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); @@ -197,13 +200,13 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - RoutingEdgePtr info = new RoutingEdge(); - info->p_rcComponent = current_routing; - info->p_rcType = SURF_NETWORK_ELEMENT_ROUTER; - info->p_name = xbt_strdup(router->id); - info->m_id = current_routing->parsePU(info); + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(router->id), + -1, + SURF_NETWORK_ELEMENT_ROUTER, + current_routing); + info->setId(current_routing->parsePU(info)); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->m_id); + XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId()); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -319,7 +322,7 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con xbt_strdup(trace_connect->element), NULL); break; default: - xbt_die("Cannot connect trace %s to %s: kind of trace unknown", + surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", trace_connect->trace, trace_connect->element); break; } @@ -372,14 +375,16 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) new_as->p_hierarchy = SURF_ROUTING_NULL; new_as->p_name = xbt_strdup(AS->id); - RoutingEdgePtr info = new RoutingEdge(); - + RoutingEdgePtr info = new RoutingEdgeImpl(xbt_strdup(new_as->p_name), + -1, + SURF_NETWORK_ELEMENT_AS, + current_routing); if (current_routing == NULL && routing_platf->p_root == NULL) { /* it is the first one */ new_as->p_routingFather = NULL; routing_platf->p_root = new_as; - info->m_id = -1; + info->setId(-1); } else if (current_routing != NULL && routing_platf->p_root != NULL) { xbt_assert(!xbt_dict_get_or_null @@ -394,18 +399,14 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) xbt_dict_set(current_routing->p_routingSons, AS->id, (void *) new_as, NULL); /* add to the father element list */ - info->m_id = current_routing->parseAS(info); + info->setId(current_routing->parseAS(info)); } else { THROWF(arg_error, 0, "All defined components must be belong to a AS"); } - info->p_rcComponent = new_as->p_routingFather; - info->p_rcType = SURF_NETWORK_ELEMENT_AS; - info->p_name = xbt_strdup(new_as->p_name); - - xbt_lib_set(as_router_lib, info->p_name, ROUTING_ASR_LEVEL, + xbt_lib_set(as_router_lib, info->getName(), ROUTING_ASR_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->m_id); + XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->getId()); /* set the new current component of the tree */ current_routing = new_as; @@ -467,11 +468,11 @@ static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst, /* (1) find the as where the src and dst are located */ sg_routing_edge_t src_data = src; sg_routing_edge_t dst_data = dst; - src_as = src_data->p_rcComponent; - dst_as = dst_data->p_rcComponent; + src_as = src_data->getRcComponent(); + dst_as = dst_data->getRcComponent(); #ifndef NDEBUG - char* src_name = src_data->p_name; - char* dst_name = dst_data->p_name; + char* src_name = src_data->getName(); + char* dst_name = dst_data->getName(); #endif xbt_assert(src_as && dst_as, @@ -529,7 +530,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst, memset(&route,0,sizeof(route)); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->p_name, dst->p_name); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->getName(), dst->getName()); /* Find how src and dst are interconnected */ AsPtr common_father, src_father, dst_father; @@ -569,7 +570,7 @@ static void _get_route_and_latency(RoutingEdgePtr src, RoutingEdgePtr dst, &route, latency); xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL), - "bad gateways for route from \"%s\" to \"%s\"", src->p_name, dst->p_name); + "bad gateways for route from \"%s\" to \"%s\"", src->getName(), dst->getName()); sg_routing_edge_t src_gateway_net_elm = route.gw_src; sg_routing_edge_t dst_gateway_net_elm = route.gw_dst; @@ -591,7 +592,7 @@ AS_t surf_platf_get_root(routing_platf_t platf){ } e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t edge){ - return edge->p_rcType; + return edge->getRcType(); } @@ -612,7 +613,7 @@ e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_routing_edge_t ed void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_t* route, double *latency) { - XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->p_name, dst->p_name); + XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->getName(), dst->getName()); if (!*route) { xbt_dynar_reset(routing_platf->p_lastRoute); *route = routing_platf->p_lastRoute; @@ -621,7 +622,7 @@ void RoutingPlatf::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, _get_route_and_latency(src, dst, route, latency); xbt_assert(!latency || *latency >= 0.0, - "negative latency on route between \"%s\" and \"%s\"", src->p_name, dst->p_name); + "negative latency on route between \"%s\" and \"%s\"", src->getName(), dst->getName()); } xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ @@ -653,7 +654,7 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name) { RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name); if (rc) - return rc->p_rcType; + return rc->getRcType(); return SURF_NETWORK_ELEMENT_NULL; } @@ -831,10 +832,10 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) AS.id = cluster->id; if(cluster->topology == SURF_CLUSTER_TORUS){ - XBT_DEBUG("", cluster->id); - AS.routing = A_surfxml_AS_routing_Cluster___torus; - sg_platf_new_AS_begin(&AS); - ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster); + XBT_DEBUG("", cluster->id); + AS.routing = A_surfxml_AS_routing_Cluster___torus; + sg_platf_new_AS_begin(&AS); + ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster); }else{ XBT_DEBUG("", cluster->id); AS.routing = A_surfxml_AS_routing_Cluster; @@ -1240,6 +1241,22 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) // } // } +static void check_disk_attachment() +{ + xbt_lib_cursor_t cursor; + char *key; + void **data; + RoutingEdgePtr host_elm; + xbt_lib_foreach(storage_lib, cursor, key, data) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { + StoragePtr storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); + host_elm = sg_routing_edge_by_name_or_null(storage->p_attach); + if(!host_elm) + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach); + } + } +} + void routing_register_callbacks() { sg_platf_host_add_cb(parse_S_host); @@ -1255,6 +1272,7 @@ void routing_register_callbacks() sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); + sg_platf_postparse_add_cb(check_disk_attachment); /* we care about the ASes while parsing the platf. Incredible, isnt it? */ sg_platf_AS_end_add_cb(routing_AS_end); @@ -1324,7 +1342,7 @@ xbt_dynar_t surf_AS_get_hosts(AsPtr as) { xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_dictelm_t), NULL); for (index = 0; index < count; index++) { relm = xbt_dynar_get_as(elms, index, RoutingEdgePtr); - delm = xbt_lib_get_elm_or_null(host_lib, relm->p_name); + delm = xbt_lib_get_elm_or_null(host_lib, relm->getName()); if (delm!=NULL) { xbt_dynar_push(res, &delm); }