X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ecbb4c88462e9ec9be0c830a257da6e9b774a25..ccf2eaeec8728da6bafa2a0701a4c799f57d1b75:/src/surf/network_gtnets.c diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index dd73d52b27..d6ff8522cf 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -7,6 +7,7 @@ #include "network_gtnets_private.h" #include "gtnets/gtnets_interface.h" #include "xbt/str.h" +#include "surf/surfxml_parse_values.h" static double time_to_next_flow_completion = -1; @@ -23,7 +24,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) static int link_count = -1; network_link_GTNETS_t gtnets_link; - if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) { + if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) { return; } @@ -46,8 +47,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) } gtnets_link->id = link_count; - xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, - surf_resource_free); + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link); } static void route_new(int src_id, int dst_id, xbt_dynar_t links, @@ -85,39 +85,26 @@ static void route_onehop_new(int src_id, int dst_id, /* Parse the XML for a network link */ static void parse_link_init(void) { - char *name; - double bw; - double lat; e_surf_resource_state_t state; - name = xbt_strdup(A_surfxml_link_id); - surf_parse_get_double(&bw, A_surfxml_link_bandwidth); - surf_parse_get_double(&lat, A_surfxml_link_latency); state = SURF_RESOURCE_ON; XBT_DEBUG("link_gtnets"); - tmgr_trace_t bw_trace; - tmgr_trace_t state_trace; - tmgr_trace_t lat_trace; - bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); - lat_trace = tmgr_trace_new(A_surfxml_link_latency_file); - state_trace = tmgr_trace_new(A_surfxml_link_state_file); - - if (bw_trace) + if (struct_lnk->V_link_bandwidth_file) XBT_INFO ("The GTNetS network model doesn't support bandwidth state traces"); - if (lat_trace) + if (struct_lnk->V_link_latency_file) XBT_INFO("The GTNetS network model doesn't support latency state traces"); - if (state_trace) + if (struct_lnk->V_link_state_file) XBT_INFO("The GTNetS network model doesn't support link state traces"); - current_property_set = xbt_dict_new(); - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) + if (struct_lnk->V_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) { - link_new(bprintf("%s_UP",name), bw, lat, current_property_set); - link_new(bprintf("%s_DOWN",name), bw, lat, current_property_set); + link_new(bprintf("%s_UP",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_latency, current_property_set); + link_new(bprintf("%s_DOWN",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_latency, current_property_set); } - else link_new(name, bw, lat, current_property_set); + else link_new(struct_lnk->V_link_id, struct_lnk->V_link_bandwidth, struct_lnk->V_link_latency, current_property_set); + current_property_set = NULL; } /* Create the gtnets topology based on routing strategy */ @@ -126,9 +113,8 @@ static void create_gtnets_topology() int src_id,dst_id; XBT_DEBUG("Starting topology generation"); -// À refaire plus tard. Il faut prendre la liste des hôtes/routeurs (dans routing) -// À partir de cette liste, on les numérote. -// Ensuite, on peut utiliser les id pour refaire les appels GTNets qui suivent. +// FIXME: We should take the list of hosts/routers (in the routing module), number the elements of this list, +// and then you can use the id to reimplement properly the following GTNets calls //get the onelinks from the parsed platform xbt_dynar_t onelink_routes = global_routing->get_onelink_routes(); @@ -164,10 +150,10 @@ static void create_gtnets_topology() } /* Main XML parsing */ -static void define_callbacks(const char *file) +static void define_callbacks(void) { /* Figuring out the network links */ - surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); + surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init); surfxml_add_callback(ETag_surfxml_platform_cb_list, &create_gtnets_topology); } @@ -183,8 +169,7 @@ static int action_unref(surf_action_t action) if (!action->refcount) { xbt_swag_remove(action, action->state_set); #ifdef HAVE_TRACING - if (action->category) - xbt_free(action->category); + xbt_free(action->category); #endif surf_action_free(&action); return 1; @@ -224,7 +209,7 @@ static double share_resources(double now) if (!xbt_swag_size(running_actions)) return -1.0; - xbt_assert0(time_to_next_flow_completion, + xbt_assert(time_to_next_flow_completion, "Time to next flow completion not initialized!\n"); XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion"); @@ -241,7 +226,7 @@ static void update_actions_state(double now, double delta) xbt_swag_t running_actions = surf_network_model->states.running_action_set; - /* If there are no renning flows, just return */ + /* If there are no running flows, just return */ if (time_to_next_flow_completion < 0.0) { return; } @@ -265,48 +250,75 @@ static void update_actions_state(double now, double delta) action->generic_action.remains); double sent = gtnets_get_flow_rx(action); + XBT_DEBUG("Sent value returned by GTNetS : %f", sent); + #ifdef HAVE_TRACING - double trace_sent = sent; - if (trace_sent == 0) { - //if sent is equals to 0, means that gtnets sent all the bytes - trace_sent = action->generic_action.cost; - } - // tracing resource utilization -// COMMENTED BY DAVID -// int src = TRACE_surf_gtnets_get_src (action); -// int dst = TRACE_surf_gtnets_get_dst (action); -// if (src != -1 && dst != -1){ -// xbt_dynar_t route = used_routing->get_route(src, dst); -// network_link_GTNETS_t link; -// unsigned int i; -// xbt_dynar_foreach(route, i, link) { -// TRACE_surf_link_set_utilization (link->generic_resource.name, -// action->generic_action.data, trace_sent/delta, now-delta, delta); -// } -// } + action->last_remains = action->generic_action.remains; #endif - XBT_DEBUG("Sent value returned by GTNetS : %f", sent); - //need to trust this remain value - if (sent == 0) { - action->generic_action.remains = 0; + //need to trust this remain value + if (sent == 0) { + action->generic_action.remains = 0; } else { action->generic_action.remains = action->generic_action.cost - sent; } - XBT_DEBUG("Action (%p) remains new value: %f", action, + + // verify that this action is a finishing action. + int found=0; + for (i = 0; i < num_flows; i++) { + if(action == (surf_action_network_GTNETS_t) (metadata[i])){ + found = 1; + break; + } + } + + // indeed this action have not yet started + // because of that we need to fix the remaining to the + // original total cost + if(found != 1 && action->generic_action.remains == 0 ){ + action->generic_action.remains = action->generic_action.cost; + } + + XBT_DEBUG("Action (%p) remains new value: %f", action, action->generic_action.remains); + +#ifdef HAVE_TRACING + if (TRACE_is_enabled()) { + double last_amount_sent = (action->generic_action.cost - action->last_remains); + double amount_sent = (action->generic_action.cost - action->generic_action.remains); + + // tracing resource utilization + xbt_dynar_t route = global_routing->get_route(action->src_name, + action->dst_name); + network_link_GTNETS_t link; + unsigned int i; + xbt_dynar_foreach(route, i, link) { + TRACE_surf_link_set_utilization (link->generic_resource.name, + action->generic_action.data, + (surf_action_t) action, + (amount_sent - last_amount_sent)/(delta), + now-delta, + delta); + } + } +#endif + + } for (i = 0; i < num_flows; i++) { action = (surf_action_network_GTNETS_t) (metadata[i]); + + action->generic_action.finish = now + time_to_next_flow_completion; + action_state_set((surf_action_t) action, SURF_ACTION_DONE); + XBT_DEBUG("----> Action (%p) just terminated", action); + #ifdef HAVE_TRACING TRACE_surf_gtnets_destroy(action); #endif - action_state_set((surf_action_t) action, SURF_ACTION_DONE); - XBT_DEBUG("----> Action (%p) just terminated", action); } @@ -339,7 +351,7 @@ static surf_action_t communicate(const char *src_name, src = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src_name)); dst = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst_name)); - xbt_assert0((src >= 0 + xbt_assert((src >= 0 && dst >= 0), "Either src or dst have invalid id (id<0)"); XBT_DEBUG("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst, @@ -352,13 +364,16 @@ static surf_action_t communicate(const char *src_name, surf_action_new(sizeof(s_surf_action_network_GTNETS_t), size, surf_network_model, 0); +#ifdef HAVE_TRACING + action->last_remains = 0; +#endif + /* Add a flow to the GTNets Simulation, associated to this action */ if (gtnets_create_flow(src, dst, size, (void *) action) < 0) { - xbt_die(bprintf("Not route between host %s and host %s", src_name, - dst_name)); + xbt_die("Not route between host %s and host %s", src_name, dst_name); } #ifdef HAVE_TRACING - TRACE_surf_gtnets_communicate(action, src, dst); + TRACE_surf_gtnets_communicate(action, src_name, dst_name); #endif return (surf_action_t) action; @@ -382,6 +397,13 @@ static int action_is_suspended(surf_action_t action) return 0; } +#ifdef HAVE_TRACING +static void gtnets_action_set_category(surf_action_t action, const char *category) +{ + action->category = xbt_strdup (category); +} +#endif + static void finalize(void) { gtnets_finalize(); @@ -409,6 +431,9 @@ static void surf_network_model_init_internal(void) surf_network_model->suspend = action_suspend; surf_network_model->resume = action_resume; surf_network_model->is_suspended = action_is_suspended; +#ifdef HAVE_TRACING + surf_network_model->set_category = gtnets_action_set_category; +#endif surf_network_model->extension.network.communicate = communicate; @@ -427,13 +452,12 @@ static int get_latency_limited(surf_action_t action) } #endif -#ifdef HAVE_GTNETS -void surf_network_model_init_GTNETS(const char *filename) +void surf_network_model_init_GTNETS(void) { if (surf_network_model) return; surf_network_model_init_internal(); - define_callbacks(filename); + define_callbacks(); xbt_dynar_push(model_list, &surf_network_model); #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -448,4 +472,3 @@ void surf_network_model_init_GTNETS(const char *filename) update_model_description(surf_network_model_description, "GTNets", surf_network_model); } -#endif