surf_action_lmm_heap_remove(net_action_heap,(surf_action_lmm_t) action);
xbt_swag_remove(action, net_modified_set);
}
+#ifdef HAVE_TRACING
+ if (action->category) xbt_free (action->category);
+#endif
surf_action_free(&action);
return 1;
}
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+ lmm_get_cnst_weight_from_var(network_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable,
+ i)),
now - delta,
delta);
}
link_CM02_t link = lmm_constraint_id(constraint);
TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
((surf_action_t)action)->category,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+ lmm_get_cnst_weight_from_var(network_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable,
+ i)),
GENERIC_LMM_ACTION(action).last_update,
now - GENERIC_LMM_ACTION(action).last_update);
}
}
-static surf_action_t net_communicate(network_element_t src,
- network_element_t dst,
+static surf_action_t net_communicate(sg_routing_edge_t src,
+ sg_routing_edge_t dst,
double size, double rate)
{
unsigned int i;
xbt_dynar_t back_route = NULL;
int constraints_per_variable = 0;
- xbt_dynar_t route = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_t route = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
XBT_IN("(%s,%s,%g,%g)", src->name, dst->name, size, rate);
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new(net_selective_update);
- routing_model_create(sizeof(link_CM02_t),
- net_create_resource("__loopback__",
+ routing_model_create(net_create_resource("__loopback__",
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL));