xbt_dict_t link_set = NULL;
xbt_dict_t network_card_set = NULL;
+double latency_factor = 1.0; /* default value */
+double bandwidth_factor = 1.0; /* default value */
+
+
int card_number = 0;
int host_number = 0;
link_CM02_t **routing_table = NULL;
nw_link->constraint =
lmm_constraint_new(network_maxmin_system, nw_link,
- nw_link->bw_current);
+ bandwidth_factor*nw_link->bw_current);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint,
- nw_link->bw_current);
+ bandwidth_factor*nw_link->bw_current);
} else if (event_type == nw_link->lat_event) {
double delta = value - nw_link->lat_current;
lmm_variable_t var = NULL;
/* LARGE PLATFORMS HACK:
Add src->link and dst->link latencies */
action->lat_current = action->latency;
+ action->latency *= latency_factor;
+
/* LARGE PLATFORMS HACK:
lmm_variable_new(..., total_route_size)*/
network_maxmin_system = lmm_system_new();
}
-/***************************************************************************/
-/* New TCP sharing model based on thesis experimantation and discussions. */
-/***************************************************************************/
+/************************************************************************/
+/* New model based on optimizations discussed during this thesis */
+/************************************************************************/
void surf_network_model_init_LegrandVelho(const char *filename)
{
+
if (surf_network_model)
return;
surf_network_model_init_internal();
xbt_dynar_push(model_list, &surf_network_model);
network_solve = lmm_solve;
+ latency_factor = 10.4;
+ bandwidth_factor = 0.92;
+
update_model_description(surf_network_model_description,
"LegrandVelho",
(surf_model_t) surf_network_model);
- INFO0("LegrandVelho Model was chosen!!");
}
/***************************************************************************/