X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/368be7990cfe509e3c7715d9ad28f5ca1b3d62ef..b84bad24cc0d403e9773384376ecff7d360f8379:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 87e462e897..c5b61f6a68 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -12,37 +12,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); -surf_network_model_t surf_network_model = NULL; +surf_model_t surf_network_model = NULL; static lmm_system_t network_maxmin_system = NULL; static void (*network_solve) (lmm_system_t) = NULL; -xbt_dict_t link_set = NULL; double latency_factor = 1.0; /* default value */ double bandwidth_factor = 1.0; /* default value */ double weight_S_parameter = 0.0; /* default value */ int card_number = 0; -int host_number = 0; -link_CM02_t **routing_table = NULL; -int *routing_table_size = NULL; -static link_CM02_t loopback = NULL; +int host_count = 0; double sg_tcp_gamma = 0.0; -static void create_routing_table(void) -{ - routing_table = xbt_new0(link_CM02_t *, /*card_number * card_number */ - host_number * host_number); - routing_table_size = - xbt_new0(int, /*card_number * card_number */ host_number * host_number); -} - -static void link_free(void *nw_link) -{ - free(((link_CM02_t) nw_link)->name); - xbt_dict_free(&(((link_CM02_t) nw_link)->properties)); - free(nw_link); -} static link_CM02_t link_new(char *name, double bw_initial, @@ -56,11 +38,12 @@ static link_CM02_t link_new(char *name, policy, xbt_dict_t properties) { link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1); - xbt_assert1(!xbt_dict_get_or_null(link_set, name), + 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->model = (surf_model_t) surf_network_model; - nw_link->name = 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 = @@ -81,43 +64,11 @@ static link_CM02_t link_new(char *name, if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); - nw_link->properties = properties; - - current_property_set = properties; - - xbt_dict_set(link_set, name, nw_link, link_free); + xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free); return nw_link; } -static void network_card_free(void *nw_card) -{ - free(((network_card_CM02_t) nw_card)->name); - free(nw_card); -} - -static int network_card_new(const char *card_name) -{ - network_card_CM02_t card = - surf_model_resource_by_name(surf_network_model,card_name); - - if (!card) { - card = xbt_new0(s_network_card_CM02_t, 1); - card->name = xbt_strdup(card_name); - card->id = host_number++; - xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card, network_card_free); - } - return card->id; -} - -static void route_new(int src_id, int dst_id, - link_CM02_t * link_list, int nb_link) -{ - ROUTE_SIZE(src_id, dst_id) = nb_link; - ROUTE(src_id, dst_id) = link_list = - xbt_realloc(link_list, sizeof(link_CM02_t) * nb_link); -} - static void parse_link_init(void) { char *name_link; @@ -157,88 +108,6 @@ static void parse_link_init(void) } -static int src_id = -1; -static int dst_id = -1; - -static void parse_route_set_endpoints(void) -{ - src_id = network_card_new(A_surfxml_route_src); - dst_id = network_card_new(A_surfxml_route_dst); - route_action = A_surfxml_route_action; -} - -static void parse_route_set_route(void) -{ - char *name; - if (src_id != -1 && dst_id != -1) { - name = bprintf("%x#%x", src_id, dst_id); - manage_route(route_table, name, route_action, 0); - free(name); - } -} - -static void add_loopback(void) -{ - int i; - /* Adding loopback if needed */ - for (i = 0; i < host_number; i++) - if (!ROUTE_SIZE(i, i)) { - if (!loopback) - loopback = link_new(xbt_strdup("__MSG_loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_LINK_ON, NULL, SURF_LINK_FATPIPE, NULL); - ROUTE_SIZE(i, i) = 1; - ROUTE(i, i) = xbt_new0(link_CM02_t, 1); - ROUTE(i, i)[0] = loopback; - } -} - -static void add_route(void) -{ - xbt_ex_t e; - int nb_link = 0; - unsigned int cpt = 0; - int link_list_capacity = 0; - link_CM02_t *link_list = NULL; - xbt_dict_cursor_t cursor = NULL; - char *key, *data, *end; - const char *sep = "#"; - xbt_dynar_t links, keys; - - if (routing_table == NULL) - create_routing_table(); - - xbt_dict_foreach(route_table, cursor, key, data) { - char *link = NULL; - nb_link = 0; - links = (xbt_dynar_t) data; - keys = xbt_str_split_str(key, sep); - - link_list_capacity = xbt_dynar_length(links); - link_list = xbt_new(link_CM02_t, link_list_capacity); - - src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); - xbt_dynar_free(&keys); - - xbt_dynar_foreach(links, cpt, link) { - TRY { - link_list[nb_link++] = xbt_dict_get(link_set, link); - } - CATCH(e) { - RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } - } - route_new(src_id, dst_id, link_list, nb_link); - } -} - -static void count_hosts(void) -{ - host_number++; -} - - static void add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -252,7 +121,7 @@ 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(link_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); @@ -264,7 +133,7 @@ static void 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_t link = xbt_dict_get_or_null(link_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); @@ -276,7 +145,7 @@ static void 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_t link = xbt_dict_get_or_null(link_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); @@ -290,19 +159,8 @@ static void add_traces(void) static void define_callbacks(const char *file) { /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts); surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); - surfxml_add_callback(STag_surfxml_route_cb_list, - &parse_route_set_endpoints); - surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback); -} - -static const char *get_resource_name(void *resource_id) -{ - return ((network_card_CM02_t) resource_id)->name; } static int resource_used(void *resource_id) @@ -311,7 +169,7 @@ static int resource_used(void *resource_id) ((link_CM02_t) resource_id)->constraint); } -static int action_free(surf_action_t action) +static int action_unref(surf_action_t action) { action->refcount--; if (!action->refcount) { @@ -325,11 +183,6 @@ static int action_free(surf_action_t action) return 0; } -static void action_use(surf_action_t action) -{ - action->refcount++; -} - static void action_cancel(surf_action_t action) { return; @@ -340,25 +193,11 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, - e_surf_action_state_t state) -{ -/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ -/* if(((surf_action_network_CM02_t)action)->variable) { */ -/* lmm_variable_disable(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable); */ -/* ((surf_action_network_CM02_t)action)->variable = NULL; */ -/* } */ - - surf_action_change_state(action, state); - return; -} - static double share_resources(double now) { s_surf_action_network_CM02_t s_action; surf_action_network_CM02_t action = NULL; - xbt_swag_t running_actions = - surf_network_model->common_public.states.running_action_set; + xbt_swag_t running_actions = surf_network_model->states.running_action_set; double min; min = generic_maxmin_share_resources(running_actions, @@ -385,11 +224,10 @@ static void update_actions_state(double now, double delta) double deltap = 0.0; surf_action_network_CM02_t action = NULL; surf_action_network_CM02_t next_action = NULL; - xbt_swag_t running_actions = - surf_network_model->common_public.states.running_action_set; + xbt_swag_t running_actions = surf_network_model->states.running_action_set; /* xbt_swag_t failed_actions = - surf_network_model->common_public.states.failed_action_set; + surf_network_model->states.failed_action_set; */ xbt_swag_foreach_safe(action, next_action, running_actions) { @@ -414,11 +252,11 @@ 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(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + 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(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE); } } @@ -472,7 +310,8 @@ static void update_resource_state(void *id, else lmm_update_variable_bound(network_maxmin_system, action->variable, min(action->rate, - sg_tcp_gamma / (2.0 * action->lat_current))); + sg_tcp_gamma / (2.0 * + action->lat_current))); if (!(action->suspended)) lmm_update_variable_weight(network_maxmin_system, action->variable, action->weight); @@ -491,10 +330,10 @@ static void update_resource_state(void *id, (network_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); - if (surf_action_get_state(action) == SURF_ACTION_RUNNING || - surf_action_get_state(action) == SURF_ACTION_READY) { + if (surf_action_state_get(action) == SURF_ACTION_RUNNING || + surf_action_state_get(action) == SURF_ACTION_READY) { action->finish = date; - action_change_state(action, SURF_ACTION_FAILED); + surf_network_model->action_state_set(action, SURF_ACTION_FAILED); } } } @@ -506,57 +345,44 @@ static void update_resource_state(void *id, return; } -static surf_action_t communicate(void *src, void *dst, double size, +static surf_action_t 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: Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node Use the cluster_id for ->id */ - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - link_CM02_t *route = ROUTE(card_src->id, card_dst->id); + xbt_dynar_t route = used_routing->get_route(src, dst); /* LARGE PLATFORMS HACK: total_route_size = route_size + src->link_nb + dst->nb */ - int i; + unsigned int i; - XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate); + XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate); /* LARGE PLATFORMS HACK: assert on total_route_size */ - xbt_assert2(route_size, - "You're trying to send data from %s to %s but there is no connexion between these two cards.", - card_src->name, card_dst->name); - - action = xbt_new0(s_surf_action_network_CM02_t, 1); - - action->generic_action.refcount = 1; - action->generic_action.cost = size; - action->generic_action.remains = size; - action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = surf_get_clock(); - action->generic_action.finish = -1.0; - action->generic_action.model_type = (surf_model_t) surf_network_model; - action->suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - action->generic_action.state_set = - surf_network_model->common_public.states.running_action_set; - for (i = 0; i < route_size; i++) - if (route[i]->state_current == SURF_LINK_OFF) { - action->generic_action.state_set = - surf_network_model->common_public.states.failed_action_set; + xbt_assert2(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); + + link_CM02_t link; + int failed=0; + xbt_dynar_foreach(route,i,link) { + if (link->state_current == SURF_LINK_OFF) { + failed = 1; break; } + } + 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; - for (i = 0; i < route_size; i++) { - action->latency += route[i]->lat_current; + xbt_dynar_foreach(route,i,link) { + action->latency += link->lat_current; action->weight += - route[i]->lat_current + weight_S_parameter / route[i]->bw_current; + link->lat_current + weight_S_parameter / link->bw_current; } /* LARGE PLATFORMS HACK: Add src->link and dst->link latencies */ @@ -567,10 +393,10 @@ static surf_action_t communicate(void *src, void *dst, double size, lmm_variable_new(..., total_route_size) */ if (action->latency > 0) action->variable = - lmm_variable_new(network_maxmin_system, action, 0.0, -1.0, route_size); + 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, route_size); + lmm_variable_new(network_maxmin_system, action, 1.0, -1.0, xbt_dynar_length(route)); if (action->rate < 0) { if (action->lat_current > 0) @@ -583,15 +409,17 @@ static surf_action_t communicate(void *src, void *dst, double size, if (action->lat_current > 0) lmm_update_variable_bound(network_maxmin_system, action->variable, min(action->rate, - sg_tcp_gamma / (2.0 * action->lat_current))); + sg_tcp_gamma / (2.0 * + action->lat_current))); else lmm_update_variable_bound(network_maxmin_system, action->variable, action->rate); } - for (i = 0; i < route_size; i++) - lmm_expand(network_maxmin_system, route[i]->constraint, + xbt_dynar_foreach(route,i,link) { + lmm_expand(network_maxmin_system, link->constraint, action->variable, 1.0); + } /* LARGE PLATFORMS HACK: expand also with src->link and dst->link */ @@ -600,26 +428,6 @@ static surf_action_t communicate(void *src, void *dst, double size, return (surf_action_t) action; } -/* returns an array of link_CM02_t */ -static const void **get_route(void *src, void *dst) -{ - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - return (const void **) ROUTE(card_src->id, card_dst->id); -} - -static int get_route_size(void *src, void *dst) -{ - network_card_CM02_t card_src = src; - network_card_CM02_t card_dst = dst; - return ROUTE_SIZE(card_src->id, card_dst->id); -} - -static const char *get_link_name(const void *link) -{ - return ((link_CM02_t) link)->name; -} - static double get_link_bandwidth(const void *link) { return ((link_CM02_t) link)->bw_current; @@ -635,11 +443,6 @@ 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; -} - static void action_suspend(surf_action_t action) { ((surf_action_network_CM02_t) action)->suspended = 1; @@ -671,81 +474,50 @@ static void action_set_max_duration(surf_action_t action, double duration) static void finalize(void) { - int i, j; - - xbt_dict_free(&link_set); - - surf_model_exit((surf_model_t)surf_network_model); - - free(surf_network_model->extension_public); - free(surf_network_model); + surf_model_exit(surf_network_model); surf_network_model = NULL; - loopback = NULL; - for (i = 0; i < host_number; i++) - for (j = 0; j < host_number; j++) - free(ROUTE(i, j)); - free(routing_table); - routing_table = NULL; - free(routing_table_size); - routing_table_size = NULL; - host_number = 0; + used_routing->finalize(); + host_count = 0; lmm_system_free(network_maxmin_system); network_maxmin_system = NULL; } static void surf_network_model_init_internal(void) { - surf_network_model = xbt_new0(s_surf_network_model_t, 1); - - surf_model_init((surf_model_t)surf_network_model); - - surf_network_model->extension_public = - xbt_new0(s_surf_network_model_extension_public_t, 1); - - surf_network_model->common_public.get_resource_name = get_resource_name; - surf_network_model->common_public.action_get_state = surf_action_get_state; - surf_network_model->common_public.action_get_start_time = - surf_action_get_start_time; - surf_network_model->common_public.action_get_finish_time = - surf_action_get_finish_time; - surf_network_model->common_public.action_free = action_free; - surf_network_model->common_public.action_use = action_use; - surf_network_model->common_public.action_cancel = action_cancel; - surf_network_model->common_public.action_recycle = action_recycle; - surf_network_model->common_public.action_change_state = - action_change_state; - surf_network_model->common_public.action_set_data = surf_action_set_data; - surf_network_model->common_public.name = "network"; - - surf_network_model->common_private->resource_used = resource_used; - surf_network_model->common_private->share_resources = share_resources; - surf_network_model->common_private->update_actions_state = + 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->model_private->resource_used = resource_used; + surf_network_model->model_private->share_resources = share_resources; + surf_network_model->model_private->update_actions_state = update_actions_state; - surf_network_model->common_private->update_resource_state = + surf_network_model->model_private->update_resource_state = update_resource_state; - surf_network_model->common_private->finalize = finalize; - - surf_network_model->common_public.suspend = action_suspend; - surf_network_model->common_public.resume = action_resume; - surf_network_model->common_public.is_suspended = action_is_suspended; - surf_cpu_model->common_public.set_max_duration = action_set_max_duration; - - surf_network_model->extension_public->communicate = communicate; - surf_network_model->extension_public->get_route = get_route; - surf_network_model->extension_public->get_route_size = get_route_size; - surf_network_model->extension_public->get_link_name = get_link_name; - surf_network_model->extension_public->get_link_bandwidth = - 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->model_private->finalize = finalize; - surf_network_model->common_public.get_properties = get_properties; + 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; - link_set = xbt_dict_new(); + surf_network_model->extension.network.communicate = 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; 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_LINK_ON, NULL, SURF_LINK_FATPIPE, NULL)); } /************************************************************************/ @@ -766,7 +538,7 @@ void surf_network_model_init_LegrandVelho(const char *filename) weight_S_parameter = 8775; update_model_description(surf_network_model_description, - "LegrandVelho", (surf_model_t) surf_network_model); + "LegrandVelho", surf_network_model); } /***************************************************************************/ @@ -791,7 +563,7 @@ void surf_network_model_init_CM02(const char *filename) network_solve = lmm_solve; update_model_description(surf_network_model_description, - "CM02", (surf_model_t) surf_network_model); + "CM02", surf_network_model); } void surf_network_model_init_Reno(const char *filename) @@ -810,7 +582,7 @@ void surf_network_model_init_Reno(const char *filename) weight_S_parameter = 8775; update_model_description(surf_network_model_description, - "Reno", (surf_model_t) surf_network_model); + "Reno", surf_network_model); } @@ -831,7 +603,7 @@ void surf_network_model_init_Reno2(const char *filename) weight_S_parameter = 8775; update_model_description(surf_network_model_description, - "Reno2", (surf_model_t) surf_network_model); + "Reno2", surf_network_model); } void surf_network_model_init_Vegas(const char *filename) @@ -851,7 +623,7 @@ void surf_network_model_init_Vegas(const char *filename) weight_S_parameter = 8775; update_model_description(surf_network_model_description, - "Vegas", (surf_model_t) surf_network_model); + "Vegas", surf_network_model); } #ifdef HAVE_SDP @@ -866,6 +638,6 @@ void surf_network_model_init_SDP(const char *filename) network_solve = sdp_solve; update_model_description(surf_network_model_description, - "SDP", (surf_model_t) surf_network_model); + "SDP", surf_network_model); } #endif