#include "network_dassf_private.h"
-#define SG_TCP_CTE_GAMMA 20000.0
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
- "Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
/* surf_network_resource_t surf_network_resource = NULL; */
static xbt_dict_t network_link_set = NULL;
e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
tmgr_trace_t state_trace;
- name = xbt_strdup(A_network_link_name);
- surf_parse_get_double(&bw_initial,A_network_link_bandwidth);
- surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file);
- surf_parse_get_double(&lat_initial,A_network_link_latency);
- surf_parse_get_trace(&lat_trace, A_network_link_latency_file);
+ name = xbt_strdup(A_surfxml_network_link_name);
+ surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth);
+ surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
+ surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency);
+ surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
- xbt_assert0((A_network_link_state==A_network_link_state_ON)||
- (A_network_link_state==A_network_link_state_OFF),
- "Invalid state")
- if (A_network_link_state==A_network_link_state_ON)
+ xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)||
+ (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF),
+ "Invalid state");
+ if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON)
state_initial = SURF_NETWORK_LINK_ON;
- if (A_network_link_state==A_network_link_state_OFF)
+ if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF)
state_initial = SURF_NETWORK_LINK_OFF;
- surf_parse_get_trace(&state_trace,A_network_link_state_file);
+ surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file);
network_link_new(name, bw_initial, bw_trace,
lat_initial, lat_trace, state_initial, state_trace);
static void parse_route_set_endpoints(void)
{
- src_id = network_card_new(A_route_src);
- dst_id = network_card_new(A_route_dst);
+ src_id = network_card_new(A_surfxml_route_src);
+ dst_id = network_card_new(A_surfxml_route_dst);
nb_link = 0;
link_name = NULL;
}
{
nb_link++;
link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
- link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name);
+ link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
}
static void parse_route_set_route(void)
{
/* Figuring out the network links */
surf_parse_reset_parser();
- ETag_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);
surf_parse_close();
/* Figuring out the network cards used */
surf_parse_reset_parser();
- STag_route_fun=parse_route_set_endpoints;
+ 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_route_fun=parse_route_set_endpoints;
- ETag_route_element_fun=parse_route_elem;
- ETag_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);
surf_parse_close();