-/* $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. */
#include "network_gtnets_private.h"
+#include "gtnets/gtnets_interface.h"
+#include "xbt/str.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network_gtnets);
-
-/* surf_network_resource_t surf_network_resource = NULL; */
-static xbt_dict_t network_link_set = NULL;
+static double time_to_next_flow_completion = -1;
-/* xbt_dict_t network_card_set = NULL; */
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
+ "Logging specific to the SURF network GTNetS module");
-#if 0
-static int card_number = 0;
-static network_link_GTNETS_t **routing_table = NULL;
-static int *routing_table_size = NULL;
+extern routing_global_t global_routing;
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
-#endif
+double sg_gtnets_jitter = 0.0;
+int sg_gtnets_jitter_seed = 10;
-/** 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?
- **/
-
-/* Free memory for a network link */
-static void network_link_free(void *nw_link)
+static void link_new(char *name, double bw, double lat, xbt_dict_t props)
{
- free(((network_link_GTNETS_t)nw_link)->name);
- free(nw_link);
-}
-
-/* Instantiate a new network link */
-/* name: some name for the link, from the XML */
-/* bw: The bandwidth value */
-/* lat: The latency value */
-static void network_link_new(char *name,
- double bw,
- double lat)
-{
- static int link_count=-1;
+ static int link_count = -1;
network_link_GTNETS_t gtnets_link;
- /* KF: Check that the link wasn't added before */
- if (xbt_dict_get_or_null(network_link_set, name)) {
+ if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) {
return;
}
- /* KF: Increment the link counter for GTNetS */
- link_count++;
-
-/*
- nw_link->resource = (surf_resource_t) surf_network_resource;
- 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);
-*/
+ XBT_DEBUG("Scanning link name %s", name);
- /* 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->name = strcpy(name);
+ 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(network_link_set, name, gtnets_link, network_link_free);
- return;
-}
+ link_count++;
-/* free the network card */
-static void network_card_free(void *nw_card)
-{
- free(((network_card_GTNETS_t)nw_card)->name);
- free(nw_card);
+ 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_die("Cannot create GTNetS link");
+ }
+ gtnets_link->id = link_count;
+
+ xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link);
}
-/* Instantiate a new network card: MODIFYED BY KF */
-static int network_card_new(const char *name)
+static void route_new(int src_id, int dst_id, xbt_dynar_t links,
+ int nb_link)
{
- static int card_count=-1;
-
- /* KF: Check that we haven't seen the network card before */
- if (xbt_dict_get_or_null(network_card_set, name))
- return;
+ network_link_GTNETS_t link;
+ unsigned int cursor;
+ int i = 0;
+ int *gtnets_links;
- /* KF: Increment the card counter for GTNetS */
- card_count++;
+ XBT_IN("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
+ src_id, dst_id, links, nb_link);
- /* KF: just use the dictionary to map link names to link indices */
- gtnets_network_card = xbt_new0(s_network_card_GTNETS_t,1);
- gtnets_network_card->name = strcpy(name);
- gtnets_network_card->id = card_count;
- xbt_dict_set(network_card_set, name, gtnets_network_card, network_card_free);
+ /* Build the list of gtnets link IDs */
+ gtnets_links = (int *) calloc(nb_link, sizeof(int));
+ i = 0;
+ xbt_dynar_foreach(links, cursor, link) {
+ gtnets_links[i++] = link->id;
+ }
- /* KF: just return the GTNetS ID as the SURF ID */
- return card_count;
+ if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) {
+ xbt_die("Cannot create GTNetS route");
+ }
+ XBT_OUT();
}
-/* Instantiate a new route: MODIFY BY KF */
-static void route_new(int src_id, int dst_id, char **links, int nb_link)
+static void route_onehop_new(int src_id, int dst_id,
+ network_link_GTNETS_t link)
{
-#if 0
- network_link_GTNETS_t *link_list = NULL;
- int i;
-
- ROUTE_SIZE(src_id, dst_id) = nb_link;
- link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_GTNETS_t, nb_link));
- for (i = 0; i < nb_link; i++) {
- link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
- free(links[i]);
- }
- free(links);
-#endif
- int i;
- int *gtnets_links;
-
- /* KF: 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]=(int)(xbt_dict_get(network_link_set, links[i]))
- }
-
- /* KF: Create the GTNets route */
- if (GTNetS_add_route(src_id, dst_id, gtnets_links, nb_link)) {
- xbt_assert0(0,"Cannot create GTNetS route");
+ if (gtnets_add_onehop_route(src_id, dst_id, link->id)) {
+ xbt_die("Cannot create GTNetS route");
}
}
/* Parse the XML for a network link */
-static void parse_network_link(void)
+static void parse_link_init(void)
{
char *name;
double bw;
double lat;
- e_surf_network_link_state_t state;
+ 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);
- name = xbt_strdup(A_surfxml_network_link_name);
- surf_parse_get_double(&bw,A_surfxml_network_link_bandwidth);
- surf_parse_get_double(&lat,A_surfxml_network_link_latency);
- state = SURF_NETWORK_LINK_ON;
+ if (bw_trace)
+ XBT_INFO
+ ("The GTNetS network model doesn't support bandwidth state traces");
+ if (lat_trace)
+ XBT_INFO("The GTNetS network model doesn't support latency state traces");
+ if (state_trace)
+ XBT_INFO("The GTNetS network model doesn't support link state traces");
- /* Print values when no traces are specified */
+ if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
{
- tmgr_trace_t bw_trace;
- tmgr_trace_t state;
- tmgr_trace_t lat_trace;
-
- surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
- surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
- surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file);
-
- if (bw_trace)
- WARNING0("The GTNetS network model doesn't support bandwidth state traces");
- if (lat_trace)
- WARNING0("The GTNetS network model doesn't support latency state traces");
- if (state_trace)
- WARNING0("The GTNetS network model doesn't support link state traces");
- }
+ link_new(bprintf("%s_UP",name), bw, lat, current_property_set);
+ link_new(bprintf("%s_DOWN",name), bw, lat, current_property_set);
- /* KF: remove several arguments to network_link_new */
- network_link_new(name, bw, lat);
-}
-
-static int nb_link = 0;
-static char **link_name = NULL;
-static int src_id = -1;
-static int dst_id = -1;
-
-/* 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);
- nb_link = 0;
- link_name = NULL;
-}
-
-/* Parses a route element from the XML: UNMODIFIED BY HC */
-static void parse_route_elem(void)
-{
- nb_link++;
- link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
- link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+ }
+ else link_new(name, bw, lat, current_property_set);
+ current_property_set = NULL;
}
-/* Create the route: UNMODIFIED BY HC */
-static void parse_route_set_route(void)
+/* Create the gtnets topology based on routing strategy */
+static void create_gtnets_topology()
{
- route_new(src_id, dst_id, link_name, nb_link);
+ 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.
+
+ //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){
+ XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
+ XBT_DEBUG("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 parse_file(const char *file)
+static void define_callbacks(const char *file)
{
/* Figuring out the network links */
- surf_parse_reset_parser();
- ETag_surfxml_network_link_fun=parse_network_link;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",file);
- surf_parse_close();
-
- /* Figuring out the network cards used */
- surf_parse_reset_parser();
- STag_surfxml_route_fun=parse_route_set_endpoints;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",file);
- surf_parse_close();
-
- /* Building the routes */
- surf_parse_reset_parser();
- STag_surfxml_route_fun=parse_route_set_endpoints;
- ETag_surfxml_route_element_fun=parse_route_elem;
- ETag_surfxml_route_fun=parse_route_set_route;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",file);
- surf_parse_close();
-}
-
-static void *name_service(const char *name)
-{
- return xbt_dict_get_or_null(network_card_set, name);
-}
-
-static const char *get_resource_name(void *resource_id)
-{
- return ((network_card_GTNETS_t) resource_id)->name;
+ surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init);
+ 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_die("The resource_used feature is not implemented in GTNets model");
}
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
{
- action->using--;
- if(!action->using) {
+ action->refcount--;
+ if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
- /* KF: No explicit freeing needed for GTNeTS here */
- free(action);
+#ifdef HAVE_TRACING
+ if (action->category)
+ xbt_free(action->category);
+#endif
+ surf_action_free(&action);
+ return 1;
}
- return 1;
-}
-
-static void action_use(surf_action_t action)
-{
- action->using++;
+ return 0;
}
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;
}
-static void action_change_state(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; */
-/* } */
-
- surf_action_change_state(action, state);
- return;
+ return action->remains;
}
+static void action_state_set(surf_action_t action,
+ e_surf_action_state_t state)
+{
+ surf_action_state_set(action, state);
+}
-/* share_resources() */
static double share_resources(double now)
{
-#if 0
- s_surf_action_network_GTNETS_t s_action;
- surf_action_network_GTNETS_t action = NULL;
- xbt_swag_t running_actions = surf_network_resource->common_public->states.running_action_set;
-#endif
+ xbt_swag_t running_actions =
+ surf_network_model->states.running_action_set;
- return GTNetS_get_time_to_next_flow_completion();
-}
+ //get the first relevant value from the running_actions list
+ if (!xbt_swag_size(running_actions))
+ return -1.0;
-/* 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 */
+ 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");
+ time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion();
+ XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %lg",
+ time_to_next_flow_completion);
+
+ return time_to_next_flow_completion;
+}
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_resource->common_public->states.running_action_set;
+ surf_network_model->states.running_action_set;
- double time_to_next_flow_completion = GTNetS_get_time_to_next_flow_completion();
-
- /* 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;
}
-
- if (time_to_next_flow_completion < delta) { /* run until the first flow completes */
- void **metadata;
- int i,num_flows;
- if (GTNetS_run_until_next_flow_completion(&metadata, &num_flows)) {
- xbt_assert0(0,"Cannot run GTNetS simulation until next flow completion");
+ /* 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;
+
+ num_flows = 0;
+
+ if (gtnets_run_until_next_flow_completion(&metadata, &num_flows)) {
+ 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) {
+ 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
+ action->last_remains = action->generic_action.remains;
+#endif
+
+ //need to trust this remain value
+ if (sent == 0) {
+ action->generic_action.remains = 0;
+ } else {
+ action->generic_action.remains =
+ action->generic_action.cost - sent;
+ }
+
+ // 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_active()) {
+ 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++) {
- surf_action_t action = (surf_action_t)(metadata[i]);
+ for (i = 0; i < num_flows; i++) {
+ action = (surf_action_network_GTNETS_t) (metadata[i]);
- action->generic_action.remains = 0;
- action->generic_action.finish = now + time_to_next_flow_completion;
- action->generic_action.finish = SURF_ACTION_DONE;
- /* TODO: Anything else here? */
+
+
+ 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
}
- } else { /* run for a given number of seconds */
- if (GTNetS_run(delta)) {
- xbt_assert0(0,"Cannot run GTNetS simulation");
+
+
+ } else { /* run for a given number of seconds */
+ if (gtnets_run(delta)) {
+ xbt_die("Cannot run GTNetS simulation");
}
}
-
+
return;
}
-/* UNUSED HERE: no traces */
static void update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value)
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
- xbt_assert0(0,"Cannot update resource state for GTNetS simulation");
- return;
+ xbt_die("Cannot update model state for GTNetS simulation");
}
-/* KF: Rate not supported */
-static surf_action_t communicate(void *src, void *dst, double size, double rate)
+/* Max durations are not supported */
+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;
- network_card_GTNETS_t card_src = src;
- network_card_GTNETS_t card_dst = dst;
-/*
- int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
- network_link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
-*/
- int i;
-
-/*
- 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_GTNETS_t, 1);
-
- action->generic_action.using = 1;
- action->generic_action.cost = size;
- action->generic_action.remains = size;
- /* Max durations are not supported */
- action->generic_action.max_duration = NO_MAX_DURATION;
- action->generic_action.start = surf_get_clock();
- action->generic_action.finish = -1.0;
- action->generic_action.resource_type =
- (surf_resource_t) surf_network_resource;
-
- action->generic_action.state_set =
- surf_network_resource->common_public->states.running_action_set;
-
- xbt_swag_insert(action, action->generic_action.state_set);
-
- /* KF: Add a flow to the GTNets Simulation, associated to this action */
- if (GTNetS_create_flow(src->id, dst->id, size, (void *)action) < 0) {
- xbt_assert2(0,"Not route between host %s and host %s", card_src->name, card_dst->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_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,
+ dst_name);
+
+ xbt_dynar_t links = global_routing->get_route(src_name, dst_name);
+ route_new(src, dst, links, xbt_dynar_length(links));
+
+ 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_die("Not route between host %s and host %s", src_name, dst_name);
}
+#ifdef HAVE_TRACING
+ TRACE_surf_gtnets_communicate(action, src_name, dst_name);
+#endif
return (surf_action_t) action;
}
/* Suspend a flow() */
static void action_suspend(surf_action_t action)
{
- xbt_assert0(0,"action_suspend() not supported for the GTNets network model");
+ THROW_UNIMPLEMENTED;
}
/* Resume a flow() */
static void action_resume(surf_action_t action)
{
- xbt_assert0(0,"action_resume() not supported for the GTNets network model");
+ THROW_UNIMPLEMENTED;
}
/* Test whether a flow is suspended */
return 0;
}
-static void finalize(void)
+#ifdef HAVE_TRACING
+static void gtnets_action_set_category(surf_action_t action, const char *category)
{
- int i,j;
-
- xbt_dict_free(&network_card_set);
- xbt_dict_free(&network_link_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- ready_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- running_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- failed_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- done_action_set);
- free(surf_network_resource->common_public);
- free(surf_network_resource->common_private);
- free(surf_network_resource->extension_public);
-
- free(surf_network_resource);
- surf_network_resource = NULL;
-
-#if 0
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
- free(ROUTE(i,j));
- free(routing_table);
- routing_table = NULL;
- free(routing_table_size);
- routing_table_size = NULL;
- card_number = 0;
+ action->category = xbt_strdup (category);
+}
#endif
- /* ADDED BY KF */
- GTNetS_finalize();
- /* END ADDITION */
+static void finalize(void)
+{
+ gtnets_finalize();
}
-static void surf_network_resource_init_internal(void)
+static void surf_network_model_init_internal(void)
{
- s_surf_action_t action;
-
- surf_network_resource = xbt_new0(s_surf_network_resource_t, 1);
-
- surf_network_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_network_resource->common_public =
- xbt_new0(s_surf_resource_public_t, 1);
- surf_network_resource->extension_public =
- xbt_new0(s_surf_network_resource_extension_public_t, 1);
-
- surf_network_resource->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_network_resource->common_public->name_service = name_service;
- surf_network_resource->common_public->get_resource_name =
- get_resource_name;
- surf_network_resource->common_public->action_get_state =
- surf_action_get_state;
- surf_network_resource->common_public->action_use = action_use;
- surf_network_resource->common_public->action_free = action_free;
- surf_network_resource->common_public->action_cancel = action_cancel;
- surf_network_resource->common_public->action_recycle = action_recycle;
- surf_network_resource->common_public->action_change_state =
- action_change_state;
- surf_network_resource->common_public->action_set_data = surf_action_set_data;
- surf_network_resource->common_public->name = "network";
-
- surf_network_resource->common_private->resource_used = resource_used;
- surf_network_resource->common_private->share_resources = share_resources;
- surf_network_resource->common_private->update_actions_state =
+ surf_network_model = surf_model_init();
+
+ surf_network_model->name = "network GTNetS";
+ surf_network_model->action_unref = action_unref;
+ 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;
- surf_network_resource->common_private->update_resource_state =
+ surf_network_model->model_private->update_resource_state =
update_resource_state;
- surf_network_resource->common_private->finalize = finalize;
+ surf_network_model->model_private->finalize = finalize;
- surf_network_resource->common_public->suspend = action_suspend;
- surf_network_resource->common_public->resume = action_resume;
- surf_network_resource->common_public->is_suspended = action_is_suspended;
-
- surf_network_resource->extension_public->communicate = communicate;
-
- network_link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
+ 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
- /* HC: I am assuming that this stays in for simulation of compute tasks */
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ 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_die("Impossible to initialize GTNetS interface");
}
+
+ routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL);
}
-/* HC: I put this prototype here for now but it will have to go in
- src/include/surf.h when it is functionnal. */
-void surf_network_resource_init_GTNETS(const char *filename);
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+static int get_latency_limited(surf_action_t action)
+{
+ return 0;
+}
+#endif
-void surf_network_resource_init_GTNETS(const char *filename)
+void surf_network_model_init_GTNETS(const char *filename)
{
- if (surf_network_resource)
+ if (surf_network_model)
return;
- surf_network_resource_init_internal();
- parse_file(filename);
- xbt_dynar_push(resource_list, &surf_network_resource);
+ surf_network_model_init_internal();
+ 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);
}