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;*/
+/* surf_network_model_t surf_network_model = NULL; */
+/*static xbt_dict_t link_set = NULL;*/
/* xbt_dict_t network_card_set = NULL; */
#if 0
static int card_number = 0;
-static network_link_GTNETS_t **routing_table = NULL;
+static link_GTNETS_t **routing_table = NULL;
static int *routing_table_size = NULL;
#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
**/
/* Free memory for a network link */
-static void network_link_free(void *nw_link)
+static void link_free(void *nw_link)
{
- free(((network_link_GTNETS_t) nw_link)->name);
+ free(((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 link_new(char *name, double bw, double lat, xbt_dict_t props)
{
static int link_count = -1;
- network_link_GTNETS_t gtnets_link;
+ 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_dict_get_or_null(link_set, name)) {
return;
}
link_count++;
/*
- nw_link->resource = (surf_resource_t) surf_network_resource;
+ nw_link->model = (surf_model_t) 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 = xbt_new0(s_link_GTNETS_t, 1);
gtnets_link->name = name;
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);
+ /* Add the properties */
+ gtnets_link->properties = current_property_set;
+
+ xbt_dict_set(link_set, name, gtnets_link, link_free);
return;
}
static void route_new(int src_id, int dst_id, char **links, int nb_link)
{
#if 0
- network_link_GTNETS_t *link_list = NULL;
+ 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));
+ xbt_new0(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]);
+ link_list[i] = xbt_dict_get_or_null(link_set, links[i]);
free(links[i]);
}
free(links);
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;
+ ((link_GTNETS_t)
+ (xbt_dict_get(link_set, links[i])))->id;
}
/* KF: Create the GTNets route */
/* KF: Build the list of gtnets link IDs */
linkid =
- ((network_link_GTNETS_t)
- (xbt_dict_get(network_link_set, links[0])))->id;
+ ((link_GTNETS_t)
+ (xbt_dict_get(link_set, links[0])))->id;
/* KF: Create the GTNets route */
if (gtnets_add_onehop_route(src_id, dst_id, linkid)) {
}
}
+
+
/* 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_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);
- state = SURF_NETWORK_LINK_ON;
+ name = xbt_strdup(A_surfxml_link_name);
+ surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
+ surf_parse_get_double(&lat, A_surfxml_link_latency);
+ state = SURF_link_ON;
/* Print values when no traces are specified */
{
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);
+ 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);
/*TODO Where is WARNING0 defined??? */
#if 0
("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);
+ /* KF: remove several arguments to link_new */
+ current_property_set = xbt_dict_new();
+ link_new(name, bw, lat, current_property_set);
}
static int nb_link = 0;
/* Main XML parsing */
static void parse_file(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 */
- /* 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();
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+ 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_element_cb_list, &parse_route_elem);
+ surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_onehop_route);
+ surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
- /* Building the one-hop 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_onehop_route;
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 ((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)
{
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;
+ surf_network_model->common_public->states.running_action_set;
#endif
return gtnets_get_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_resource->common_public->states.running_action_set;
+ surf_network_model->common_public->states.running_action_set;
#endif
double time_to_next_flow_completion =
tmgr_trace_event_t event_type,
double value)
{
- xbt_assert0(0, "Cannot update resource state for GTNetS simulation");
+ xbt_assert0(0, "Cannot update model state for GTNetS simulation");
return;
}
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);
+ link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id);
*/
/*
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.model_type =
+ (surf_model_t) surf_network_model;
action->generic_action.state_set =
- surf_network_resource->common_public->states.running_action_set;
+ surf_network_model->common_public->states.running_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
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.
+ xbt_dict_free(&link_set);
+ xbt_swag_free(surf_network_model->common_public->states.
ready_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
+ xbt_swag_free(surf_network_model->common_public->states.
running_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
+ xbt_swag_free(surf_network_model->common_public->states.
failed_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
+ xbt_swag_free(surf_network_model->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_model->common_public);
+ free(surf_network_model->common_private);
+ free(surf_network_model->extension_public);
- free(surf_network_resource);
- surf_network_resource = NULL;
+ free(surf_network_model);
+ surf_network_model = NULL;
#if 0
for (i = 0; i < card_number; i++)
/* END ADDITION */
}
-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_model = xbt_new0(s_surf_network_model_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_model->common_private =
+ xbt_new0(s_surf_model_private_t, 1);
+ surf_network_model->common_public =
+ xbt_new0(s_surf_model_public_t, 1);
+ surf_network_model->extension_public =
+ xbt_new0(s_surf_network_model_extension_public_t, 1);
- surf_network_resource->common_public->states.ready_action_set =
+ surf_network_model->common_public->states.ready_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.running_action_set =
+ surf_network_model->common_public->states.running_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.failed_action_set =
+ surf_network_model->common_public->states.failed_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.done_action_set =
+ surf_network_model->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 =
+ surf_network_model->common_public->name_service = name_service;
+ surf_network_model->common_public->get_resource_name =
get_resource_name;
- surf_network_resource->common_public->action_get_state =
+ surf_network_model->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 =
+ 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_resource->common_public->action_set_data =
+ surf_network_model->common_public->action_set_data =
surf_action_set_data;
- surf_network_resource->common_public->name = "network";
+ surf_network_model->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->common_private->resource_used = resource_used;
+ surf_network_model->common_private->share_resources = share_resources;
+ surf_network_model->common_private->update_actions_state =
update_actions_state;
- surf_network_resource->common_private->update_resource_state =
+ surf_network_model->common_private->update_resource_state =
update_resource_state;
- surf_network_resource->common_private->finalize = finalize;
+ surf_network_model->common_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_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_resource->extension_public->communicate = communicate;
+ surf_network_model->extension_public->communicate = communicate;
- network_link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
+ /*for the props of the link*/
+ surf_network_model->common_public->get_properties = get_properties;
- /* HC: I am assuming that this stays in for simulation of compute tasks */
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ link_set = xbt_dict_new();
+ network_card_set = xbt_dict_new();
/* KF: Added the initialization for GTNetS interface */
if (gtnets_initialize()) {
}
}
-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();
+ surf_network_model_init_internal();
parse_file(filename);
- xbt_dynar_push(resource_list, &surf_network_resource);
+ xbt_dynar_push(model_list, &surf_network_model);
- update_resource_description(surf_network_resource_description,
- surf_network_resource_description_size,
+ update_model_description(surf_network_model_description,
+ surf_network_model_description_size,
"GTNets",
- (surf_resource_t) surf_network_resource);
+ (surf_model_t) surf_network_model);
}
