X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..ceeab8813fc0aff89562202f64c29a808e84cb9a:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 857f147228..8ff760626a 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], @@ -170,9 +169,9 @@ simgrid::surf::NetCard *routing_add_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; + h->pimpl_netcard = netcard; XBT_DEBUG("Having set name '%s' id '%d'", host->id, netcard->getId()); - simgrid::surf::routingEdgeCreatedCallbacks(netcard); + simgrid::surf::netcardCreatedCallbacks(netcard); if(mount_list){ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); @@ -201,36 +200,22 @@ simgrid::surf::NetCard *routing_add_host( 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), + 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); @@ -350,9 +335,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 +491,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 +512,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 +539,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; } @@ -1240,8 +1222,8 @@ static void check_disk_attachment() 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(); } @@ -1337,7 +1319,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); }