static xbt_swag_t net_modified_set = NULL;
static xbt_heap_t net_action_heap = NULL;
-xbt_swag_t keep_track = NULL;
/* added to manage the communication action's heap */
static void net_action_update_index_heap(void *action, int i)
}
static void heap_remove(surf_action_network_CM02_t action){
- action->hat = NONE;
+ action->hat = NOTSET;
if(((surf_action_network_CM02_t) action)->index_heap >= 0){
xbt_heap_remove(net_action_heap,action->index_heap);
}
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
-static int net_get_link_latency_limited(surf_action_t action)
+int net_get_link_latency_limited(surf_action_t action)
{
return action->latency_limited;
}
XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(net_modified_set));
update_action_remaining(now);
- keep_track = net_modified_set;
lmm_solve(network_maxmin_system);
- keep_track = NULL;
XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(net_modified_set));
if(network_update_mechanism == UM_LAZY){
net_action_heap = xbt_heap_new(8,NULL);
xbt_heap_set_update_callback(net_action_heap, net_action_update_index_heap);
- net_modified_set =
- xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
+ net_modified_set = xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
+ network_maxmin_system->keep_track = net_modified_set;
}
}
xbt_dynar_push(model_list, &surf_network_model);
network_solve = lmm_solve;
- xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); // 13.01 when callibration is done without phase effects
- xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",0.92);// 0.97 when callibration is done without phase effects
- xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775); // 20537 when callibration is done without phase effects
+ xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 13.01);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",0.97);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 20537);
}
/***************************************************************************/