X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4502ea93a773951ce03aec68f7e16586bd28d8ac..5423275bf80828ba9e68147dc76a6fcc737826a7:/src/surf/network_gtnets.c diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index e7536d6bcf..8d6c9508a9 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2005 Henri Casanova. All rights reserved. */ +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -9,148 +8,80 @@ #include "gtnets/gtnets_interface.h" #include "xbt/str.h" - static double time_to_next_flow_completion = -1; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf, - "Logging specific to the SURF network module"); - -/** QUESTIONS for GTNetS integration - ** 1. Check that we did the right thing with name_service and get_resource_name - ** 2. Right now there is no "kill flow" in our GTNetS implementation. Do we - ** need to do something about this? - ** 3. We ignore the fact there is some max_duration on flows (see #2 above) - ** 4. share_resources() returns a duration, not a date, right? - ** 5. We don't suppoer "rates" - ** 6. We don't update "remaining" for ongoing flows. Is it bad? - **/ - -static int src_id = -1; -static int dst_id = -1; - -/* Instantiate a new network link */ -/* name: some name for the link, from the XML */ -/* bw: The bandwidth value */ -/* lat: The latency value */ + "Logging specific to the SURF network GTNetS module"); + +extern routing_global_t global_routing; + +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 int link_count = -1; network_link_GTNETS_t gtnets_link; - /* If link already exists, nothing to do (FIXME: check that multiple definition match?) */ if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) { return; } - /* KF: Increment the link counter for GTNetS */ - link_count++; + DEBUG1("Scanning link name %s", name); -/* - nw_link->model = surf_network_model; - nw_link->name = name; - nw_link->bw_current = bw_initial; - if (bw_trace) - nw_link->bw_event = - tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); - nw_link->lat_current = lat_initial; - if (lat_trace) - nw_link->lat_event = - tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); - nw_link->state_current = state_initial; - if (state_trace) - nw_link->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); -*/ - - /* KF: Add the link to the GTNetS simulation */ - if (gtnets_add_link(link_count, bw, lat)) { - xbt_assert0(0, "Cannot create GTNetS link"); - } - /* KF: Insert entry in the dictionary */ gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1); gtnets_link->generic_resource.name = name; gtnets_link->generic_resource.properties = props; gtnets_link->bw_current = bw; gtnets_link->lat_current = lat; - gtnets_link->id = link_count; - xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, surf_resource_free); + link_count++; - return; -} + DEBUG4("Adding new link, linkid %d, name %s, latency %g, bandwidth %g", + link_count, name, lat, bw); -/* Instantiate a new network card: MODIFYED BY KF */ -static int network_card_new(const char *name) -{ - static int card_count = -1; - - XBT_IN1("(%s)", name); - /* KF: Check that we haven't seen the network card before */ - network_card_GTNETS_t card = - surf_model_resource_by_name(surf_network_model, name); - - if (!card) { - /* KF: Increment the card counter for GTNetS */ - card_count++; - - /* KF: just use the dictionary to map link names to link indices */ - card = xbt_new0(s_network_card_GTNETS_t, 1); - card->name = xbt_strdup(name); - card->id = card_count; - xbt_dict_set(surf_model_resource_set(surf_network_model), name, card, - surf_resource_free); + if (gtnets_add_link(link_count, bw, lat)) { + xbt_assert0(0, "Cannot create GTNetS link"); } + gtnets_link->id = link_count; - LOG1(xbt_log_priority_trace, " return %d", card->id); - XBT_OUT; - /* KF: just return the GTNetS ID as the SURF ID */ - return card->id; + xbt_dict_set(surf_network_model->resource_set, name, gtnets_link, + surf_resource_free); } -/* Instantiate a new route: MODIFY BY KF */ -static void route_new(int src_id, int dst_id, network_link_GTNETS_t * links, +static void route_new(int src_id, int dst_id, xbt_dynar_t links, int nb_link) { - int i; + network_link_GTNETS_t link; + unsigned int cursor; + int i = 0; int *gtnets_links; + XBT_IN4("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)", src_id, dst_id, links, nb_link); - /* KF: Build the list of gtnets link IDs */ + /* Build the list of gtnets link IDs */ gtnets_links = (int *) calloc(nb_link, sizeof(int)); - for (i = 0; i < nb_link; i++) { - gtnets_links[i] = links[i]->id; + i = 0; + xbt_dynar_foreach(links, cursor, link) { + gtnets_links[i++] = link->id; } - /* KF: Create the GTNets route */ if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) { xbt_assert0(0, "Cannot create GTNetS route"); } XBT_OUT; } -/* Instantiate a new route: MODIFY BY KF */ static void route_onehop_new(int src_id, int dst_id, - network_link_GTNETS_t * links, int nb_link) + network_link_GTNETS_t link) { - int linkid; - - if (nb_link != 1) { - xbt_assert0(0, "In onehop_new, nb_link should be 1"); - } - - /* KF: Build the linbst of gtnets link IDs */ - linkid = links[0]->id; - - /* KF: Create the GTNets route */ - if (gtnets_add_onehop_route(src_id, dst_id, linkid)) { + if (gtnets_add_onehop_route(src_id, dst_id, link->id)) { xbt_assert0(0, "Cannot create GTNetS route"); } } - - /* Parse the XML for a network link */ static void parse_link_init(void) { @@ -158,145 +89,93 @@ static void parse_link_init(void) 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; - surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); - surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); - surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + 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("The GTNetS network model doesn't support bandwidth state traces"); + INFO0 + ("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"); current_property_set = xbt_dict_new(); - link_new(name, bw, lat, current_property_set); -} - -/* Parses a route from the XML: UNMODIFIED BY HC */ -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; -} + if (A_surfxml_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); -/* KF*/ -static void parse_route_set_routers(void) -{ - int id = network_card_new(A_surfxml_router_id); - - /* KF: Create the GTNets router */ - if (gtnets_add_router(id)) { - xbt_assert0(0, "Cannot add GTNetS router"); - } -} - -/* Create the route (more than one hops): MODIFIED BY KF */ -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); } + else link_new(name, bw, lat, current_property_set); } -static void add_route() +/* Create the gtnets topology based on routing strategy */ +static void create_gtnets_topology() { - xbt_ex_t e; - unsigned int cpt = 0; - int link_list_capacity = 0; - int nb_link = 0; - xbt_dict_cursor_t cursor = NULL; - char *key, *data, *end; - const char *sep = "#"; - xbt_dynar_t links, keys; - static network_link_GTNETS_t *link_list = NULL; - - - XBT_IN; - 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(network_link_GTNETS_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(surf_network_model->resource_set, link); - } - CATCH(e) { - RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } - } - if (nb_link == 1) - route_onehop_new(src_id, dst_id, link_list, nb_link); - } - - 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(network_link_GTNETS_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(surf_network_model->resource_set, link); - } - CATCH(e) { - RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } - } - if (nb_link >= 1) - route_new(src_id, dst_id, link_list, nb_link); - } - - xbt_dict_free(&route_table); - gtnets_print_topology(); - XBT_OUT; + 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. + + //get the onelinks from the parsed platform + xbt_dynar_t onelink_routes = global_routing->get_onelink_routes(); + if (!onelink_routes) + return; + + //save them in trace file + 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(global_routing->get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){ + gtnets_add_router(dst_id); + } + route_onehop_new(src_id, dst_id, (network_link_GTNETS_t)(link)); + } + } + + if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) { + gtnets_print_topology(); + } } /* Main XML parsing */ static void define_callbacks(const char *file) { - surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers); + /* Figuring out the network links */ 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_route); + surfxml_add_callback(ETag_surfxml_platform_cb_list, + &create_gtnets_topology); } -/* We do not care about this: only used for traces */ static int resource_used(void *resource_id) { - return 0; /* We don't care */ + xbt_assert0(0, + "The resource_used feature is not implemented in GTNets model"); } static int action_unref(surf_action_t action) @@ -304,7 +183,10 @@ static int action_unref(surf_action_t action) action->refcount--; if (!action->refcount) { xbt_swag_remove(action, action->state_set); - /* KF: No explicit freeing needed for GTNeTS here */ +#ifdef HAVE_TRACING + if (action->category) + xbt_free(action->category); +#endif free(action); return 1; } @@ -313,35 +195,31 @@ static int action_unref(surf_action_t action) static void action_cancel(surf_action_t action) { - xbt_die("Cannot cancel GTNetS flow"); + xbt_assert0(0, "Cannot cancel GTNetS flow"); return; } static void action_recycle(surf_action_t action) { - xbt_die("Cannot recycle GTNetS flow"); + xbt_assert0(0, "Cannot recycle GTNetS flow"); return; } -static void action_state_set(surf_action_t action, - e_surf_action_state_t state) +static double action_get_remains(surf_action_t action) { -/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ -/* if(((surf_action_network_GTNETS_t)action)->variable) { */ -/* lmm_variable_disable(maxmin_system, ((surf_action_network_GTNETS_t)action)->variable); */ -/* ((surf_action_network_GTNETS_t)action)->variable = NULL; */ -/* } */ + return action->remains; +} +static void action_state_set(surf_action_t action, + e_surf_action_state_t state) +{ surf_action_state_set(action, state); - return; } - -/* share_resources() */ static double share_resources(double now) { xbt_swag_t running_actions = - surf_network_model->states.running_action_set; + surf_network_model->states.running_action_set; //get the first relevant value from the running_actions list if (!xbt_swag_size(running_actions)) @@ -350,31 +228,26 @@ static double share_resources(double now) xbt_assert0(time_to_next_flow_completion, "Time to next flow completion not initialized!\n"); + DEBUG0("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", + time_to_next_flow_completion); return time_to_next_flow_completion; } -/* delta: by how many time units the simulation must advance */ -/* In this function: change the state of actions that terminate */ -/* The delta may not come from the network, and thus may be different (smaller) - than the one returned by the function above */ -/* If the delta is a network-caused min, then do not emulate any timer in the - network simulation, otherwise fake a timer somehow to advance the simulation of min seconds */ - static void update_actions_state(double now, double delta) { surf_action_network_GTNETS_t action = NULL; - // surf_action_network_GTNETS_t next_action = NULL; xbt_swag_t running_actions = - surf_network_model->states.running_action_set; + surf_network_model->states.running_action_set; /* If there are no renning flows, just return */ if (time_to_next_flow_completion < 0.0) { return; } - /*KF: if delta == time_to_next_flow_completion, too. */ + /* if delta == time_to_next_flow_completion, too. */ if (time_to_next_flow_completion <= delta) { /* run until the first flow completes */ void **metadata; int i, num_flows; @@ -393,13 +266,36 @@ static void update_actions_state(double now, double delta) xbt_swag_foreach(action, running_actions) { DEBUG2("Action (%p) remains old value: %f", action, action->generic_action.remains); - double remain = gtnets_get_flow_rx(action); - DEBUG1("Remain value returned by GTNetS : %f", remain); + double sent = gtnets_get_flow_rx(action); + +#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); +// } +// } +#endif + + DEBUG1("Sent value returned by GTNetS : %f", sent); //need to trust this remain value - if (remain == 0) { + if (sent == 0) { action->generic_action.remains = 0; } else { - action->generic_action.remains = action->generic_action.cost - remain; + action->generic_action.remains = + action->generic_action.cost - sent; } DEBUG2("Action (%p) remains new value: %f", action, action->generic_action.remains); @@ -409,6 +305,9 @@ static void update_actions_state(double now, double delta) 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); } @@ -423,29 +322,47 @@ static void update_actions_state(double now, double delta) return; } -/* UNUSED HERE: no traces */ 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"); - return; } -/* KF: Rate not supported */ /* Max durations are not supported */ -static surf_action_t communicate(const char *src_name, const char *dst_name,int src, int dst, double size, +static surf_action_t communicate(const char *src_name, + const char *dst_name, 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; - action = surf_action_new(sizeof(s_surf_action_network_GTNETS_t),size,surf_network_model,0); + 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 + && dst >= 0), "Either src or dst have invalid id (id<0)"); + + DEBUG4("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)); - /* KF: Add a flow to the GTNets Simulation, associated to this action */ + action = + surf_action_new(sizeof(s_surf_action_network_GTNETS_t), size, + surf_network_model, 0); + + /* 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); } +#ifdef HAVE_TRACING + TRACE_surf_gtnets_communicate(action, src, dst); +#endif return (surf_action_t) action; } @@ -470,13 +387,6 @@ static int action_is_suspended(surf_action_t action) static void finalize(void) { - xbt_dict_free(&surf_network_model->resource_set); - - surf_model_exit(surf_network_model); - - free(surf_network_model); - surf_network_model = NULL; - gtnets_finalize(); } @@ -489,13 +399,14 @@ static void surf_network_model_init_internal(void) surf_network_model->action_cancel = action_cancel; surf_network_model->action_recycle = action_recycle; surf_network_model->action_state_set = action_state_set; + surf_network_model->get_remains = action_get_remains; 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; + update_actions_state; surf_network_model->model_private->update_resource_state = - update_resource_state; + update_resource_state; surf_network_model->model_private->finalize = finalize; surf_network_model->suspend = action_suspend; @@ -504,11 +415,20 @@ static void surf_network_model_init_internal(void) surf_network_model->extension.network.communicate = communicate; - /* KF: Added the initialization for GTNetS interface */ - if (gtnets_initialize()) { - xbt_assert0(0, "impossible to initialize GTNetS interface"); + /* Added the initialization for GTNetS interface */ + if (gtnets_initialize(sg_tcp_gamma)) { + xbt_assert0(0, "Impossible to initialize GTNetS interface"); } + + routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL); +} + +#ifdef HAVE_LATENCY_BOUND_TRACKING +static int get_latency_limited(surf_action_t action) +{ + return 0; } +#endif #ifdef HAVE_GTNETS void surf_network_model_init_GTNETS(const char *filename) @@ -519,6 +439,15 @@ void surf_network_model_init_GTNETS(const char *filename) define_callbacks(filename); xbt_dynar_push(model_list, &surf_network_model); +#ifdef HAVE_LATENCY_BOUND_TRACKING + surf_network_model->get_latency_limited = get_latency_limited; +#endif + + if (sg_gtnets_jitter > 0.0) { + 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); }