#include "simgrid_config.h"
+#include "src/surf/network_interface.hpp"
#include "src/instr/instr_private.h"
#include "surf/surf.h"
#include "src/surf/surf_private.h"
sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
if(!dst_elm) xbt_die("Element '%s' not found!",dst);
- routing_get_route_and_latency (src_elm, dst_elm, &route,NULL);
+ routing_platf->getRouteAndLatency (src_elm, dst_elm, &route,NULL);
unsigned int i;
surf_cpp_resource_t link;
xbt_dynar_foreach (route, i, link) {
xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL);
- //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
+ routing_platf->getRouteAndLatency(src, dst, &route, NULL);
return route;
}
xbt_dynar_t route = NULL;
- routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
+ routing_platf->getRouteAndLatency (action->p_srcElm, action->p_dstElm, &route, NULL);
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
return surf_min;
}
-void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
- xbt_dynar_t * route, double *latency){
- routing_platf->getRouteAndLatency(src, dst, route, latency);
-}
-
/*********
* MODEL *
*********/
XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free
// FIXME: make previous function private to routing again?
-
-XBT_PUBLIC(void) routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
- xbt_dynar_t * route, double *latency);
-
XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc);
/**
* Resource protected methods
*/
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());
+ 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;
if (p_hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL
&& strcmp(prev_dst_gw->getName(), e_route->gw_src->getName())) {
- routing_get_route_and_latency(prev_dst_gw, e_route->gw_src,
+ routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src,
&res->link_list, lat);
}
#include <string.h>
#include <math.h>
-
+#include "src/surf/network_interface.hpp"
#include "simgrid/simdag.h"
#include "xbt/log.h"
#include "xbt/dict.h"
,dst);
xbt_dynar_t route=NULL;
value2 = sg_host_by_name(dst)->pimpl_netcard;
- routing_get_route_and_latency(value1, value2, &route,NULL);
+ routing_platf->getRouteAndLatency(value1, value2, &route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
,dst);
xbt_dynar_t route=NULL;
value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
- routing_get_route_and_latency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
+ routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
,dst);
xbt_dynar_t route=NULL;
value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
- routing_get_route_and_latency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
+ routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
,src, dst);
xbt_dynar_t route=NULL;
value2 = sg_host_by_name(dst)->pimpl_netcard;
- routing_get_route_and_latency((sg_netcard_t)value1,(sg_netcard_t)value2,&route, NULL);
+ routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route, NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);