X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5fd55f293d7e019e8c23e7ff76e2b3743e40cd6..cc375ad134c19925e1e343bae932be21cf8a8caf:/src/surf/network_gtnets.c diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 297560355d..8207982393 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -7,47 +7,47 @@ #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; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf, "Logging specific to the SURF network GTNetS module"); -extern routing_global_t global_routing; +extern routing_platf_t routing_platf; double sg_gtnets_jitter = 0.0; int sg_gtnets_jitter_seed = 10; -static void link_new(char *name, double bw, double lat, xbt_dict_t props) +static void link_new(const 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; } - DEBUG1("Scanning link name %s", name); + XBT_DEBUG("Scanning link name %s", name); gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1); - gtnets_link->generic_resource.name = name; + gtnets_link->generic_resource.name = xbt_strdup(name); gtnets_link->generic_resource.properties = props; gtnets_link->bw_current = bw; gtnets_link->lat_current = lat; link_count++; - DEBUG4("Adding new link, linkid %d, name %s, latency %g, bandwidth %g", + XBT_DEBUG("Adding new link, linkid %d, name %s, latency %g, bandwidth %g", link_count, name, lat, bw); if (gtnets_add_link(link_count, bw, lat)) { - xbt_assert0(0, "Cannot create GTNetS link"); + xbt_die("Cannot create GTNetS link"); } 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, @@ -58,80 +58,62 @@ static void route_new(int src_id, int dst_id, xbt_dynar_t links, int i = 0; int *gtnets_links; - XBT_IN4("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)", + XBT_IN("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)", src_id, dst_id, links, nb_link); /* Build the list of gtnets link IDs */ - gtnets_links = (int *) calloc(nb_link, sizeof(int)); + gtnets_links = xbt_new0(int, nb_link); i = 0; xbt_dynar_foreach(links, cursor, link) { gtnets_links[i++] = link->id; } if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) { - xbt_assert0(0, "Cannot create GTNetS route"); + xbt_die("Cannot create GTNetS route"); } - XBT_OUT; + XBT_OUT(); } static void route_onehop_new(int src_id, int dst_id, network_link_GTNETS_t link) { if (gtnets_add_onehop_route(src_id, dst_id, link->id)) { - xbt_assert0(0, "Cannot create GTNetS route"); + xbt_die("Cannot create GTNetS route"); } } /* Parse the XML for a network link */ -static void parse_link_init(void) +static void parse_link_init(sg_platf_link_cbarg_t link) { - 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; - DEBUG0("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) - INFO0 + XBT_DEBUG("link_gtnets"); + + if (link->bandwidth_trace) + XBT_INFO ("The GTNetS network model doesn't support bandwidth state traces"); - if (lat_trace) - INFO0("The GTNetS network model doesn't support latency state traces"); - if (state_trace) - INFO0("The GTNetS network model doesn't support link state traces"); + if (link->latency_trace) + XBT_INFO("The GTNetS network model doesn't support latency state traces"); + if (link->state_trace) + 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 (link->policy == SURF_LINK_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",link->id), link->bandwidth, link->latency, current_property_set); + link_new(bprintf("%s_DOWN",link->id), link->bandwidth, link->latency, current_property_set); } - else link_new(name, bw, lat, current_property_set); + else link_new(link->id, link->bandwidth, link->latency, current_property_set); + current_property_set = NULL; } /* Create the gtnets topology based on routing strategy */ -static void create_gtnets_topology() +static void create_gtnets_topology(void) { - int src_id,dst_id; - - DEBUG0("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. + XBT_DEBUG("Starting topology generation"); +// 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(); + xbt_dynar_t onelink_routes = routing_platf->get_onelink_routes(); if (!onelink_routes) return; @@ -139,22 +121,23 @@ static void create_gtnets_topology() onelink_t onelink; unsigned int iter; xbt_dynar_foreach(onelink_routes, iter, onelink) { - char *src = onelink->src; - char *dst = onelink->dst; void *link = onelink->link_ptr; - src_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src)); - dst_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst)); - - if(src_id != dst_id){ - DEBUG5("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id); - DEBUG0("Calling one link route"); - if(global_routing->get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){ - gtnets_add_router(src_id); + + if(onelink->src->id != onelink->dst->id){ + XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", + link, + onelink->src->name, + onelink->dst->name, + onelink->src->id, + onelink->dst->id); + XBT_DEBUG("Calling one link route"); + if(onelink->src->rc_type == SURF_NETWORK_ELEMENT_ROUTER){ + gtnets_add_router(onelink->src->id); } - if(global_routing->get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){ - gtnets_add_router(dst_id); + if(onelink->dst->rc_type == SURF_NETWORK_ELEMENT_ROUTER){ + gtnets_add_router(onelink->dst->id); } - route_onehop_new(src_id, dst_id, (network_link_GTNETS_t)(link)); + route_onehop_new(onelink->src->id, onelink->dst->id, (network_link_GTNETS_t)(link)); } } @@ -164,18 +147,16 @@ 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_platform_cb_list, - &create_gtnets_topology); + sg_platf_link_add_cb (&parse_link_init); + sg_platf_postparse_add_cb(&create_gtnets_topology); } static int resource_used(void *resource_id) { - xbt_assert0(0, - "The resource_used feature is not implemented in GTNets model"); + xbt_die("The resource_used feature is not implemented in GTNets model"); } static int action_unref(surf_action_t action) @@ -184,8 +165,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; @@ -195,13 +175,13 @@ static int action_unref(surf_action_t action) static void action_cancel(surf_action_t action) { - xbt_assert0(0, "Cannot cancel GTNetS flow"); + xbt_die("Cannot cancel GTNetS flow"); return; } static void action_recycle(surf_action_t action) { - xbt_assert0(0, "Cannot recycle GTNetS flow"); + xbt_die("Cannot recycle GTNetS flow"); return; } @@ -225,12 +205,12 @@ 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"); - DEBUG0("Calling gtnets_get_time_to_next_flow_completion"); + XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion"); time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion(); - DEBUG1("gtnets_get_time_to_next_flow_completion received %lg", + XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %lg", time_to_next_flow_completion); return time_to_next_flow_completion; @@ -242,7 +222,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; } @@ -255,67 +235,90 @@ static void update_actions_state(double now, double delta) num_flows = 0; if (gtnets_run_until_next_flow_completion(&metadata, &num_flows)) { - xbt_assert0(0, - "Cannot run GTNetS simulation until next flow completion"); + xbt_die("Cannot run GTNetS simulation until next flow completion"); } if (num_flows < 1) { - xbt_assert0(0, - "GTNetS simulation couldn't find a flow that would complete"); + xbt_die("GTNetS simulation couldn't find a flow that would complete"); } xbt_swag_foreach(action, running_actions) { - DEBUG2("Action (%p) remains old value: %f", action, + XBT_DEBUG("Action (%p) remains old value: %f", action, 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 - DEBUG1("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; } - DEBUG2("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 = NULL; + + routing_get_route_and_latency (action->src, action->dst, &route, NULL); + + unsigned int i; + for (i = 0; i < xbt_dynar_length (route); i++){ + network_link_GTNETS_t *link = ((network_link_GTNETS_t*)xbt_dynar_get_ptr (route, i)); + TRACE_surf_link_set_utilization ((*link)->generic_resource.name, + ((surf_action_t) action)->category, + (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; -#ifdef HAVE_TRACING - TRACE_surf_gtnets_destroy(action); -#endif action_state_set((surf_action_t) action, SURF_ACTION_DONE); - DEBUG1("----> Action (%p) just terminated", action); + XBT_DEBUG("----> Action (%p) just terminated", action); + } } else { /* run for a given number of seconds */ if (gtnets_run(delta)) { - xbt_assert0(0, "Cannot run GTNetS simulation"); + xbt_die("Cannot run GTNetS simulation"); } } @@ -326,42 +329,47 @@ static void update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { - xbt_assert0(0, "Cannot update model state for GTNetS simulation"); + xbt_die("Cannot update model state for GTNetS simulation"); } /* Max durations are not supported */ -static surf_action_t communicate(const char *src_name, - const char *dst_name, double size, - double rate) +static surf_action_t communicate(sg_routing_edge_t src_card, + sg_routing_edge_t dst_card, + double size, double rate) { - int src, dst; - - // Utiliser le dictionnaire définit dans create_gtnets_topology pour initialiser correctement src et dst - src = dst = -1; surf_action_network_GTNETS_t action = NULL; - 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 + int src = src_card->id; + int dst = dst_card->id; + char *src_name = src_card->name; + char *dst_name = dst_card->name; + + xbt_assert((src >= 0 && dst >= 0), "Either src or dst have invalid id (id<0)"); - DEBUG4("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst, + XBT_DEBUG("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst, dst_name); - xbt_dynar_t links = global_routing->get_route(src_name, dst_name); - route_new(src, dst, links, xbt_dynar_length(links)); + xbt_dynar_t route = NULL; + + routing_get_route_and_latency(src_card, dst_card, &route, NULL); + + route_new(src, dst, route, xbt_dynar_length(route)); action = 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_assert2(0, "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_card, dst_card); #endif return (surf_action_t) action; @@ -385,6 +393,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(); @@ -412,15 +427,18 @@ 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; /* Added the initialization for GTNetS interface */ if (gtnets_initialize(sg_tcp_gamma)) { - xbt_assert0(0, "Impossible to initialize GTNetS interface"); + xbt_die("Impossible to initialize GTNetS interface"); } - routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL); + routing_model_create(NULL); } #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -430,13 +448,13 @@ 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 @@ -447,8 +465,4 @@ void surf_network_model_init_GTNETS(const char *filename) gtnets_set_jitter(sg_gtnets_jitter); gtnets_set_jitter_seed(sg_gtnets_jitter_seed); } - - update_model_description(surf_network_model_description, - "GTNets", surf_network_model); } -#endif