X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bac600c529ba83f8f246a2dcfa9ddd9c0095675..993ac086676ec73f49a46e389467ed005c2707c3:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 8156a97657..4a31798ea1 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -67,13 +67,13 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) "Refusing to create a second host named '%s'.", host->id); simgrid::surf::As* current_routing = routing_get_current(); - if (current_routing->p_hierarchy == SURF_ROUTING_NULL) - current_routing->p_hierarchy = SURF_ROUTING_BASE; + if (current_routing->hierarchy_ == SURF_ROUTING_NULL) + current_routing->hierarchy_ = SURF_ROUTING_BASE; simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing); - netcard->setId(current_routing->parsePU(netcard)); + netcard->setId(current_routing->addComponent(netcard)); sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); h->pimpl_netcard = netcard; simgrid::surf::netcardCreatedCallbacks(netcard); @@ -123,16 +123,16 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) { simgrid::surf::As* current_routing = routing_get_current(); - if (current_routing->p_hierarchy == SURF_ROUTING_NULL) - current_routing->p_hierarchy = SURF_ROUTING_BASE; + 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), "Reading a router, processing unit \"%s\" already exists", router->id); simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing); - info->setId(current_routing->parsePU(info)); + info->setId(current_routing->addComponent(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->getId()); + XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->id()); simgrid::surf::netcardCreatedCallbacks(info); if (router->coord && strcmp(router->coord, "")) { @@ -176,9 +176,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; unsigned int iter; - int start, end, i; - xbt_dynar_t radical_elements; - xbt_dynar_t radical_ends; if ((cluster->availability_trace && strcmp(cluster->availability_trace, "")) || (cluster->state_trace && strcmp(cluster->state_trace, ""))) { @@ -211,24 +208,23 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) static_cast(current_routing)->parse_specific_arguments(cluster); if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - ((AsCluster*)current_routing)->p_nb_links_per_node++; - ((AsCluster*)current_routing)->p_has_loopback=1; + ((AsCluster*)current_routing)->nb_links_per_node_++; + ((AsCluster*)current_routing)->has_loopback_=1; } if(cluster->limiter_link!=0){ - ((AsCluster*)current_routing)->p_nb_links_per_node++; - ((AsCluster*)current_routing)->p_has_limiter=1; + ((AsCluster*)current_routing)->nb_links_per_node_++; + ((AsCluster*)current_routing)->has_limiter_=1; } - current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); - //Make all hosts - radical_elements = xbt_str_split(cluster->radical, ","); + xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { - radical_ends = xbt_str_split(groups, "-"); - start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); + int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + int end; switch (xbt_dynar_length(radical_ends)) { case 1: @@ -241,7 +237,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) surf_parse_error("Malformed radical"); break; } - for (i = start; i <= end; i++) { + for (int i = start; i <= end; i++) { host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); link_id = bprintf("%s_link_%d", cluster->id, i); @@ -319,8 +315,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) info_loop.link_up = Link::byName(tmp_link); info_loop.link_down = info_loop.link_up; free(tmp_link); - xbt_dynar_set(current_routing->p_linkUpDownList, - rankId*(static_cast(current_routing))->p_nb_links_per_node, &info_loop); + xbt_dynar_set(current_routing->upDownLinks, + rankId*(static_cast(current_routing))->nb_links_per_node_, &info_loop); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -341,8 +337,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) info_lim.link_down = info_lim.link_up; free(tmp_link); auto as_cluster = static_cast(current_routing); - xbt_dynar_set(current_routing->p_linkUpDownList, - rankId*(as_cluster)->p_nb_links_per_node + as_cluster->p_has_loopback , + xbt_dynar_set(current_routing->upDownLinks, + rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ , &info_lim); } @@ -354,9 +350,9 @@ void sg_platf_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_has_loopback - + static_cast(current_routing)->p_has_limiter ); + static_cast(current_routing)->nb_links_per_node_ + + static_cast(current_routing)->has_loopback_ + + static_cast(current_routing)->has_limiter_ ); } xbt_free(link_id); xbt_free(host_id); @@ -385,7 +381,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); sg_platf_new_router(&router); - ((AsCluster*)current_routing)->p_router = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); + ((AsCluster*)current_routing)->router_ = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); free(newid); //Make the backbone @@ -520,21 +516,11 @@ void sg_platf_new_route(sg_platf_route_cbarg_t route) routing_get_current()->parseRoute(route); } -void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) -{ - routing_get_current()->parseASroute(ASroute); -} - void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) { routing_get_current()->parseBypassroute(bypassRoute); } -void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) -{ - routing_get_current()->parseBypassroute(bypassASroute); -} - void sg_platf_new_process(sg_platf_process_cbarg_t process) { if (!simix_global) @@ -634,16 +620,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_route_begin (sg_platf_route_cbarg_t route){ route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } -void sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute){ - ASroute->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); -} void sg_platf_route_end (sg_platf_route_cbarg_t route){ sg_platf_new_route(route); } -void sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute){ - sg_platf_new_ASroute(ASroute); -} void sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route){ char *link_name = xbt_strdup(link_id);