X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22f458ce4459c47599e68b1ac0e2033f044adb1b..241f5458d9377dbfea5d9b333d5150cd79d89e03:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 0f5a1b18b6..b06b1b1ae3 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -6,8 +6,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_private.h" -#include "cpu_private.h" #include "xbt/log.h" +#include "xbt/str.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); @@ -238,51 +238,52 @@ static void count_hosts(void) host_number++; } -static int called = 0; -static void add_traces(void) -{ - xbt_dynar_t trace_connect = NULL; - unsigned int cpt; - int connect_element, connect_kind; - char *value, *trace_id, *connector_id; - link_CM02_t link; - cpu_Cas01_t host = NULL; - tmgr_trace_t trace; +static void add_traces(void) { + xbt_dict_cursor_t cursor=NULL; + char *trace_name,*elm; + static int called = 0; if (called) return; called = 1; - /*for all trace connects parse them and update traces for hosts or links */ - xbt_dynar_foreach (traces_connect_list, cpt, value) { - trace_connect = xbt_str_split_str(value, "#"); - trace_id = xbt_dynar_get_as(trace_connect, 0, char*); - connect_element = atoi(xbt_dynar_get_as(trace_connect, 1, char*)); - connect_kind = atoi(xbt_dynar_get_as(trace_connect, 2, char*)); - connector_id = xbt_dynar_get_as(trace_connect, 3, char*); - - xbt_assert1((trace = xbt_dict_get_or_null(traces_set_list, trace_id)), "Trace %s undefined", trace_id); - - if (connect_element == A_surfxml_trace_c_connect_element_HOST) { - xbt_assert1((host = xbt_dict_get_or_null(cpu_set, connector_id)), "Host %s undefined", connector_id); - switch (connect_kind) { - case A_surfxml_trace_c_connect_kind_AVAILABILITY: host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break; - case A_surfxml_trace_c_connect_kind_POWER: host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break; - } - } - - if (connect_element == A_surfxml_trace_c_connect_element_LINK) { - xbt_assert1((link = xbt_dict_get_or_null(link_set, connector_id)), "Link %s undefined", connector_id); - switch (connect_kind) { - case A_surfxml_trace_c_connect_kind_AVAILABILITY: link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break; - case A_surfxml_trace_c_connect_kind_BANDWIDTH: link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break; - case A_surfxml_trace_c_connect_kind_LATENCY: link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break; - } - } + /* 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); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } - xbt_dynar_free(&trace_connect); - xbt_dynar_free(&traces_connect_list); + 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); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + link->bw_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(link_set, elm); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + } + + xbt_dict_free(&trace_connect_list_host_avail); + xbt_dict_free(&trace_connect_list_power); + xbt_dict_free(&trace_connect_list_link_avail); + xbt_dict_free(&trace_connect_list_bandwidth); + xbt_dict_free(&trace_connect_list_latency); + xbt_dict_free(&traces_set_list); } @@ -514,13 +515,20 @@ static surf_action_t communicate(void *src, void *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); + /* LARGE PLATFORMS HACK: + total_route_size = route_size + src->link_nb + dst->nb */ int i; XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_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); @@ -546,8 +554,12 @@ static surf_action_t communicate(void *src, void *dst, double size, action->latency = 0.0; for (i = 0; i < route_size; i++) action->latency += route[i]->lat_current; + /* LARGE PLATFORMS HACK: + Add src->link and dst->link latencies */ action->lat_current = action->latency; + /* 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, @@ -582,6 +594,9 @@ static surf_action_t communicate(void *src, void *dst, double size, for (i = 0; i < route_size; i++) lmm_expand(network_maxmin_system, route[i]->constraint, action->variable, 1.0); + /* LARGE PLATFORMS HACK: + expand also with src->link and dst->link */ + XBT_OUT; return (surf_action_t) action;