#define TO_FLOYD_PRED(i,j) (p_predecessorTable)[(i)+(j)*table_size]
#define TO_FLOYD_LINK(i,j) (p_linkTable)[(i)+(j)*table_size]
-AS_t model_floyd_create(void)
-{
- return new simgrid::surf::AsFloyd();
-}
-
-void model_floyd_end(AS_t current_routing)
-{
- static_cast<simgrid::surf::AsFloyd*>(current_routing)->end();
-}
-
namespace simgrid {
namespace surf {
int table_size;
table_size = (int)xbt_dynar_length(p_indexNetworkElm);
if (p_linkTable == NULL) // Dealing with a parse error in the file?
- return;
+ return;
/* Delete link_table */
for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++) {
- generic_free_route(TO_FLOYD_LINK(i, j));
- }
+ for (j = 0; j < table_size; j++) {
+ routing_route_free(TO_FLOYD_LINK(i, j));
+ }
xbt_free(p_linkTable);
/* Delete bypass dict */
xbt_dict_free(&p_bypassRoutes);
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);
}
route->gw_src->getName(), src, route->gw_dst->getName());
TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()) =
- newExtendedRoute(p_hierarchy, route, 0);
+ newExtendedRoute(p_hierarchy, route, 0);
TO_FLOYD_PRED(dst_net_elm->getId(), src_net_elm->getId()) = dst_net_elm->getId();
TO_FLOYD_COST(dst_net_elm->getId(), src_net_elm->getId()) =
((TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()))->link_list)->used; /* count of links, old model assume 1 */
xbt_dynar_free(&route->link_list);
}
-void AsFloyd::end(){
+void AsFloyd::Seal(){
unsigned int i, j, a, b, c;
/* set the size of table routing */