-/* $Id$ */
-
/* Copyright (c) 2005 Henri Casanova. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "network_gtnets_private.h"
#include "gtnets/gtnets_interface.h"
#include "xbt/str.h"
+#include "surf_private.h"
+#include "surf/datatypes.h"
+
+/* ************************************************************************** */
+/* *************************** FULL ROUTING ********************************* */
+typedef struct {
+ s_routing_t generic_routing;
+ xbt_dynar_t *routing_table;
+ void *loopback;
+ size_t size_of_link;
+} s_routing_full_t,*routing_full_t;
static double time_to_next_flow_completion = -1;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
- "Logging specific to the SURF network module");
+ "Logging specific to the SURF network GTNetS module");
+
+extern routing_t used_routing;
/** QUESTIONS for GTNetS integration
** 1. Check that we did the right thing with name_service and get_resource_name
static int src_id = -1;
static int dst_id = -1;
-/* Free memory for a network link */
-static void link_free(void *nw_link)
-{
- free(((network_link_GTNETS_t) nw_link)->name);
- xbt_dict_free(&(((network_link_GTNETS_t) nw_link)->properties));
- free(nw_link);
-}
-
/* Instantiate a new network link */
/* name: some name for the link, from the XML */
/* bw: The bandwidth value */
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(link_set, name)) {
+ if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
return;
}
link_count++;
/*
- nw_link->model = (surf_model_t) surf_network_model;
+ nw_link->model = surf_network_model;
nw_link->name = name;
nw_link->bw_current = bw_initial;
if (bw_trace)
/* KF: Insert entry in the dictionary */
gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
- gtnets_link->name = name;
+ 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;
- /* Add the properties */
- gtnets_link->properties = props;
- xbt_dict_set(link_set, name, gtnets_link, link_free);
+ xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
+ surf_resource_free);
return;
}
-/* free the network card */
-static void network_card_free(void *nw_card)
-{
- free(((network_card_GTNETS_t) nw_card)->name);
- free(nw_card);
-}
-
/* Instantiate a new network card: MODIFYED BY KF */
static int network_card_new(const char *name)
{
XBT_IN1("(%s)", name);
/* KF: Check that we haven't seen the network card before */
- network_card_GTNETS_t card = xbt_dict_get_or_null(network_card_set, name);
+ network_card_GTNETS_t card =
+ surf_model_resource_by_name(surf_network_model, name);
if (!card) {
/* KF: Increment the card counter for GTNetS */
card = xbt_new0(s_network_card_GTNETS_t, 1);
card->name = xbt_strdup(name);
card->id = card_count;
- xbt_dict_set(network_card_set, name, card, network_card_free);
+ xbt_dict_set(surf_model_resource_set(surf_network_model), name, card,
+ surf_resource_free);
}
LOG1(xbt_log_priority_trace, " return %d", card->id);
}
}
+/* Read hosts using a full-fledged topollogy */
+static void routing_full_parse_Shost(void) {
+ int *val = xbt_malloc(sizeof(int));
+ DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);
+ *val = used_routing->host_count++;
+ xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
+}
/* Parse the XML for a network link */
char *name;
double bw;
double lat;
- e_surf_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_LINK_ON;
+ state = SURF_RESOURCE_ON;
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");
char *name;
if (src_id != -1 && dst_id != -1) {
name = bprintf("%x#%x", src_id, dst_id);
+ DEBUG0("Calling manage route with route_action=");
+ switch (route_action) {
+ case A_surfxml_route_action_PREPEND:
+ DEBUG0("PREPEND");
+ break;
+ case A_surfxml_route_action_POSTPEND:
+ DEBUG0("POSTPEND");
+ break;
+ case A_surfxml_route_action_OVERRIDE:
+ DEBUG0("OVERRIDE");
+ break;
+ default:break;
+ }
manage_route(route_table, name, route_action, 0);
+
+ DEBUG2("Setting a route from NIC %d to NIC %d", src_id, dst_id);
free(name);
}
}
xbt_dynar_foreach(links, cpt, link) {
TRY {
- link_list[nb_link++] = xbt_dict_get(link_set, link);
+ 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)
+ if (nb_link == 1){
+ DEBUG0("Calling a one link route");
route_onehop_new(src_id, dst_id, link_list, nb_link);
+ }
}
xbt_dict_foreach(route_table, cursor, key, data) {
xbt_dynar_foreach(links, cpt, link) {
TRY {
- link_list[nb_link++] = xbt_dict_get(link_set, link);
+ 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);
}
xbt_dict_free(&route_table);
- gtnets_print_topology();
+ if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
+ gtnets_print_topology();
+ }
XBT_OUT;
}
/* Main XML parsing */
static void define_callbacks(const char *file)
{
+ routing_full_t routing = xbt_new0(s_routing_full_t,1);
+ routing->generic_routing.name = "Full";
+ routing->generic_routing.host_count = 0;
+ routing->generic_routing.host_id = xbt_dict_new();
+ used_routing = (routing_t) routing;
+ surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
+
surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers);
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);
-}
-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;
-}
-
-static xbt_dict_t get_properties(void *link)
-{
- return ((network_card_GTNETS_t) link)->properties;
-}
-
-
/* We do not care about this: only used for traces */
static int resource_used(void *resource_id)
{
return 0; /* We don't care */
}
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
{
action->refcount--;
if (!action->refcount) {
return 0;
}
-static void action_use(surf_action_t action)
-{
- action->refcount++;
-}
-
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)
+{
+ return action->remains;
+}
+
+static void action_state_set(surf_action_t action,
+ e_surf_action_state_t state)
{
/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
/* if(((surf_action_network_GTNETS_t)action)->variable) { */
/* ((surf_action_network_GTNETS_t)action)->variable = NULL; */
/* } */
- surf_action_change_state(action, state);
+ surf_action_state_set(action, state);
return;
}
/* share_resources() */
static double share_resources(double now)
{
- xbt_swag_t running_actions =
- surf_network_model->common_public.states.running_action_set;
+ xbt_swag_t running_actions = surf_network_model->states.running_action_set;
//get the first relevant value from the running_actions list
if (!xbt_swag_size(running_actions))
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;
}
{
surf_action_network_GTNETS_t action = NULL;
// surf_action_network_GTNETS_t next_action = NULL;
- xbt_swag_t running_actions =
- surf_network_model->common_public.states.running_action_set;
+ xbt_swag_t running_actions = surf_network_model->states.running_action_set;
/* If there are no renning flows, just return */
if (time_to_next_flow_completion < 0.0) {
action = (surf_action_network_GTNETS_t) (metadata[i]);
action->generic_action.finish = now + time_to_next_flow_completion;
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ action_state_set((surf_action_t) action, SURF_ACTION_DONE);
DEBUG1("----> Action (%p) just terminated", action);
}
}
/* 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,
+ int src, int dst, double size, double rate)
{
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);
-*/
-
-/*
- 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.refcount = 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.model_type = (surf_model_t) surf_network_model;
+ DEBUG4("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst, dst_name);
- action->generic_action.state_set =
- surf_network_model->common_public.states.running_action_set;
-
- xbt_swag_insert(action, action->generic_action.state_set);
+ action =
+ surf_action_new(sizeof(s_surf_action_network_GTNETS_t), size,
+ surf_network_model, 0);
/* KF: Add a flow to the GTNets Simulation, associated to this action */
- if (gtnets_create_flow(card_src->id, card_dst->id, size, (void *) action)
- < 0) {
- xbt_assert2(0, "Not route between host %s and host %s", card_src->name,
- card_dst->name);
+ 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);
}
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 */
static void finalize(void)
{
- xbt_dict_free(&network_card_set);
- xbt_dict_free(&link_set);
-
- surf_model_exit((surf_model_t)surf_network_model);
+ xbt_dict_free(&surf_network_model->resource_set);
- free(surf_network_model->extension_public);
+ surf_model_exit(surf_network_model);
free(surf_network_model);
surf_network_model = NULL;
static void surf_network_model_init_internal(void)
{
- s_surf_action_t action;
-
- surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
- surf_model_init((surf_model_t)surf_network_model);
-
- surf_network_model->extension_public =
- xbt_new0(s_surf_network_model_extension_public_t, 1);
-
- surf_network_model->common_public.name_service = name_service;
- surf_network_model->common_public.get_resource_name = get_resource_name;
- surf_network_model->common_public.action_get_state = surf_action_get_state;
- surf_network_model->common_public.action_use = action_use;
- surf_network_model->common_public.action_free = action_free;
- surf_network_model->common_public.action_cancel = action_cancel;
- surf_network_model->common_public.action_recycle = action_recycle;
- surf_network_model->common_public.action_change_state =
- action_change_state;
- surf_network_model->common_public.action_set_data = surf_action_set_data;
- surf_network_model->common_public.name = "network";
-
- surf_network_model->common_private->resource_used = resource_used;
- surf_network_model->common_private->share_resources = share_resources;
- surf_network_model->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_model->common_private->update_resource_state =
+ surf_network_model->model_private->update_resource_state =
update_resource_state;
- surf_network_model->common_private->finalize = finalize;
-
- surf_network_model->common_public.suspend = action_suspend;
- surf_network_model->common_public.resume = action_resume;
- surf_network_model->common_public.is_suspended = action_is_suspended;
+ surf_network_model->model_private->finalize = finalize;
- surf_network_model->extension_public->communicate = communicate;
+ surf_network_model->suspend = action_suspend;
+ surf_network_model->resume = action_resume;
+ surf_network_model->is_suspended = action_is_suspended;
- /*for the props of the link */
- surf_network_model->common_public.get_properties = get_properties;
-
- link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
+ 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");
}
+
}
#ifdef HAVE_GTNETS
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,
- "GTNets", (surf_model_t) surf_network_model);
+ "GTNets", surf_network_model);
}
#endif
