* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing_full.hpp"
-#include "network.hpp"
+#include "network_interface.hpp"
-extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
-}
/* Global vars */
extern routing_platf_t routing_platf;
void model_full_end(AS_t _routing)
{
- unsigned int i;
+ int i;
sg_platf_route_cbarg_t e_route;
/* set utils vars */
AsFullPtr routing = ((AsFullPtr) _routing);
- size_t table_size = xbt_dynar_length(routing->p_indexNetworkElm);
+ int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
/* Create table if necessary */
if (!routing->p_routingTable)
}
AsFull::~AsFull(){
- size_t table_size = xbt_dynar_length(p_indexNetworkElm);
+ int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
int i, j;
/* Delete routing table */
for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++)
- delete TO_ROUTE_FULL(i,j);
+ for (j = 0; j < table_size; j++) {
+ if (TO_ROUTE_FULL(i,j)){
+ xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list);
+ xbt_free(TO_ROUTE_FULL(i,j));
+ }
+ }
xbt_free(p_routingTable);
}
xbt_dynar_foreach(e_route->link_list, cpt, link) {
xbt_dynar_push(res->link_list, &link);
if (lat)
- *lat += dynamic_cast<NetworkCm02LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
}
}
}