* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_gtnets_private.h"
+#include "gtnets/gtnets_interface.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network_gtnets);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
+ "Logging specific to the SURF network module");
/* surf_network_resource_t surf_network_resource = NULL; */
-static xbt_dict_t network_link_set = NULL;
+/*static xbt_dict_t network_link_set = NULL;*/
/* xbt_dict_t network_card_set = NULL; */
/* Free memory for a network link */
static void network_link_free(void *nw_link)
{
- free(((network_link_GTNETS_t)nw_link)->name);
+ free(((network_link_GTNETS_t) nw_link)->name);
free(nw_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 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 */
*/
/* KF: Add the link to the GTNetS simulation */
- if (GTNetS_add_link(link_count, bw, lat)) {
- xbt_assert0(0,"Cannot create GTNetS link");
+ 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->name = name;
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
gtnets_link->id = link_count;
/* free the network card */
static void network_card_free(void *nw_card)
{
- free(((network_card_GTNETS_t)nw_card)->name);
+ 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)
{
- static int card_count=-1;
+ 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;
+ /* 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);
- /* KF: Increment the card counter for GTNetS */
- card_count++;
+ if (!card) {
+ /* KF: Increment the card counter for GTNetS */
+ card_count++;
- /* 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);
+ /* 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(network_card_set, name, card, network_card_free);
+ }
/* KF: just return the GTNetS ID as the SURF ID */
- return card_count;
+ return card->id;
}
/* Instantiate a new route: MODIFY BY KF */
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));
+ 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]);
#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]))
+ gtnets_links = (int *) calloc(nb_link, sizeof(int));
+ for (i = 0; i < nb_link; i++) {
+ gtnets_links[i] =
+ ((network_link_GTNETS_t)
+ (xbt_dict_get(network_link_set, links[i])))->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");
+ if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) {
+ xbt_assert0(0, "Cannot create GTNetS route");
+ }
+}
+
+/* Instantiate a new route: MODIFY BY KF */
+static void route_onehop_new(int src_id, int dst_id, char **links,
+ int nb_link)
+{
+ int linkid;
+
+ if (nb_link != 1) {
+ xbt_assert0(0, "In onehop_new, nb_link should be 1");
+ }
+
+ /* KF: Build the list of gtnets link IDs */
+ linkid =
+ ((network_link_GTNETS_t)
+ (xbt_dict_get(network_link_set, links[0])))->id;
+
+ /* KF: Create the GTNets route */
+ if (gtnets_add_onehop_route(src_id, dst_id, linkid)) {
+ xbt_assert0(0, "Cannot create GTNetS route");
}
}
e_surf_network_link_state_t state;
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);
+ 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;
/* Print values when no traces are specified */
{
tmgr_trace_t bw_trace;
- tmgr_trace_t state;
+ tmgr_trace_t state_trace;
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");
+ surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
+
+ /*TODO Where is WARNING0 defined??? */
+#if 0
+ 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");
+ 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");
+ WARNING0
+ ("The GTNetS network model doesn't support link state traces");
+#endif
}
+
/* KF: remove several arguments to network_link_new */
network_link_new(name, bw, lat);
}
link_name = NULL;
}
+/* KF*/
+static void parse_route_set_routers(void)
+{
+ int id = network_card_new(A_surfxml_router_name);
+
+ /* KF: Create the GTNets router */
+ if (gtnets_add_router(id)) {
+ xbt_assert0(0, "Cannot add GTNetS router");
+ }
+}
+
/* Parses a route element from the XML: UNMODIFIED BY HC */
static void parse_route_elem(void)
{
link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
}
-/* Create the route: UNMODIFIED BY HC */
+/* Create the route (more than one hops): MODIFIED BY KF */
static void parse_route_set_route(void)
{
- route_new(src_id, dst_id, link_name, nb_link);
+ if (nb_link > 1)
+ route_new(src_id, dst_id, link_name, nb_link);
+}
+
+/* Create the one-hope route: BY KF */
+static void parse_route_set_onehop_route(void)
+{
+ if (nb_link == 1)
+ route_onehop_new(src_id, dst_id, link_name, nb_link);
}
/* Main XML parsing */
{
/* Figuring out the network links */
surf_parse_reset_parser();
- ETag_surfxml_network_link_fun=parse_network_link;
+ ETag_surfxml_network_link_fun = parse_network_link;
surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",file);
+ xbt_assert1((!surf_parse()), "Parse error in %s", file);
surf_parse_close();
/* Figuring out the network cards used */
+ /* KF
+ 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();
+ */
+
+ /* KF: Figuring out the router (considered as part of
+ network cards) used. */
+ surf_parse_reset_parser();
+ STag_surfxml_router_fun = parse_route_set_routers;
+ surf_parse_open(file);
+ xbt_assert1((!surf_parse()), "Parse error in %s", file);
+ surf_parse_close();
+
+ /* Building the one-hop routes */
surf_parse_reset_parser();
- STag_surfxml_route_fun=parse_route_set_endpoints;
+ STag_surfxml_route_fun = parse_route_set_endpoints;
+ ETag_surfxml_route_element_fun = parse_route_elem;
+ ETag_surfxml_route_fun = parse_route_set_onehop_route;
surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",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;
+ 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);
+ xbt_assert1((!surf_parse()), "Parse error in %s", file);
surf_parse_close();
}
/* We do not care about this: only used for traces */
static int resource_used(void *resource_id)
{
- return 0; /* We don't care */
+ return 0; /* We don't care */
}
static int action_free(surf_action_t action)
{
action->using--;
- if(!action->using) {
+ if (!action->using) {
xbt_swag_remove(action, action->state_set);
/* KF: No explicit freeing needed for GTNeTS here */
free(action);
+ return 1;
}
- return 1;
+ return 0;
}
static void action_use(surf_action_t action)
static void action_cancel(surf_action_t action)
{
- xbt_assert0(0,"Cannot cancel GTNetS flow");
+ xbt_assert0(0, "Cannot cancel GTNetS flow");
return;
}
static void action_recycle(surf_action_t action)
{
- xbt_assert0(0,"Cannot recycle GTNetS flow");
+ xbt_assert0(0, "Cannot recycle GTNetS flow");
return;
}
#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;
+ xbt_swag_t running_actions =
+ surf_network_resource->common_public->states.running_action_set;
#endif
- return GTNetS_get_time_to_next_flow_completion();
+ return gtnets_get_time_to_next_flow_completion();
}
/* delta: by how many time units the simulation must advance */
static void update_actions_state(double now, double delta)
{
+#if 0
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;
+#endif
+
+ double time_to_next_flow_completion =
+ gtnets_get_time_to_next_flow_completion();
- double time_to_next_flow_completion = GTNetS_get_time_to_next_flow_completion();
-
/* If there are no renning 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");
+ /*KF: 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_assert0(0,
+ "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_assert0(0,
+ "GTNetS simulation couldn't find a flow that would complete");
}
- for (i=0; i<num_flows; i++) {
- surf_action_t action = (surf_action_t)(metadata[i]);
+ for (i = 0; i < num_flows; i++) {
+ surf_action_network_GTNETS_t 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;
+ action->generic_action.finish = now + time_to_next_flow_completion;
+ action_change_state((surf_action_t) action, SURF_ACTION_DONE);
/* TODO: Anything else here? */
}
- } 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_assert0(0, "Cannot run GTNetS simulation");
}
}
-
+
return;
}
tmgr_trace_event_t event_type,
double value)
{
- xbt_assert0(0,"Cannot update resource state for GTNetS simulation");
+ xbt_assert0(0, "Cannot update resource state for GTNetS simulation");
return;
}
/* KF: Rate not supported */
-static surf_action_t communicate(void *src, void *dst, double size, double rate)
+static surf_action_t communicate(void *src, void *dst, double size,
+ double rate)
{
surf_action_network_GTNETS_t action = NULL;
network_card_GTNETS_t card_src = src;
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.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.start = surf_get_clock();
+ action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_network_resource;
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);
+ 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);
}
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");
+ xbt_assert0(0,
+ "action_suspend() not supported for the GTNets network model");
}
/* Resume a flow() */
static void action_resume(surf_action_t action)
{
- xbt_assert0(0,"action_resume() not supported for the GTNets network model");
+ xbt_assert0(0,
+ "action_resume() not supported for the GTNets network model");
}
/* Test whether a flow is suspended */
static void finalize(void)
{
- int i,j;
-
+#if 0
+ int i, j;
+#endif
xbt_dict_free(&network_card_set);
xbt_dict_free(&network_link_set);
xbt_swag_free(surf_network_resource->common_public->states.
surf_network_resource = NULL;
#if 0
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
- free(ROUTE(i,j));
+ 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);
#endif
/* ADDED BY KF */
- GTNetS_finalize();
+ gtnets_finalize();
/* END ADDITION */
}
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->action_set_data =
+ surf_action_set_data;
surf_network_resource->common_public->name = "network";
surf_network_resource->common_private->resource_used = resource_used;
xbt_assert0(maxmin_system, "surf_init has to be called first!");
/* KF: Added the initialization for GTNetS interface */
- if (GTNetS_initialize()) {
+ if (gtnets_initialize()) {
xbt_assert0(0, "impossible to initialize GTNetS interface");
}
}
-/* 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);
-
void surf_network_resource_init_GTNETS(const char *filename)
{
if (surf_network_resource)
surf_network_resource_init_internal();
parse_file(filename);
xbt_dynar_push(resource_list, &surf_network_resource);
+
+ update_resource_description(surf_network_resource_description,
+ surf_network_resource_description_size,
+ "GTNets",
+ (surf_resource_t) surf_network_resource);
}
