X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c8772e246f9958e172ada583011fcee1bf58a93..69b85c9e1af02bcf07222b50ffbe83781b6027b2:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 6a6984bebc..8a9c9cef29 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -16,83 +16,77 @@ surf_model_t surf_network_model = NULL; static lmm_system_t network_maxmin_system = NULL; static void (*network_solve) (lmm_system_t) = NULL; -double latency_factor = 1.0; /* default value */ -double bandwidth_factor = 1.0; /* default value */ -double weight_S_parameter = 0.0; /* default value */ +double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ +double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ +double sg_weight_S_parameter = 0.0;/* default value; can be set by model or from command line */ -int card_number = 0; -int host_count = 0; double sg_tcp_gamma = 0.0; - -static link_CM02_t link_new(char *name, +static link_CM02_t net_link_new(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, tmgr_trace_t lat_trace, - e_surf_link_state_t + e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) { - link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1); + link_CM02_t nw_link = (link_CM02_t) + surf_resource_lmm_new(sizeof(s_link_CM02_t), + surf_network_model, name, properties, + network_maxmin_system, + sg_bandwidth_factor * bw_initial, + history, + state_initial, state_trace, + bw_initial, bw_trace); + xbt_assert1(!xbt_dict_get_or_null(surf_network_model->resource_set, name), "Link '%s' declared several times in the platform file.", name); - nw_link->generic_resource.model = surf_network_model; - nw_link->generic_resource.name = name; - current_property_set = nw_link->generic_resource.properties = properties; - nw_link->bw_current = bw_initial; - if (bw_trace) - nw_link->bw_event = - tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); nw_link->lat_current = lat_initial; if (lat_trace) nw_link->lat_event = tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); - nw_link->state_current = state_initial; - if (state_trace) - nw_link->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, 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); + lmm_constraint_shared(nw_link->lmm_resource.constraint); - xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free); + xbt_dict_set(surf_network_model->resource_set, name, nw_link, + surf_resource_free); +#ifdef HAVE_TRACING + TRACE_surf_link_declaration (name, bw_initial, lat_initial); +#endif return nw_link; } -static void parse_link_init(void) +static void net_parse_link_init(void) { char *name_link; double bw_initial; tmgr_trace_t bw_trace; double lat_initial; tmgr_trace_t lat_trace; - e_surf_link_state_t state_initial_link = SURF_LINK_ON; + e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON; e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; tmgr_trace_t state_trace; name_link = xbt_strdup(A_surfxml_link_id); surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); + bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); surf_parse_get_double(&lat_initial, A_surfxml_link_latency); - surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); + lat_trace = tmgr_trace_new(A_surfxml_link_latency_file); xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON) || (A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state"); if (A_surfxml_link_state == A_surfxml_link_state_ON) - state_initial_link = SURF_LINK_ON; + state_initial_link = SURF_RESOURCE_ON; else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_LINK_OFF; + state_initial_link = SURF_RESOURCE_OFF; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) policy_initial_link = SURF_LINK_SHARED; @@ -100,15 +94,15 @@ static void parse_link_init(void) A_surfxml_link_sharing_policy_FATPIPE) policy_initial_link = SURF_LINK_FATPIPE; - surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + state_trace = tmgr_trace_new(A_surfxml_link_state_file); - link_new(name_link, bw_initial, bw_trace, + net_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); } -static void add_traces(void) +static void net_add_traces(void) { xbt_dict_cursor_t cursor = NULL; char *trace_name, *elm; @@ -121,31 +115,36 @@ static void add_traces(void) /* connect all traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm); + link_CM02_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); - link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->lmm_resource.state_event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm); + link_CM02_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); xbt_assert2(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); - link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->lmm_resource.power.event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - link_CM02_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm); + link_CM02_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -156,20 +155,20 @@ static void add_traces(void) } } -static void define_callbacks(const char *file) +static void net_define_callbacks(const char *file) { /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces); + surfxml_add_callback(STag_surfxml_link_cb_list, &net_parse_link_init); + surfxml_add_callback(ETag_surfxml_platform_cb_list, &net_add_traces); } -static int resource_used(void *resource_id) +static int net_resource_used(void *resource_id) { return lmm_constraint_used(network_maxmin_system, - ((link_CM02_t) resource_id)->constraint); + ((surf_resource_lmm_t) resource_id)->constraint); } -static int action_unref(surf_action_t action) +static int net_action_unref(surf_action_t action) { action->refcount--; if (!action->refcount) { @@ -183,17 +182,24 @@ static int action_unref(surf_action_t action) return 0; } -static void action_cancel(surf_action_t action) +static void net_action_cancel(surf_action_t action) { + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_FAILED); return; } -static void action_recycle(surf_action_t action) +static void net_action_recycle(surf_action_t action) { return; } -static double share_resources(double now) +static double net_action_get_remains(surf_action_t action) +{ + return action->remains; +} + +static double net_share_resources(double now) { s_surf_action_network_CM02_t s_action; surf_action_network_CM02_t action = NULL; @@ -219,7 +225,7 @@ static double share_resources(double now) return min; } -static void update_actions_state(double now, double delta) +static void net_update_actions_state(double now, double delta) { double deltap = 0.0; surf_action_network_CM02_t action = NULL; @@ -231,6 +237,17 @@ static void update_actions_state(double now, double delta) */ xbt_swag_foreach_safe(action, next_action, running_actions) { + +#ifdef HAVE_TRACING + xbt_dynar_t route = used_routing->get_route(action->src, action->dst); + link_CM02_t link; + unsigned int i; + xbt_dynar_foreach(route, i, link) { + TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name, + action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta); + } +#endif + deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { @@ -252,18 +269,20 @@ static void update_actions_state(double now, double delta) if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable) > 0)) { action->generic_action.finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); - } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && - (action->generic_action.max_duration <= 0)) { + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); + } else if ((action->generic_action.max_duration != NO_MAX_DURATION) + && (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); - surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); + surf_network_model->action_state_set((surf_action_t) action, + SURF_ACTION_DONE); } } return; } -static void update_resource_state(void *id, +static void net_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { @@ -272,19 +291,27 @@ static void update_resource_state(void *id, /* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */ /* value, event_type); */ - if (event_type == nw_link->bw_event) { + if (event_type == nw_link->lmm_resource.power.event) { double delta = - weight_S_parameter / value - weight_S_parameter / nw_link->bw_current; + sg_weight_S_parameter / value - sg_weight_S_parameter / + (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale); lmm_variable_t var = NULL; lmm_element_t elem = NULL; surf_action_network_CM02_t action = NULL; - nw_link->bw_current = value; - lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint, - bandwidth_factor * nw_link->bw_current); - if (weight_S_parameter > 0) { + nw_link->lmm_resource.power.peak = value; + lmm_update_constraint_bound(network_maxmin_system, + nw_link->lmm_resource.constraint, + sg_bandwidth_factor * + (nw_link->lmm_resource.power.peak * + nw_link->lmm_resource.power.scale)); +#ifdef HAVE_TRACING + TRACE_surf_link_set_bandwidth (date, nw_link->lmm_resource.generic_resource.name, sg_bandwidth_factor * (nw_link->lmm_resource.power.peak * nw_link->lmm_resource.power.scale)); +#endif + if (sg_weight_S_parameter > 0) { while ((var = lmm_get_var_from_cnst - (network_maxmin_system, nw_link->constraint, &elem))) { + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { action = lmm_variable_id(var); action->weight += delta; if (!(action->suspended)) @@ -292,6 +319,8 @@ static void update_resource_state(void *id, action->weight); } } + if (tmgr_trace_event_free(event_type)) + nw_link->lmm_resource.power.event = NULL; } else if (event_type == nw_link->lat_event) { double delta = value - nw_link->lat_current; lmm_variable_t var = NULL; @@ -300,7 +329,8 @@ static void update_resource_state(void *id, nw_link->lat_current = value; while ((var = lmm_get_var_from_cnst - (network_maxmin_system, nw_link->constraint, &elem))) { + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { action = lmm_variable_id(var); action->lat_current += delta; action->weight += delta; @@ -317,15 +347,17 @@ static void update_resource_state(void *id, action->weight); } - } else if (event_type == nw_link->state_event) { + if (tmgr_trace_event_free(event_type)) + nw_link->lat_event = NULL; + } else if (event_type == nw_link->lmm_resource.state_event) { if (value > 0) - nw_link->state_current = SURF_LINK_ON; + nw_link->lmm_resource.state_current = SURF_RESOURCE_ON; else { - lmm_constraint_t cnst = nw_link->constraint; + lmm_constraint_t cnst = nw_link->lmm_resource.constraint; lmm_variable_t var = NULL; lmm_element_t elem = NULL; - nw_link->state_current = SURF_LINK_OFF; + nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF; while ((var = lmm_get_var_from_cnst (network_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); @@ -337,6 +369,8 @@ static void update_resource_state(void *id, } } } + if (tmgr_trace_event_free(event_type)) + nw_link->lmm_resource.state_event = NULL; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -345,8 +379,8 @@ static void update_resource_state(void *id, return; } -static surf_action_t communicate(const char *src_name, const char *dst_name,int src, int dst, double size, - double rate) +static surf_action_t net_communicate(const char *src_name, const char *dst_name, + int src, int dst, double size, double rate) { surf_action_network_CM02_t action = NULL; /* LARGE PLATFORMS HACK: @@ -365,38 +399,44 @@ static surf_action_t communicate(const char *src_name, const char *dst_name,int src_name, dst_name); link_CM02_t link; - int failed=0; - xbt_dynar_foreach(route,i,link) { - if (link->state_current == SURF_LINK_OFF) { + int failed = 0; + xbt_dynar_foreach(route, i, link) { + if (link->lmm_resource.state_current == SURF_RESOURCE_OFF) { failed = 1; break; } } - action = surf_action_new(sizeof(s_surf_action_network_CM02_t),size,surf_network_model,failed); + action = + surf_action_new(sizeof(s_surf_action_network_CM02_t), size, + surf_network_model, failed); xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; action->latency = 0.0; action->weight = 0.0; - xbt_dynar_foreach(route,i,link) { + xbt_dynar_foreach(route, i, link) { action->latency += link->lat_current; action->weight += - link->lat_current + weight_S_parameter / link->bw_current; + link->lat_current + + sg_weight_S_parameter / + (link->lmm_resource.power.peak * link->lmm_resource.power.scale); } /* LARGE PLATFORMS HACK: Add src->link and dst->link latencies */ action->lat_current = action->latency; - action->latency *= latency_factor; + action->latency *= sg_latency_factor; /* LARGE PLATFORMS HACK: lmm_variable_new(..., total_route_size) */ if (action->latency > 0) action->variable = - lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, xbt_dynar_length(route)); + lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, + xbt_dynar_length(route)); else action->variable = - lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, xbt_dynar_length(route)); + lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, + xbt_dynar_length(route)); if (action->rate < 0) { if (action->lat_current > 0) @@ -416,34 +456,39 @@ static surf_action_t communicate(const char *src_name, const char *dst_name,int action->rate); } - xbt_dynar_foreach(route,i,link) { - lmm_expand(network_maxmin_system, link->constraint, + xbt_dynar_foreach(route, i, link) { + lmm_expand(network_maxmin_system, link->lmm_resource.constraint, action->variable, 1.0); } /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ + /* saving the src and dst of this communication */ + action->src = src; + action->dst = dst; + XBT_OUT; return (surf_action_t) action; } -static double get_link_bandwidth(const void *link) +static double net_get_link_bandwidth(const void *link) { - return ((link_CM02_t) link)->bw_current; + surf_resource_lmm_t lmm = (surf_resource_lmm_t) link; + return lmm->power.peak * lmm->power.scale; } -static double get_link_latency(const void *link) +static double net_get_link_latency(const void *link) { return ((link_CM02_t) link)->lat_current; } -static int link_shared(const void *link) +static int net_link_shared(const void *link) { - return lmm_constraint_is_shared(((link_CM02_t) link)->constraint); + return lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint); } -static void action_suspend(surf_action_t action) +static void net_action_suspend(surf_action_t action) { ((surf_action_network_CM02_t) action)->suspended = 1; lmm_update_variable_weight(network_maxmin_system, @@ -451,7 +496,7 @@ static void action_suspend(surf_action_t action) 0.0); } -static void action_resume(surf_action_t action) +static void net_action_resume(surf_action_t action) { if (((surf_action_network_CM02_t) action)->suspended) { lmm_update_variable_weight(network_maxmin_system, @@ -462,23 +507,22 @@ static void action_resume(surf_action_t action) } } -static int action_is_suspended(surf_action_t action) +static int net_action_is_suspended(surf_action_t action) { return ((surf_action_network_CM02_t) action)->suspended; } -static void action_set_max_duration(surf_action_t action, double duration) +static void net_action_set_max_duration(surf_action_t action, double duration) { action->max_duration = duration; } -static void finalize(void) +static void net_finalize(void) { surf_model_exit(surf_network_model); surf_network_model = NULL; used_routing->finalize(); - host_count = 0; lmm_system_free(network_maxmin_system); network_maxmin_system = NULL; } @@ -488,36 +532,38 @@ static void surf_network_model_init_internal(void) surf_network_model = surf_model_init(); surf_network_model->name = "network"; - surf_network_model->action_unref = action_unref; - surf_network_model->action_cancel = action_cancel; - surf_network_model->action_recycle = action_recycle; + surf_network_model->action_unref = net_action_unref; + surf_network_model->action_cancel = net_action_cancel; + surf_network_model->action_recycle = net_action_recycle; + surf_network_model->get_remains = net_action_get_remains; - surf_network_model->model_private->resource_used = resource_used; - surf_network_model->model_private->share_resources = share_resources; + surf_network_model->model_private->resource_used = net_resource_used; + surf_network_model->model_private->share_resources = net_share_resources; surf_network_model->model_private->update_actions_state = - update_actions_state; + net_update_actions_state; surf_network_model->model_private->update_resource_state = - update_resource_state; - surf_network_model->model_private->finalize = finalize; + net_update_resource_state; + surf_network_model->model_private->finalize = net_finalize; - surf_network_model->suspend = action_suspend; - surf_network_model->resume = action_resume; - surf_network_model->is_suspended = action_is_suspended; - surf_cpu_model->set_max_duration = action_set_max_duration; + surf_network_model->suspend = net_action_suspend; + surf_network_model->resume = net_action_resume; + surf_network_model->is_suspended = net_action_is_suspended; + surf_cpu_model->set_max_duration = net_action_set_max_duration; - surf_network_model->extension.network.communicate = communicate; + surf_network_model->extension.network.communicate = net_communicate; surf_network_model->extension.network.get_link_bandwidth = - get_link_bandwidth; - surf_network_model->extension.network.get_link_latency = get_link_latency; - surf_network_model->extension.network.link_shared = link_shared; + net_get_link_bandwidth; + surf_network_model->extension.network.get_link_latency = net_get_link_latency; + surf_network_model->extension.network.link_shared = net_link_shared; if (!network_maxmin_system) network_maxmin_system = lmm_system_new(); - routing_model_full_create(sizeof(link_CM02_t), - link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_LINK_ON, NULL, SURF_LINK_FATPIPE, NULL)); + routing_model_create(sizeof(link_CM02_t), + net_link_new(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, + NULL)); } /************************************************************************/ @@ -529,16 +575,16 @@ void surf_network_model_init_LegrandVelho(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; - latency_factor = 10.4; - bandwidth_factor = 0.92; - weight_S_parameter = 8775; + xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor",10.4); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); update_model_description(surf_network_model_description, - "LegrandVelho", surf_network_model); + "LV08", surf_network_model); } /***************************************************************************/ @@ -558,7 +604,7 @@ void surf_network_model_init_CM02(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; @@ -571,15 +617,15 @@ void surf_network_model_init_Reno(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); network_solve = lagrange_solve; - latency_factor = 10.4; - bandwidth_factor = 0.92; - weight_S_parameter = 8775; + xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); update_model_description(surf_network_model_description, "Reno", surf_network_model); @@ -591,16 +637,16 @@ void surf_network_model_init_Reno2(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); network_solve = lagrange_solve; - latency_factor = 10.4; - bandwidth_factor = 0.92; - weight_S_parameter = 8775; + xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S_parameter", 8775); update_model_description(surf_network_model_description, "Reno2", surf_network_model); @@ -611,33 +657,17 @@ void surf_network_model_init_Vegas(const char *filename) if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); network_solve = lagrange_solve; - latency_factor = 10.4; - bandwidth_factor = 0.92; - weight_S_parameter = 8775; + xbt_cfg_setdefault_double(_surf_cfg_set,"network/latency_factor", 10.4); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_surf_cfg_set,"network/weight_S", 8775); update_model_description(surf_network_model_description, "Vegas", surf_network_model); } - -#ifdef HAVE_SDP -void surf_network_model_init_SDP(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 = sdp_solve; - - update_model_description(surf_network_model_description, - "SDP", surf_network_model); -} -#endif