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);
static int action_free(surf_action_t action)
{
- action->using--;
- if (!action->using) {
+ action->refcount --;
+ if (!action->refcount ) {
xbt_swag_remove(action, action->state_set);
if (((surf_action_network_CM02_t) action)->variable)
lmm_variable_free(network_maxmin_system,
static void action_use(surf_action_t action)
{
- action->using++;
+ action->refcount ++;
}
static void action_cancel(surf_action_t action)
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;
if (!(action->suspended))
lmm_update_variable_weight(network_maxmin_system, action->variable,
action->lat_current);
- lmm_update_variable_latency(network_maxmin_system, action->variable,
- delta);
+
}
} else if (event_type == nw_link->state_event) {
if (value > 0)
action = xbt_new0(s_surf_action_network_CM02_t, 1);
- action->generic_action.using = 1;
+ action->generic_action.refcount = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
/* 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)*/
lmm_update_variable_bound(network_maxmin_system, action->variable,
action->rate);
}
- lmm_update_variable_latency(network_maxmin_system, action->variable,
- action->latency);
for (i = 0; i < route_size; i++)
lmm_expand(network_maxmin_system, route[i]->constraint,
return ((link_CM02_t) link)->lat_current;
}
+static int link_shared(const void *link)
+{
+ return lmm_constraint_is_shared(((link_CM02_t) link)->constraint);
+}
+
static xbt_dict_t get_properties(void *link)
{
return ((link_CM02_t) link)->properties;
get_link_bandwidth;
surf_network_model->extension_public->get_link_latency =
get_link_latency;
+ surf_network_model->extension_public->link_shared =
+ link_shared;
surf_network_model->common_public->get_properties = get_properties;
network_maxmin_system = lmm_system_new();
}
+/************************************************************************/
+/* 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();
+ define_callbacks(filename);
+ 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);
+}
+
/***************************************************************************/
/* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
/***************************************************************************/
}
#ifdef HAVE_SDP
-void surf_network_model_init_SDP(const char *filename)
+ void surf_network_model_init_SDP(const char *filename)
{
if (surf_network_model)
return;
(surf_model_t) surf_network_model);
}
#endif
-
-#ifdef HAVE_GTNETS
-void surf_network_model_init_GTNETS(const char *filename)
-{
- if (surf_network_model)
- return;
- surf_network_model_init_internal();
- define_callbacks(filename);
- xbt_dynar_push(model_list, &surf_network_model);
-
- update_model_description(surf_network_model_description,
- "GTNets",
- (surf_model_t) surf_network_model);
-}
-#endif