* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing.hpp"
-#include "surf_routing_private.hpp"
#include "surf_routing_cluster.hpp"
-#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"
#include "src/surf/surf_routing_cluster_torus.hpp"
#include "src/surf/surf_routing_cluster_fat_tree.hpp"
#include "src/surf/surf_routing_floyd.hpp"
#include "src/surf/surf_routing_full.hpp"
#include "src/surf/surf_routing_vivaldi.hpp"
-#include <surf/surfxml_parse.h> // FIXME: move that back to the parsing area
+#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
#include <vector>
char *route_name = bprintf("%s#%s", src->name(), dst->name());
if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) {
bypassedRoute = bypassRoutes_->at(route_name);
- XBT_DEBUG("Found a bypass route with %ld links",bypassedRoute->size());
+ XBT_DEBUG("Found a bypass route with %zu links",bypassedRoute->size());
}
free(route_name);
return bypassedRoute;
}
s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
memset(&host, 0, sizeof(host));
- host.initiallyOn = 1;
host.pstate = 0;
- host.speed_scale = 1.0;
host.core_amount = 1;
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link, 0, sizeof(link));
- link.initiallyOn = 1;
link.policy = SURF_LINK_FULLDUPLEX;
link.latency = cabinet->lat;
link.bandwidth = cabinet->bw;
char *router_id = NULL;
XBT_DEBUG(" ");
- host_id = HOST_PEER(peer->id);
- link_id = LINK_PEER(peer->id);
- router_id = ROUTER_PEER(peer->id);
+ host_id = bprintf("peer_%s", peer->id);
+ link_id = bprintf("link_%s", peer->id);
+ router_id = bprintf("router_%s", peer->id);
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->speed);
s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
memset(&host, 0, sizeof(host));
- host.initiallyOn = 1;
host.id = host_id;
host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
xbt_dynar_push(host.speed_peak,&peer->speed);
host.pstate = 0;
//host.power_peak = peer->power;
- host.speed_scale = 1.0;
host.speed_trace = peer->availability_trace;
host.state_trace = peer->state_trace;
host.core_amount = 1;
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link, 0, sizeof(link));
- link.initiallyOn = 1;
link.policy = SURF_LINK_SHARED;
link.latency = peer->lat;