summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0eefe3f)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5996
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
xbt_dict_t network_card_set = NULL;
double latency_factor = 1.0; /* default value */
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;
int card_number = 0;
int host_number = 0;
nw_link->constraint =
lmm_constraint_new(network_maxmin_system, nw_link,
nw_link->constraint =
lmm_constraint_new(network_maxmin_system, nw_link,
+ bandwidth_factor*nw_link->bw_current);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
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,
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint,
+ 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;
} else if (event_type == nw_link->lat_event) {
double delta = value - nw_link->lat_current;
lmm_variable_t var = NULL;
network_maxmin_system = lmm_system_new();
}
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)
{
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;
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;
+ bandwidth_factor = 0.92;
update_model_description(surf_network_model_description,
"LegrandVelho",
(surf_model_t) surf_network_model);
update_model_description(surf_network_model_description,
"LegrandVelho",
(surf_model_t) surf_network_model);
- INFO0("LegrandVelho Model was chosen!!");
}
/***************************************************************************/
}
/***************************************************************************/