if(size == 0) {
xbt_fifo_free(fifo);
xbt_dict_remove(gap_lookup, action->sender.link_name);
- size = xbt_dict_size(gap_lookup);
+ size = xbt_dict_length(gap_lookup);
if(size == 0) {
xbt_dict_free(&gap_lookup);
}
}
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
- xbt_dynar_t route = global_routing->get_route(action->src_name,
- action->dst_name);
+ xbt_dynar_t route = routing_get_route(action->src_name, action->dst_name);
link_CM02_t link;
unsigned int i;
xbt_dynar_foreach(route, i, link) {
xbt_dynar_t back_route = NULL;
int constraints_per_variable = 0;
xbt_dynar_t route;
- // I will need this route for some time so require for no cleanup
- global_routing->get_route_latency(src_name, dst_name, &route, &latency, 0);
+ // I need to have the forward and backward routes at the same time, so I don't ask the routing to cleanup the route right away for me
+ routing_get_route_and_latency(src_name, dst_name, &route, &latency, 0);
if (sg_network_fullduplex == 1) {
- back_route = global_routing->get_route(dst_name, src_name);
+ back_route = routing_get_route(dst_name, src_name);
}
/* LARGE PLATFORMS HACK:
XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
/* LARGE PLATFORMS HACK:
assert on total_route_size */
- xbt_assert(xbt_dynar_length(route) || latency,
+ xbt_assert(!xbt_dynar_is_empty(route) || latency,
"You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
src_name, dst_name);
(link->lmm_resource.power.peak * link->lmm_resource.power.scale);
if (bandwidth_bound < 0.0)
bandwidth_bound =
- (*bandwidth_factor_callback) (size) *
+ bandwidth_factor_callback(size) *
(link->lmm_resource.power.peak * link->lmm_resource.power.scale);
else
bandwidth_bound =
min(bandwidth_bound,
- (*bandwidth_factor_callback) (size) *
+ bandwidth_factor_callback(size) *
(link->lmm_resource.power.peak *
link->lmm_resource.power.scale));
}
/* LARGE PLATFORMS HACK:
Add src->link and dst->link latencies */
action->lat_current = action->latency;
- action->latency *= (*latency_factor_callback) (size);
+ action->latency *= latency_factor_callback(size);
action->rate =
- (*bandwidth_constraint_callback) (action->rate, bandwidth_bound,
+ bandwidth_constraint_callback(action->rate, bandwidth_bound,
size);
- if(xbt_dynar_length(route) > 0) {
+ if(!xbt_dynar_is_empty(route)) {
link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0);
gap_append(size, link, action);
XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)",
static xbt_dynar_t net_get_route(const char *src, const char *dst)
{
- return global_routing->get_route(src, dst);
+ return routing_get_route(src, dst);
}
static double net_get_link_bandwidth(const void *link)
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- global_routing->finalize();
-
lmm_system_free(network_maxmin_system);
network_maxmin_system = NULL;
}