X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..5e9ecc268a45db21daf49b37edb7df76987f798b:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 857f147228..5e3b5ed8ae 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -13,7 +13,7 @@ #include "simgrid/platf_interface.h" // platform creation API internal interface #include "simgrid/sg_config.h" #include "storage_interface.hpp" - +#include "src/surf/platform.hpp" #include "surf/surfxml_parse_values.h" /************* @@ -23,8 +23,8 @@ namespace simgrid { namespace surf { -simgrid::surf::signal routingEdgeCreatedCallbacks; -simgrid::surf::signal asCreatedCallbacks; +simgrid::xbt::signal netcardCreatedCallbacks; +simgrid::xbt::signal asCreatedCallbacks; } } @@ -41,7 +41,6 @@ int MSG_FILE_LEVEL; //Msg file level int SIMIX_STORAGE_LEVEL; //Simix storage level int MSG_STORAGE_LEVEL; //Msg storage level -int SD_STORAGE_LEVEL; //Simdag storage level xbt_lib_t as_router_lib; int ROUTING_ASR_LEVEL; //Routing level @@ -59,9 +58,9 @@ static xbt_dict_t random_value = NULL; simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name) { sg_host_t h = sg_host_by_name(name); - simgrid::surf::NetCard *net_elm = h==NULL?NULL: h->p_netcard; + simgrid::surf::NetCard *net_elm = h==NULL?NULL: h->pimpl_netcard; if (!net_elm) - net_elm = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + net_elm = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); return net_elm; } @@ -127,7 +126,7 @@ struct s_model_type routing_models[] = { */ void sg_platf_new_netcard(sg_platf_host_link_cbarg_t netcard) { - simgrid::surf::NetCard *info = sg_host_by_name(netcard->id)->p_netcard; + simgrid::surf::NetCard *info = sg_host_by_name(netcard->id)->pimpl_netcard; xbt_assert(info, "Host '%s' not found!", netcard->id); xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] || current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI], @@ -146,126 +145,25 @@ void sg_platf_new_netcard(sg_platf_host_link_cbarg_t netcard) // If dynar is is greater than netcard id and if the host_link is already defined 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!",netcard->id); + surf_parse_error("Host_link for '%s' is already defined!",netcard->id); 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); } -/** - * \brief Add a "host" to the network element list - */ -simgrid::surf::NetCard *routing_add_host( - simgrid::surf::As* current_routing, sg_platf_host_cbarg_t host) -{ - if (current_routing->p_hierarchy == SURF_ROUTING_NULL) - current_routing->p_hierarchy = SURF_ROUTING_BASE; - xbt_assert(!sg_host_by_name(host->id), - "Reading a host, processing unit \"%s\" already exists", host->id); - - simgrid::surf::NetCard *netcard = - new simgrid::surf::NetCardImpl(xbt_strdup(host->id), - -1, - SURF_NETWORK_ELEMENT_HOST, - current_routing); - netcard->setId(current_routing->parsePU(netcard)); - sg_host_t h = sg_host_by_name_or_create(host->id); - h->p_netcard = netcard; - XBT_DEBUG("Having set name '%s' id '%d'", host->id, netcard->getId()); - simgrid::surf::routingEdgeCreatedCallbacks(netcard); - - if(mount_list){ - xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = NULL; - } - - if (host->coord && strcmp(host->coord, "")) { - unsigned int cursor; - char*str; - - if (!COORD_HOST_LEVEL) - xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); - /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/ - xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = atof(str); - xbt_dynar_push(ctn,&val); - } - xbt_dynar_shrink(ctn, 0); - xbt_dynar_free(&ctn_str); - h->extension_set(COORD_HOST_LEVEL, (void *) ctn); - XBT_DEBUG("Having set host coordinates for '%s'",host->id); - } - - return netcard; -} - -/** - * \brief Store the ASroute by calling the set_ASroute function of the current routing component - */ -static void parse_E_ASroute(sg_platf_route_cbarg_t ASroute) -{ - /*FIXME:REMOVE:xbt_assert(current_routing->parse_ASroute, - "no defined method \"set_ASroute\" in \"%s\"", - current_routing->name);*/ - current_routing->parseASroute(ASroute); -} - void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { tmgr_trace_t tmgr_trace; if (!trace->file || strcmp(trace->file, "") != 0) { tmgr_trace = tmgr_trace_new_from_file(trace->file); - } else if (strcmp(trace->pc_data, "") == 0) { - tmgr_trace = NULL; } else { - tmgr_trace = - tmgr_trace_new_from_string(trace->id, trace->pc_data, - trace->periodicity); + xbt_assert(strcmp(trace->pc_data, ""), + "Trace '%s' must have either a content, or point to a file on disk.",trace->id); + tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); } xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL); } -void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) -{ - xbt_assert(xbt_dict_get_or_null - (traces_set_list, trace_connect->trace), - "Cannot connect trace %s to %s: trace unknown", - trace_connect->trace, - trace_connect->element); - - switch (trace_connect->kind) { - case SURF_TRACE_CONNECT_KIND_HOST_AVAIL: - xbt_dict_set(trace_connect_list_host_avail, - trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); - break; - case SURF_TRACE_CONNECT_KIND_POWER: - xbt_dict_set(trace_connect_list_power, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); - break; - case SURF_TRACE_CONNECT_KIND_LINK_AVAIL: - xbt_dict_set(trace_connect_list_link_avail, - trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); - break; - case SURF_TRACE_CONNECT_KIND_BANDWIDTH: - xbt_dict_set(trace_connect_list_bandwidth, - trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); - break; - case SURF_TRACE_CONNECT_KIND_LATENCY: - xbt_dict_set(trace_connect_list_latency, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); - break; - default: - surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", - trace_connect->trace, trace_connect->element); - break; - } -} - /** * \brief Make a new routing component to the platform * @@ -350,9 +248,9 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) /* set the new current component of the tree */ current_routing = new_as; - current_routing->p_netElem = info; + current_routing->p_netcard = info; - simgrid::surf::routingEdgeCreatedCallbacks(info); + simgrid::surf::netcardCreatedCallbacks(info); simgrid::surf::asCreatedCallbacks(new_as); } @@ -506,10 +404,10 @@ static void _get_route_and_latency( route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); // Find the net_card corresponding to father - simgrid::surf::NetCard *src_father_net_elm = src_father->p_netElem; - simgrid::surf::NetCard *dst_father_net_elm = dst_father->p_netElem; + simgrid::surf::NetCard *src_father_netcard = src_father->p_netcard; + simgrid::surf::NetCard *dst_father_netcard = dst_father->p_netcard; - common_father->getRouteAndLatency(src_father_net_elm, dst_father_net_elm, + common_father->getRouteAndLatency(src_father_netcard, dst_father_netcard, &route, latency); xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL), @@ -527,7 +425,6 @@ static void _get_route_and_latency( if (dst_gateway_net_elm != dst) _get_route_and_latency(dst_gateway_net_elm, dst, links, latency); - // if vivaldi latency+=vivaldi(src_gateway,dst_gateway) } AS_t surf_platf_get_root(routing_platf_t platf){ @@ -555,12 +452,10 @@ namespace surf { * walk through the routing components tree and find a route between hosts * by calling each "get_route" function in each routing component. */ -void RoutingPlatf::getRouteAndLatency( - simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, - xbt_dynar_t* route, double *latency) +void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency) { - XBT_DEBUG("routing_get_route_and_latency from %s to %s", src->getName(), dst->getName()); - if (!*route) { + XBT_DEBUG("getRouteAndLatency from %s to %s", src->getName(), dst->getName()); + if (NULL == *route) { xbt_dynar_reset(routing_platf->p_lastRoute); *route = routing_platf->p_lastRoute; } @@ -847,13 +742,13 @@ void routing_new_cluster(sg_platf_cluster_cbarg_t cluster) memset(&host, 0, sizeof(host)); host.id = host_id; if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=NULL; - char *key,*data; - host.properties = xbt_dict_new(); + xbt_dict_cursor_t cursor=NULL; + char *key,*data; + host.properties = xbt_dict_new(); - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data),free); - } + xbt_dict_foreach(cluster->properties,cursor,key,data) { + xbt_dict_set(host.properties, key, xbt_strdup(data),free); + } } if (cluster->availability_trace && strcmp(cluster->availability_trace, "")) { xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL); @@ -951,7 +846,7 @@ void routing_new_cluster(sg_platf_cluster_cbarg_t cluster) } else { static_cast(current_routing)->create_links_for_node(cluster, i, rankId, rankId* - static_cast(current_routing)->p_nb_links_per_node + static_cast(current_routing)->p_nb_links_per_node + static_cast(current_routing)->p_has_loopback + static_cast(current_routing)->p_has_limiter ); } @@ -1230,18 +1125,18 @@ static void check_disk_attachment() simgrid::surf::NetCard *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) { - simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); - host_elm = sg_netcard_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); + simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); + host_elm = sg_netcard_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_postparse_add_cb(routing_parse_postparse); - sg_platf_postparse_add_cb(check_disk_attachment); + simgrid::surf::on_postparse.connect(routing_parse_postparse); + simgrid::surf::on_postparse.connect(check_disk_attachment); instr_routing_define_callbacks(); } @@ -1276,8 +1171,8 @@ namespace surf { RoutingPlatf::~RoutingPlatf() { - xbt_dynar_free(&p_lastRoute); - finalize_rec(p_root); + xbt_dynar_free(&p_lastRoute); + finalize_rec(p_root); } } @@ -1337,7 +1232,7 @@ xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as) for (int index = 0; index < count; index++) { sg_netcard_t relm = xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*); - sg_host_t delm = simgrid::Host::by_name_or_null(relm->getName()); + sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->getName()); if (delm!=NULL) { xbt_dynar_push(res, &delm); }