X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6230a479ed334a1e4e27ec9783c280c6ae70ae51..973f33d7adc7e95c773f7a9e73f281503385f69b:/src/surf/network_im.c diff --git a/src/surf/network_im.c b/src/surf/network_im.c index ca20efbc27..b5ba6253f1 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -72,8 +72,8 @@ typedef struct network_link_CM02_im { extern surf_model_t surf_network_model; -static lmm_system_t network_maxmin_system = NULL; -static void (*network_solve) (lmm_system_t) = NULL; +static lmm_system_t network_im_maxmin_system = NULL; +static void (*network_im_solve) (lmm_system_t) = NULL; extern double sg_latency_factor; extern double sg_bandwidth_factor; @@ -142,11 +142,11 @@ static double im_constant_bandwidth_constraint(double rate, double bound, } -static double (*latency_factor_callback) (double) = +static double (*im_latency_factor_callback) (double) = &im_constant_latency_factor; -static double (*bandwidth_factor_callback) (double) = +static double (*im_bandwidth_factor_callback) (double) = &im_constant_bandwidth_factor; -static double (*bandwidth_constraint_callback) (double, double, double) = +static double (*im_bandwidth_constraint_callback) (double, double, double) = &im_constant_bandwidth_constraint; @@ -164,14 +164,13 @@ static link_CM02_im_t im_net_link_new(char *name, link_CM02_im_t nw_link = (link_CM02_im_t) surf_resource_lmm_new(sizeof(s_link_CM02_im_t), surf_network_model, name, properties, - network_maxmin_system, + network_im_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), + xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), "Link '%s' declared several times in the platform file.", name); @@ -183,8 +182,7 @@ static link_CM02_im_t im_net_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_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; @@ -200,14 +198,14 @@ static void im_net_parse_link_init(void) 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; - DEBUG0("link_CM02_im"); + XBT_DEBUG("link_CM02_im"); name_link = xbt_strdup(A_surfxml_link_id); surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); surf_parse_get_double(&lat_initial, A_surfxml_link_latency); lat_trace = tmgr_trace_new(A_surfxml_link_latency_file); - xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON) + xbt_assert((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) @@ -275,11 +273,11 @@ static void im_net_add_traces(void) 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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -290,11 +288,11 @@ static void im_net_add_traces(void) 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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -305,11 +303,11 @@ static void im_net_add_traces(void) 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_im_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined", + xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); - xbt_assert2(trace, + xbt_assert(trace, "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); @@ -326,7 +324,7 @@ static void im_net_define_callbacks(const char *file) static int im_net_resource_used(void *resource_id) { - return lmm_constraint_used(network_maxmin_system, + return lmm_constraint_used(network_im_maxmin_system, ((surf_resource_lmm_t) resource_id)->constraint); } @@ -337,7 +335,7 @@ static int im_net_action_unref(surf_action_t action) if (!action->refcount) { xbt_swag_remove(action, action->state_set); if (((surf_action_network_CM02_im_t) action)->variable){ - lmm_variable_free(network_maxmin_system, + lmm_variable_free(network_im_maxmin_system, ((surf_action_network_CM02_im_t) action)->variable); } // remove action from the heap @@ -350,8 +348,7 @@ static int im_net_action_unref(surf_action_t action) if (action->category) xbt_free(action->category); #endif - free(action); - action = NULL; + surf_action_free(&action); return 1; } return 0; @@ -429,12 +426,12 @@ static double im_net_share_resources(double now) double min=-1; double value; - DEBUG1("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); + XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); update_action_remaining(now); - lmm_solve(network_maxmin_system); + lmm_solve(network_im_maxmin_system); - DEBUG1("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); + XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set)); xbt_swag_foreach(action, im_net_modified_set) { if (GENERIC_ACTION(action).state_set != surf_network_model->states.running_action_set){ @@ -466,7 +463,7 @@ static double im_net_share_resources(double now) GENERIC_ACTION(action).max_duration; } - DEBUG4("Action(%p) Start %lf Finish %lf Max_duration %lf", action, + XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, GENERIC_ACTION(action).start, now + value, GENERIC_ACTION(action).max_duration); @@ -478,7 +475,7 @@ static double im_net_share_resources(double now) if (min != -1) { heap_insert((surf_action_network_CM02_im_t) action, min, NORMAL); - DEBUG3("Insert at heap action(%p) min %lf now %lf", action, min, now); + XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, now); } } @@ -489,7 +486,7 @@ static double im_net_share_resources(double now) min = -1; } - DEBUG1("The minimum with the HEAP %lf", min); + XBT_DEBUG("The minimum with the HEAP %lf", min); return min; @@ -502,17 +499,17 @@ static void im_net_update_actions_state(double now, double delta) while ((xbt_heap_size(im_net_action_heap) > 0) && (double_equals(xbt_heap_maxkey(im_net_action_heap), now))) { action = xbt_heap_pop(im_net_action_heap); - DEBUG1("Action %p: finish", action); + XBT_DEBUG("Action %p: finish", action); GENERIC_ACTION(action).finish = surf_get_clock(); // if I am wearing a latency heat if( action->hat == LATENCY){ - lmm_update_variable_weight(network_maxmin_system, action->variable, + lmm_update_variable_weight(network_im_maxmin_system, action->variable, action->weight); heap_remove(action); action->last_update = surf_get_clock(); - DEBUG1("Action (%p) is not limited by latency anymore", action); + XBT_DEBUG("Action (%p) is not limited by latency anymore", action); #ifdef HAVE_LATENCY_BOUND_TRACKING GENERIC_ACTION(action).latency_limited = 0; #endif @@ -550,7 +547,7 @@ static void im_net_update_resource_state(void *id, surf_action_network_CM02_im_t action = NULL; nw_link->lmm_resource.power.peak = value; - lmm_update_constraint_bound(network_maxmin_system, + lmm_update_constraint_bound(network_im_maxmin_system, nw_link->lmm_resource.constraint, sg_bandwidth_factor * (nw_link->lmm_resource.power.peak * @@ -563,12 +560,12 @@ static void im_net_update_resource_state(void *id, #endif if (sg_weight_S_parameter > 0) { while ((var = lmm_get_var_from_cnst - (network_maxmin_system, nw_link->lmm_resource.constraint, + (network_im_maxmin_system, nw_link->lmm_resource.constraint, &elem))) { action = lmm_variable_id(var); action->weight += delta; if (!(action->suspended)) - lmm_update_variable_weight(network_maxmin_system, + lmm_update_variable_weight(network_im_maxmin_system, action->variable, action->weight); } } @@ -582,30 +579,30 @@ static void im_net_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, + (network_im_maxmin_system, nw_link->lmm_resource.constraint, &elem))) { action = lmm_variable_id(var); action->lat_current += delta; action->weight += delta; if (action->rate < 0) - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, sg_tcp_gamma / (2.0 * action->lat_current)); else { - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, min(action->rate, sg_tcp_gamma / (2.0 * action->lat_current))); if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) { - INFO0("Flow is limited BYBANDWIDTH"); + XBT_INFO("Flow is limited BYBANDWIDTH"); } else { - INFO1("Flow is limited BYLATENCY, latency of flow is %f", + XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current); } } if (!(action->suspended)) - lmm_update_variable_weight(network_maxmin_system, action->variable, + lmm_update_variable_weight(network_im_maxmin_system, action->variable, action->weight); } @@ -621,7 +618,7 @@ static void im_net_update_resource_state(void *id, nw_link->lmm_resource.state_current = SURF_RESOURCE_OFF; while ((var = lmm_get_var_from_cnst - (network_maxmin_system, cnst, &elem))) { + (network_im_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); if (surf_action_state_get(action) == SURF_ACTION_RUNNING || @@ -634,11 +631,11 @@ static void im_net_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_CRITICAL("Unknown event ! \n"); xbt_abort(); } - DEBUG1("There were a resource state event, need to update actions related to the constraint (%p)", nw_link->lmm_resource.constraint); + XBT_DEBUG("There were a resource state event, need to update actions related to the constraint (%p)", nw_link->lmm_resource.constraint); return; } @@ -669,10 +666,10 @@ static surf_action_t im_net_communicate(const char *src_name, /* LARGE PLATFORMS HACK: total_route_size = route_size + src->link_nb + dst->nb */ - XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate); + XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); /* LARGE PLATFORMS HACK: assert on total_route_size */ - xbt_assert2(xbt_dynar_length(route), + xbt_assert(xbt_dynar_length(route), "You're trying to send data from %s to %s but there is no connection between these two hosts.", src_name, dst_name); @@ -707,21 +704,21 @@ static surf_action_t im_net_communicate(const char *src_name, (link->lmm_resource.power.peak * link->lmm_resource.power.scale); if (bandwidth_bound < 0.0) bandwidth_bound = - (*bandwidth_factor_callback) (size) * + (*im_bandwidth_factor_callback) (size) * (link->lmm_resource.power.peak * link->lmm_resource.power.scale); else bandwidth_bound = min(bandwidth_bound, - (*bandwidth_factor_callback) (size) * + (*im_bandwidth_factor_callback) (size) * (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_callback) (size); + action->latency *= (*im_latency_factor_callback) (size); action->rate = - (*bandwidth_constraint_callback) (action->rate, bandwidth_bound, + (*im_bandwidth_constraint_callback) (action->rate, bandwidth_bound, size); /* LARGE PLATFORMS HACK: @@ -735,10 +732,10 @@ static surf_action_t im_net_communicate(const char *src_name, if (action->latency > 0){ action->variable = - lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, + lmm_variable_new(network_im_maxmin_system, action, 0.0, -1.0, constraints_per_variable); // add to the heap the event when the latency is payed - DEBUG2("Added action (%p) one latency event at date %f", action, action->latency + action->last_update); + XBT_DEBUG("Added action (%p) one latency event at date %f", action, action->latency + action->last_update); heap_insert(action, action->latency + action->last_update, LATENCY); #ifdef HAVE_LATENCY_BOUND_TRACKING (action->generic_action).latency_limited = 1; @@ -746,37 +743,37 @@ static surf_action_t im_net_communicate(const char *src_name, } else action->variable = - lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, + lmm_variable_new(network_im_maxmin_system, action, 1.0, -1.0, constraints_per_variable); if (action->rate < 0) { if (action->lat_current > 0) - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, sg_tcp_gamma / (2.0 * action->lat_current)); else - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, -1.0); } else { if (action->lat_current > 0) - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, min(action->rate, sg_tcp_gamma / (2.0 * action->lat_current))); else - lmm_update_variable_bound(network_maxmin_system, action->variable, + lmm_update_variable_bound(network_im_maxmin_system, action->variable, action->rate); } xbt_dynar_foreach(route, i, link) { - lmm_expand(network_maxmin_system, link->lmm_resource.constraint, + lmm_expand(network_im_maxmin_system, link->lmm_resource.constraint, action->variable, 1.0); } if (sg_network_fullduplex == 1) { - DEBUG1("Fullduplex active adding backward flow using 5%c", '%'); + XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%'); xbt_dynar_foreach(back_route, i, link) { - lmm_expand(network_maxmin_system, link->lmm_resource.constraint, + lmm_expand(network_im_maxmin_system, link->lmm_resource.constraint, action->variable, .05); } } @@ -784,15 +781,16 @@ static surf_action_t im_net_communicate(const char *src_name, /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ #ifdef HAVE_TRACING - action->src_name = xbt_new(char, strlen(src_name) + 1); - strncpy(action->src_name, src_name, strlen(src_name) + 1); - - action->dst_name = xbt_new(char, strlen(dst_name) + 1); - strncpy(action->dst_name, dst_name, strlen(dst_name) + 1); + if (TRACE_is_enabled()) { + action->src_name = xbt_strdup(src_name); + action->dst_name = xbt_strdup(dst_name); + } else { + action->src_name = action->dst_name = NULL; + } #endif xbt_dynar_free(&route); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } @@ -822,7 +820,7 @@ static int im_net_link_shared(const void *link) static void im_net_action_suspend(surf_action_t action) { ((surf_action_network_CM02_im_t) action)->suspended = 1; - lmm_update_variable_weight(network_maxmin_system, + lmm_update_variable_weight(network_im_maxmin_system, ((surf_action_network_CM02_im_t) action)->variable, 0.0); @@ -833,7 +831,7 @@ static void im_net_action_suspend(surf_action_t action) static void im_net_action_resume(surf_action_t action) { if (((surf_action_network_CM02_im_t) action)->suspended) { - lmm_update_variable_weight(network_maxmin_system, + lmm_update_variable_weight(network_im_maxmin_system, ((surf_action_network_CM02_im_t) action)->variable, ((surf_action_network_CM02_im_t) @@ -864,8 +862,8 @@ static void im_net_finalize(void) global_routing->finalize(); - lmm_system_free(network_maxmin_system); - network_maxmin_system = NULL; + lmm_system_free(network_im_maxmin_system); + network_im_maxmin_system = NULL; xbt_heap_free(im_net_action_heap); xbt_swag_free(im_net_modified_set); @@ -875,8 +873,8 @@ static void im_net_finalize(void) static void im_surf_network_model_init_internal(void) { s_surf_action_network_CM02_im_t comm; - INFO0("You are using the UNSAFE lazy management optimization, I hope you know what you are doing."); - INFO0("====> For now this optimization is only available for LV08_im network model."); + XBT_INFO("You are using the UNSAFE lazy management optimization, I hope you know what you are doing."); + XBT_INFO("====> For now this optimization is only available for LV08_im network model."); surf_network_model = surf_model_init(); @@ -914,9 +912,9 @@ static void im_surf_network_model_init_internal(void) im_net_create_resource; - if (!network_maxmin_system){ + if (!network_im_maxmin_system){ sg_maxmin_selective_update = 1; - network_maxmin_system = lmm_system_new(); + network_im_maxmin_system = lmm_system_new(); } im_net_action_heap = xbt_heap_new(8,NULL); @@ -945,7 +943,7 @@ void im_surf_network_model_init_LegrandVelho(const char *filename) im_surf_network_model_init_internal(); im_net_define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); - network_solve = lmm_solve; + network_im_solve = lmm_solve; xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4); xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",