X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d5b327d0b5304bc0beaff6aae611dda6dac1b03..65ed12738b3113afdcb29e4c5fd177cbae2ac856:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 225a7e73d7..2ebad7ff7b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -16,17 +16,14 @@ 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, @@ -39,11 +36,12 @@ static link_CM02_t link_new(char *name, { 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, bandwidth_factor * bw_initial, - history, - state_initial,state_trace, - bw_initial,bw_trace); + 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); @@ -56,12 +54,13 @@ static link_CM02_t link_new(char *name, if (policy == SURF_LINK_FATPIPE) 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); return nw_link; } -static void parse_link_init(void) +static void net_parse_link_init(void) { char *name_link; double bw_initial; @@ -94,13 +93,13 @@ static void parse_link_init(void) 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; @@ -113,31 +112,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->lmm_resource.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->lmm_resource.power.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); @@ -148,20 +152,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, ((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) { @@ -175,17 +179,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; @@ -211,7 +222,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; @@ -244,18 +255,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) { @@ -266,17 +279,22 @@ static void update_resource_state(void *id, if (event_type == nw_link->lmm_resource.power.event) { double delta = - weight_S_parameter / value - weight_S_parameter / nw_link->lmm_resource.power.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->lmm_resource.power.current = value; - lmm_update_constraint_bound(network_maxmin_system, nw_link->lmm_resource.constraint, - bandwidth_factor * nw_link->lmm_resource.power.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)); + if (sg_weight_S_parameter > 0) { while ((var = lmm_get_var_from_cnst - (network_maxmin_system, nw_link->lmm_resource.constraint, &elem))) { + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { action = lmm_variable_id(var); action->weight += delta; if (!(action->suspended)) @@ -284,6 +302,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; @@ -292,7 +312,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->lmm_resource.constraint, &elem))) { + (network_maxmin_system, nw_link->lmm_resource.constraint, + &elem))) { action = lmm_variable_id(var); action->lat_current += delta; action->weight += delta; @@ -309,6 +330,8 @@ static void update_resource_state(void *id, action->weight); } + 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->lmm_resource.state_current = SURF_RESOURCE_ON; @@ -329,6 +352,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(); @@ -337,8 +362,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: @@ -357,38 +382,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) { + 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->lmm_resource.power.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) @@ -408,7 +439,7 @@ static surf_action_t communicate(const char *src_name, const char *dst_name,int action->rate); } - xbt_dynar_foreach(route,i,link) { + xbt_dynar_foreach(route, i, link) { lmm_expand(network_maxmin_system, link->lmm_resource.constraint, action->variable, 1.0); } @@ -420,22 +451,23 @@ static surf_action_t communicate(const char *src_name, const char *dst_name,int 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)->lmm_resource.power.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(((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, @@ -443,7 +475,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, @@ -454,23 +486,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; } @@ -480,36 +511,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_create(sizeof(link_CM02_t), - link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL)); + net_link_new(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, + NULL)); } /************************************************************************/ @@ -521,16 +554,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); } /***************************************************************************/ @@ -550,7 +583,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; @@ -563,15 +596,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); @@ -583,16 +616,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); @@ -603,33 +636,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