#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"
/*************
namespace simgrid {
namespace surf {
-simgrid::xbt::signal<void(simgrid::surf::NetCard*)> routingEdgeCreatedCallbacks;
+simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
}
sg_host_t h = sg_host_by_name(name);
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;
}
sg_host_t h = sg_host_by_name_or_create(host->id);
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);
/* 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);
}
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),
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){
* 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) {
+ if (NULL == *route) {
xbt_dynar_reset(routing_platf->p_lastRoute);
*route = routing_platf->p_lastRoute;
}
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();
}
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);
}