-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "surf/surfxml_parse_private.h"
#include "surf/surf_private.h"
-hostSG_t struct_host;
-router_t struct_router;
-cluster_t struct_cluster;
-peer_t struct_peer;
-link_t struct_lnk;
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
#undef CLEANUP
#include "simgrid_dtd.c"
-char *platform_filename;
-
-/* Initialize the parsing globals */
-xbt_dict_t traces_set_list = NULL;
-xbt_dict_t trace_connect_list_host_avail = NULL;
-xbt_dict_t trace_connect_list_power = NULL;
-xbt_dict_t trace_connect_list_link_avail = NULL;
-xbt_dict_t trace_connect_list_bandwidth = NULL;
-xbt_dict_t trace_connect_list_latency = NULL;
-
-/* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the foreach tag */
-static xbt_dynar_t surfxml_bufferstack_stack = NULL;
-int surfxml_bufferstack_size = 2048;
-
-static char *old_buff = NULL;
-static void surf_parse_error(char *msg);
-
-unsigned int surfxml_buffer_stack_stack_ptr;
-unsigned int surfxml_buffer_stack_stack[1024];
-
+/*
+ * Helping functions
+ */
+void surf_parse_error(const char *msg) {
+ xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
+}
-void surfxml_bufferstack_push(int new)
-{
- if (!new)
- old_buff = surfxml_bufferstack;
- else {
- xbt_dynar_push(surfxml_bufferstack_stack, &surfxml_bufferstack);
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- }
+double surf_parse_get_double(const char *string) {
+ double res;
+ int ret = sscanf(string, "%lg", &res);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not a double", string));
+ return res;
}
-void surfxml_bufferstack_pop(int new)
-{
- if (!new)
- surfxml_bufferstack = old_buff;
- else {
- free(surfxml_bufferstack);
- xbt_dynar_pop(surfxml_bufferstack_stack, &surfxml_bufferstack);
- }
+int surf_parse_get_int(const char *string) {
+ int res;
+ int ret = sscanf(string, "%d", &res);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not an integer", string));
+ return res;
}
-/* make sure these symbols are defined as strong ones in this file so that the linked can resolve them */
-xbt_dynar_t STag_surfxml_platform_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_platform_cb_list = NULL;
-xbt_dynar_t STag_surfxml_host_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_host_cb_list = NULL;
-xbt_dynar_t STag_surfxml_router_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_router_cb_list = NULL;
-xbt_dynar_t STag_surfxml_link_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_link_cb_list = NULL;
+
+/*
+ * All the callback lists that can be overiden anywhere.
+ * (this list should probably be reduced to the bare minimum to allow the models to work)
+ */
+
+/* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
xbt_dynar_t STag_surfxml_route_cb_list = NULL;
xbt_dynar_t ETag_surfxml_route_cb_list = NULL;
xbt_dynar_t STag_surfxml_link_ctn_cb_list = NULL;
xbt_dynar_t ETag_surfxml_trace_connect_cb_list = NULL;
xbt_dynar_t STag_surfxml_random_cb_list = NULL;
xbt_dynar_t ETag_surfxml_random_cb_list = NULL;
-xbt_dynar_t STag_surfxml_AS_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_AS_cb_list = NULL;
xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL;
xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL;
xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL;
xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL;
-xbt_dynar_t STag_surfxml_config_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_config_cb_list = NULL;
xbt_dynar_t STag_surfxml_include_cb_list = NULL;
xbt_dynar_t ETag_surfxml_include_cb_list = NULL;
-/* store the current property set for any tag */
+/* The default current property receiver. Setup in the corresponding opening callbacks. */
xbt_dict_t current_property_set = NULL;
/* dictionary of random generator data */
xbt_dict_t random_data_list = NULL;
+/* Call all the callbacks of a specific SAX event */
static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t);
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
-static void surf_parse_error(char *msg);
-
-static void parse_Stag_trace(void);
-static void parse_Etag_trace(void);
-static void parse_Stag_trace_connect(void);
-
static void init_randomness(void);
static void add_randomness(void);
+/*
+ * Stuff relative to the <include> tag
+ */
+
static xbt_dynar_t surf_input_buffer_stack = NULL;
static xbt_dynar_t surf_file_to_parse_stack = NULL;
fflush(NULL);
}
-void ETag_surfxml_include(void)
-{
-// XBT_INFO("ETag_surfxml_include '%s'",A_surfxml_include_file);
-// fflush(NULL);
-// fclose(surf_file_to_parse);
-// xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); // restore old filename
-// surf_parse_pop_buffer_state();
-// xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+void ETag_surfxml_include(void) {
+/* Nothing to do when done with reading the include tag.
+ * Instead, the handling should be deferred until the EOF of current buffer -- see below */
}
-/*
- * Return 1 if tag include is opened
+/** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes
+ *
+ * This function is called automatically by sedding the parser in buildtools/Cmake/MaintainerMode.cmake
+ * Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the
+ * previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the
+ * error message in that case.
+ *
+ * Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
+ * directly: a command line flag could instruct it to do the correct thing when #include is encountered
+ * on a line.
*/
int ETag_surfxml_include_state(void)
{
void surf_parse_init_callbacks(void)
{
- STag_surfxml_platform_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_platform_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ sg_platf_init(); // FIXME: move to a proper place?
+
STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_link_ctn_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_ASroute_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_ASroute_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_peer_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_config_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_config_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_include_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_include_cb_list =
void surf_parse_free_callbacks(void)
{
- xbt_dynar_free(&STag_surfxml_platform_cb_list);
- xbt_dynar_free(&ETag_surfxml_platform_cb_list);
- xbt_dynar_free(&STag_surfxml_host_cb_list);
- xbt_dynar_free(&ETag_surfxml_host_cb_list);
- xbt_dynar_free(&STag_surfxml_router_cb_list);
- xbt_dynar_free(&ETag_surfxml_router_cb_list);
- xbt_dynar_free(&STag_surfxml_link_cb_list);
- xbt_dynar_free(&ETag_surfxml_link_cb_list);
+ sg_platf_exit(); // FIXME: better place?
+
xbt_dynar_free(&STag_surfxml_route_cb_list);
xbt_dynar_free(&ETag_surfxml_route_cb_list);
xbt_dynar_free(&STag_surfxml_link_ctn_cb_list);
xbt_dynar_free(&ETag_surfxml_trace_connect_cb_list);
xbt_dynar_free(&STag_surfxml_random_cb_list);
xbt_dynar_free(&ETag_surfxml_random_cb_list);
- xbt_dynar_free(&STag_surfxml_AS_cb_list);
- xbt_dynar_free(&ETag_surfxml_AS_cb_list);
xbt_dynar_free(&STag_surfxml_ASroute_cb_list);
xbt_dynar_free(&ETag_surfxml_ASroute_cb_list);
xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list);
xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
xbt_dynar_free(&STag_surfxml_peer_cb_list);
xbt_dynar_free(&ETag_surfxml_peer_cb_list);
- xbt_dynar_free(&STag_surfxml_config_cb_list);
- xbt_dynar_free(&ETag_surfxml_config_cb_list);
xbt_dynar_free(&STag_surfxml_include_cb_list);
xbt_dynar_free(&ETag_surfxml_include_cb_list);
}
/* Stag and Etag parse functions */
+void ETag_surfxml_router(void) { /* ignored -- do not add content here */ }
-void STag_surfxml_platform(void)
-{
- double version = 0.0;
-
- sscanf(A_surfxml_platform_version, "%lg", &version);
+void STag_surfxml_platform(void) {
+ _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"You're using an ancient XML file.\n"
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.");
- surfxml_call_cb_functions(STag_surfxml_platform_cb_list);
-
+ sg_platf_begin();
+}
+void ETag_surfxml_platform(void){
+ sg_platf_end();
}
void STag_surfxml_host(void){
-// XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id);
- struct_host = xbt_new0(s_hostSG_t, 1);
- struct_host->V_host_id = xbt_strdup(A_surfxml_host_id);
- struct_host->V_host_power_peak = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&(struct_host->V_host_power_scale), A_surfxml_host_availability);
- surf_parse_get_int(&(struct_host->V_host_core),A_surfxml_host_core);
- struct_host->V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
- struct_host->V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file);
+ s_sg_platf_host_cbarg_t host;
+ memset(&host,0,sizeof(host));
+
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ host.properties = current_property_set = xbt_dict_new();
+
+ host.id = A_surfxml_host_id;
+ host.power_peak = get_cpu_power(A_surfxml_host_power);
+ host.power_scale = surf_parse_get_double( A_surfxml_host_availability);
+ host.core_amount = surf_parse_get_int(A_surfxml_host_core);
+ host.power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
+ host.state_trace = tmgr_trace_new(A_surfxml_host_state_file);
xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
(A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
if (A_surfxml_host_state == A_surfxml_host_state_ON)
- struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+ host.initial_state = SURF_RESOURCE_ON;
if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- struct_host->V_host_state_initial = SURF_RESOURCE_OFF;
- struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
+ host.initial_state = SURF_RESOURCE_OFF;
+ host.coord = A_surfxml_host_coordinates;
- surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+ sg_platf_new_host(&host);
}
-void ETag_surfxml_host(void){
- surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
- //xbt_free(struct_host->V_host_id);
- struct_host->V_host_power_peak = 0.0;
- struct_host->V_host_core = 0;
- struct_host->V_host_power_scale = 0.0;
- struct_host->V_host_state_initial = SURF_RESOURCE_ON;
- struct_host->V_host_power_trace = NULL;
- struct_host->V_host_state_trace = NULL;
- xbt_free(struct_host->V_host_coord);
- //xbt_free(host);
+void ETag_surfxml_host(void) {
+ current_property_set = NULL;
}
void STag_surfxml_router(void){
- struct_router = xbt_new0(s_router_t, 1);
- struct_router->V_router_id = xbt_strdup(A_surfxml_router_id);
- struct_router->V_router_coord = xbt_strdup(A_surfxml_router_coordinates);
- surfxml_call_cb_functions(STag_surfxml_router_cb_list);
-}
-void ETag_surfxml_router(void){
- surfxml_call_cb_functions(ETag_surfxml_router_cb_list);
- xbt_free(struct_router->V_router_id);
- xbt_free(struct_router->V_router_coord);
- xbt_free(struct_router);
+ s_sg_platf_router_cbarg_t router;
+ memset(&router, 0, sizeof(router));
+
+ router.id = A_surfxml_router_id;
+ router.coord = A_surfxml_router_coordinates;
+
+ sg_platf_new_router(&router);
}
void STag_surfxml_cluster(void){
- struct_cluster = xbt_new0(s_cluster_t, 1);
- struct_cluster->V_cluster_id = xbt_strdup(A_surfxml_cluster_id);
- struct_cluster->V_cluster_prefix = xbt_strdup(A_surfxml_cluster_prefix);
- struct_cluster->V_cluster_suffix = xbt_strdup(A_surfxml_cluster_suffix);
- struct_cluster->V_cluster_radical = xbt_strdup(A_surfxml_cluster_radical);
- struct_cluster->S_cluster_power = xbt_strdup(A_surfxml_cluster_power);
- struct_cluster->S_cluster_core = xbt_strdup(A_surfxml_cluster_core);
- struct_cluster->S_cluster_bw = xbt_strdup(A_surfxml_cluster_bw);
- struct_cluster->S_cluster_lat = xbt_strdup(A_surfxml_cluster_lat);
- struct_cluster->S_cluster_bb_bw = xbt_strdup(A_surfxml_cluster_bb_bw);
- struct_cluster->S_cluster_bb_lat = xbt_strdup(A_surfxml_cluster_bb_lat);
- if(!strcmp(A_surfxml_cluster_router_id,""))
- struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s",
- struct_cluster->V_cluster_prefix,
- struct_cluster->V_cluster_id,
- struct_cluster->V_cluster_suffix);
- else
- struct_cluster->S_cluster_router_id = xbt_strdup(A_surfxml_cluster_router_id);
-
- struct_cluster->V_cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
- struct_cluster->V_cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
+ struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1);
+ struct_cluster->id = A_surfxml_cluster_id;
+ struct_cluster->prefix = A_surfxml_cluster_prefix;
+ struct_cluster->suffix = A_surfxml_cluster_suffix;
+ struct_cluster->radical = A_surfxml_cluster_radical;
+ struct_cluster->power= surf_parse_get_double(A_surfxml_cluster_power);
+ struct_cluster->core_amount = surf_parse_get_int(A_surfxml_cluster_core);
+ struct_cluster->bw = surf_parse_get_double(A_surfxml_cluster_bw);
+ struct_cluster->lat = surf_parse_get_double(A_surfxml_cluster_lat);
+ if(strcmp(A_surfxml_cluster_bb_bw,""))
+ struct_cluster->bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
+ if(strcmp(A_surfxml_cluster_bb_lat,""))
+ struct_cluster->bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
+ struct_cluster->router_id = A_surfxml_cluster_router_id;
+
+ switch (AX_surfxml_cluster_sharing_policy) {
+ case A_surfxml_cluster_sharing_policy_SHARED:
+ struct_cluster->sharing_policy = SURF_LINK_SHARED;
+ break;
+ case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
+ struct_cluster->sharing_policy = SURF_LINK_FULLDUPLEX;
+ break;
+ case A_surfxml_cluster_sharing_policy_FATPIPE:
+ struct_cluster->sharing_policy = SURF_LINK_FATPIPE;
+ break;
+ default:
+ surf_parse_error(bprintf
+ ("Invalid cluster sharing policy for cluster %s",
+ struct_cluster->id));
+ break;
+ }
+ switch (AX_surfxml_cluster_bb_sharing_policy) {
+ case A_surfxml_cluster_bb_sharing_policy_FATPIPE:
+ struct_cluster->bb_sharing_policy = SURF_LINK_FATPIPE;
+ break;
+ case A_surfxml_cluster_bb_sharing_policy_SHARED:
+ struct_cluster->bb_sharing_policy = SURF_LINK_SHARED;
+ break;
+ default:
+ surf_parse_error(bprintf
+ ("Invalid bb sharing policy in cluster %s",
+ struct_cluster->id));
+ break;
+ }
+
+ struct_cluster->availability_trace = A_surfxml_cluster_availability_file;
+ struct_cluster->state_trace = A_surfxml_cluster_state_file;
surfxml_call_cb_functions(STag_surfxml_cluster_cb_list);
}
void ETag_surfxml_cluster(void){
surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list);
- xbt_free(struct_cluster->V_cluster_id);
- xbt_free(struct_cluster->V_cluster_prefix);
- xbt_free(struct_cluster->V_cluster_suffix);
- xbt_free(struct_cluster->V_cluster_radical);
- xbt_free(struct_cluster->S_cluster_power);
- xbt_free(struct_cluster->S_cluster_core);
- xbt_free(struct_cluster->S_cluster_bw);
- xbt_free(struct_cluster->S_cluster_lat);
- xbt_free(struct_cluster->S_cluster_bb_bw);
- xbt_free(struct_cluster->S_cluster_bb_lat);
- xbt_free(struct_cluster->S_cluster_router_id);
- struct_cluster->V_cluster_sharing_policy = 0;
- struct_cluster->V_cluster_bb_sharing_policy = 0;
xbt_free(struct_cluster);
}
void STag_surfxml_peer(void){
- struct_peer = xbt_new0(s_peer_t, 1);
- struct_peer->V_peer_id = xbt_strdup(A_surfxml_peer_id);
- struct_peer->V_peer_power = xbt_strdup(A_surfxml_peer_power);
- struct_peer->V_peer_bw_in = xbt_strdup(A_surfxml_peer_bw_in);
- struct_peer->V_peer_bw_out = xbt_strdup(A_surfxml_peer_bw_out);
- struct_peer->V_peer_lat = xbt_strdup(A_surfxml_peer_lat);
- struct_peer->V_peer_coord = xbt_strdup(A_surfxml_peer_coordinates);
- struct_peer->V_peer_availability_trace = xbt_strdup(A_surfxml_peer_availability_file);
- struct_peer->V_peer_state_trace = xbt_strdup(A_surfxml_peer_state_file);
+ s_sg_platf_peer_cbarg_t peer;
+ memset(&peer,0,sizeof(peer));
+ peer.id = A_surfxml_peer_id;
+ peer.power = surf_parse_get_double(A_surfxml_peer_power);
+ peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
+ peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
+ peer.lat = surf_parse_get_double(A_surfxml_peer_lat);
+ peer.coord = A_surfxml_peer_coordinates;
+ peer.availability_trace = tmgr_trace_new(A_surfxml_peer_availability_file);
+ peer.state_trace = tmgr_trace_new(A_surfxml_peer_state_file);
+
surfxml_call_cb_functions(STag_surfxml_peer_cb_list);
+ sg_platf_new_peer(&peer);
}
void ETag_surfxml_peer(void){
- surfxml_call_cb_functions(ETag_surfxml_peer_cb_list);
- xbt_free(struct_peer->V_peer_id);
- xbt_free(struct_peer->V_peer_power);
- xbt_free(struct_peer->V_peer_bw_in);
- xbt_free(struct_peer->V_peer_bw_out);
- xbt_free(struct_peer->V_peer_lat);
- xbt_free(struct_peer->V_peer_coord);
- xbt_free(struct_peer->V_peer_availability_trace);
- xbt_free(struct_peer->V_peer_state_trace);
- xbt_free(struct_peer);
+ /* nothing to do here */
}
void STag_surfxml_link(void){
- struct_lnk = xbt_new0(s_link_t, 1);
- struct_lnk->V_link_id = xbt_strdup(A_surfxml_link_id);
- surf_parse_get_double(&(struct_lnk->V_link_bandwidth),A_surfxml_link_bandwidth);
- struct_lnk->V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file);
- surf_parse_get_double(&(struct_lnk->V_link_latency),A_surfxml_link_latency);
- struct_lnk->V_link_latency_file = tmgr_trace_new(A_surfxml_link_latency_file);
- xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) ||
- (A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state");
- if (A_surfxml_link_state == A_surfxml_link_state_ON)
- struct_lnk->V_link_state = SURF_RESOURCE_ON;
- if (A_surfxml_link_state == A_surfxml_link_state_OFF)
- struct_lnk->V_link_state = SURF_RESOURCE_OFF;
- struct_lnk->V_link_state_file = tmgr_trace_new(A_surfxml_link_state_file);
- struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy;
-
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
- struct_lnk->V_policy_initial_link = SURF_LINK_SHARED;
- else
- {
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
- struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE;
- else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
- struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+ s_sg_platf_link_cbarg_t link;
+ memset(&link,0,sizeof(link));
+
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ link.properties = current_property_set = xbt_dict_new();
+
+ link.id = A_surfxml_link_id;
+ link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
+ link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
+ link.latency = surf_parse_get_double(A_surfxml_link_latency);
+ link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);
+
+ switch (A_surfxml_link_state) {
+ case A_surfxml_link_state_ON:
+ link.state = SURF_RESOURCE_ON;
+ break;
+ case A_surfxml_link_state_OFF:
+ link.state = SURF_RESOURCE_OFF;
+ break;
+ default:
+ surf_parse_error(bprintf("invalid state for link %s",link.id));
+ }
+ link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
+
+ switch (A_surfxml_link_sharing_policy) {
+ case A_surfxml_link_sharing_policy_SHARED:
+ link.policy = SURF_LINK_SHARED;
+ break;
+ case A_surfxml_link_sharing_policy_FATPIPE:
+ link.policy = SURF_LINK_FATPIPE;
+ break;
+ case A_surfxml_link_sharing_policy_FULLDUPLEX:
+ link.policy = SURF_LINK_FULLDUPLEX;
+ break;
+ default:
+ surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
}
-
- surfxml_call_cb_functions(STag_surfxml_link_cb_list);
+ sg_platf_new_link(&link);
}
void ETag_surfxml_link(void){
- surfxml_call_cb_functions(ETag_surfxml_link_cb_list);
- xbt_free(struct_lnk->V_link_id);
- struct_lnk->V_link_bandwidth = 0;
- struct_lnk->V_link_bandwidth_file = NULL;
- struct_lnk->V_link_latency = 0;
- struct_lnk->V_link_latency_file = NULL;
- struct_lnk->V_link_state = SURF_RESOURCE_ON;
- struct_lnk->V_link_state_file = NULL;
- struct_lnk->V_link_sharing_policy = 0;
- xbt_free(struct_lnk);
+ current_property_set = NULL;
}
void STag_surfxml_route(void){
surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
- surfxml_call_cb_functions(STag_surfxml_AS_cb_list);
+ sg_platf_new_AS_begin(A_surfxml_AS_id,A_surfxml_AS_routing);
+}
+void ETag_surfxml_AS(void){
+ sg_platf_new_AS_end();
}
void STag_surfxml_ASroute(void){
surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list);
}
void STag_surfxml_config(void){
- surfxml_call_cb_functions(STag_surfxml_config_cb_list);
+ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ current_property_set = xbt_dict_new();
+
+}
+void ETag_surfxml_config(void){
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+ char *cfg;
+ xbt_dict_foreach(current_property_set, cursor, key, elem) {
+ cfg = bprintf("%s:%s",key,elem);
+ if(xbt_cfg_is_default_value(_surf_cfg_set, key))
+ xbt_cfg_set_parse(_surf_cfg_set, cfg);
+ else
+ XBT_INFO("The custom configuration '%s' is already defined by user!",key);
+ free(cfg);
+ }
+ XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
+ xbt_dict_free(¤t_property_set);
}
void STag_surfxml_random(void){
surfxml_call_cb_functions(STag_surfxml_random_cb_list);
#define parse_method(type,name) \
void type##Tag_surfxml_##name(void) \
{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }
-parse_method(E, platform);
parse_method(E, route);
parse_method(E, link_ctn);
parse_method(E, process);
parse_method(E, trace);
parse_method(E, trace_connect);
parse_method(E, random);
-parse_method(E, AS);
parse_method(E, ASroute);
parse_method(E, bypassRoute);
-parse_method(E, config);
/* Open and Close parse file */
if (!file) {
if (!warned) {
XBT_WARN
- ("Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.");
+ ("Bypassing the XML parser since surf_parse_open received a NULL pointer. "
+ "If it is not what you want, go fix your code.");
warned = 1;
}
return;
}
if (!surf_input_buffer_stack)
- surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL);
+ surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL);
if (!surf_file_to_parse_stack)
- surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
+ surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
surf_file_to_parse = surf_fopen(file, "r");
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file);
void surf_parse_close(void)
{
- if (surf_input_buffer_stack)
- xbt_dynar_free(&surf_input_buffer_stack);
- if (surf_file_to_parse_stack)
- xbt_dynar_free(&surf_file_to_parse_stack);
+ xbt_dynar_free(&surf_input_buffer_stack);
+ xbt_dynar_free(&surf_file_to_parse_stack);
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);
}
}
-/* Parse Function */
+/* Call the lexer to parse the currently opened file. This pointer to function enables bypassing of the parser */
-static int _surf_parse(void)
-{
+static int _surf_parse(void) {
return surf_parse_lex();
}
-
int_f_void_t surf_parse = _surf_parse;
-void surf_parse_error(char *msg)
-{
- fprintf(stderr, "Parse error on line %d: %s\n", surf_parse_lineno, msg);
- abort();
-}
-
-void surf_parse_get_double(double *value, const char *string)
-{
- int ret = 0;
- ret = sscanf(string, "%lg", value);
- if (ret != 1)
- surf_parse_error(bprintf("%s is not a double", string));
-}
-
-void surf_parse_get_int(int *value, const char *string)
-{
- int ret = 0;
- ret = sscanf(string, "%d", value);
- if (ret != 1)
- surf_parse_error(bprintf("%s is not an integer", string));
-}
/* Aux parse functions */
unsigned int iterator;
void_f_void_t fun;
xbt_dynar_foreach(cb_list, iterator, fun) {
- if (fun) (*fun) ();
+ if (fun) fun();
}
}
-/* Init and free parse data */
-
-static void init_data(void)
-{
- if (!surfxml_bufferstack_stack)
- surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL);
-
- traces_set_list = xbt_dict_new();
- trace_connect_list_host_avail = xbt_dict_new();
- trace_connect_list_power = xbt_dict_new();
- trace_connect_list_link_avail = xbt_dict_new();
- trace_connect_list_bandwidth = xbt_dict_new();
- trace_connect_list_latency = xbt_dict_new();
-
- surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace);
- surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
- surfxml_add_callback(STag_surfxml_trace_connect_cb_list,
- &parse_Stag_trace_connect);
-}
-
-static void free_data(void)
-{
- xbt_dict_free(&trace_connect_list_host_avail);
- xbt_dict_free(&trace_connect_list_power);
- xbt_dict_free(&trace_connect_list_link_avail);
- xbt_dict_free(&trace_connect_list_bandwidth);
- xbt_dict_free(&trace_connect_list_latency);
- xbt_dict_free(&traces_set_list);
- xbt_dict_free(&random_data_list);
- xbt_dynar_free(&surfxml_bufferstack_stack);
-}
-
-/* Here start parse */
-void parse_platform_file(const char *file)
-{
- int parse_status;
-
- surfxml_buffer_stack_stack_ptr = 1;
- surfxml_buffer_stack_stack[0] = 0;
-
- surf_parse_open(file);
- init_data();
- parse_status = surf_parse();
- free_data();
- surf_parse_close();
- xbt_assert(!parse_status, "Parse error in %s", file);
-}
/* Prop tag functions */
void parse_properties(const char* prop_id, const char* prop_value)
{
- char *value = NULL;
if (!current_property_set)
- current_property_set = xbt_dict_new(); // Maybe, it should be make a error
+ current_property_set = xbt_dict_new(); // Maybe, it should raise an error
if(!strcmp(prop_id,"coordinates")){
if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL)
{
xbt_die("Setting XML prop coordinates must be \"yes\"");
}
else{
- value = xbt_strdup(prop_value);
- xbt_dict_set(current_property_set, prop_id, value, free);
+ xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free);
}
}
parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
}
-/*
- * With lua console
- */
-void parse_properties_lua(const char* prop_id, const char* prop_value)
-{
- parse_properties(prop_id, prop_value);
-}
-
-/* Trace management functions */
-
-static double trace_periodicity = -1.0;
-static char *trace_file = NULL;
-static char *trace_id = NULL;
-
-static void parse_Stag_trace(void)
-{
- trace_id = xbt_strdup(A_surfxml_trace_id);
- trace_file = xbt_strdup(A_surfxml_trace_file);
- surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity);
-}
-
-static void parse_Etag_trace(void)
-{
- tmgr_trace_t trace;
- if (!trace_file || strcmp(trace_file, "") != 0) {
- trace = tmgr_trace_new(trace_file);
- } else {
- if (strcmp(surfxml_pcdata, "") == 0)
- trace = NULL;
- else
- trace =
- tmgr_trace_new_from_string(trace_id, surfxml_pcdata,
- trace_periodicity);
- }
- xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL);
- xbt_free(trace_file);
- trace_file = NULL;
- xbt_free(trace_id);
- trace_id = NULL;
-}
-
-static void parse_Stag_trace_connect(void)
-{
- xbt_assert(xbt_dict_get_or_null
- (traces_set_list, A_surfxml_trace_connect_trace),
- "Cannot connect trace %s to %s: trace unknown",
- A_surfxml_trace_connect_trace,
- A_surfxml_trace_connect_element);
-
- switch (A_surfxml_trace_connect_kind) {
- case A_surfxml_trace_connect_kind_HOST_AVAIL:
- xbt_dict_set(trace_connect_list_host_avail,
- A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element), free);
- break;
- case A_surfxml_trace_connect_kind_POWER:
- xbt_dict_set(trace_connect_list_power, A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element), free);
- break;
- case A_surfxml_trace_connect_kind_LINK_AVAIL:
- xbt_dict_set(trace_connect_list_link_avail,
- A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element), free);
- break;
- case A_surfxml_trace_connect_kind_BANDWIDTH:
- xbt_dict_set(trace_connect_list_bandwidth,
- A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element), free);
- break;
- case A_surfxml_trace_connect_kind_LATENCY:
- xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element), free);
- break;
- default:
- xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
- A_surfxml_trace_connect_trace, A_surfxml_trace_connect_element);
- break;
- }
-}
/* Random tag functions */
power_scale = random_generate(random);
}
} else {
- surf_parse_get_double(&power_scale, power);
+ power_scale = surf_parse_get_double(power);
}
return power_scale;
}
static void init_randomness(void)
{
random_id = A_surfxml_random_id;
- surf_parse_get_double(&random_min, A_surfxml_random_min);
- surf_parse_get_double(&random_max, A_surfxml_random_max);
- surf_parse_get_double(&random_mean, A_surfxml_random_mean);
- surf_parse_get_double(&random_std_deviation,
- A_surfxml_random_std_deviation);
+ random_min = surf_parse_get_double(A_surfxml_random_min);
+ random_max = surf_parse_get_double(A_surfxml_random_max);
+ random_mean = surf_parse_get_double(A_surfxml_random_mean);
+ random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation);
random_generator = A_surfxml_random_generator;
}
&xbt_free_ref);
}
-/**
- * create CPU resource via CPU Model
- */
-void* surf_host_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace, int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- return surf_cpu_model->extension.cpu.create_resource(name, power_peak,
- power_scale,
- power_trace,
- core,
- state_initial,
- state_trace,
- cpu_properties);
-}
-
-/**
- * create CPU resource via worsktation_ptask_L07 model
- */
-
-void* surf_wsL07_host_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- return surf_workstation_model->extension.workstation.cpu_create_resource(name,
- power_peak,
- power_scale,
- power_trace,
- state_initial,
- state_trace,
- cpu_properties);
-}
-
-/**
- * create link resource via network Model
- */
-void* surf_link_create_resource(char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_resource_state_t
- state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties)
-{
- return surf_network_model->extension.network.create_resource(name,
- bw_initial,
- bw_trace,
- lat_initial,
- lat_trace,
- state_initial,
- state_trace,
- policy,
- properties);
-}
-
-/**
- * create link resource via workstation_ptask_L07 model
- */
-
-void* surf_wsL07_link_create_resource(char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_resource_state_t
- state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t
- policy, xbt_dict_t properties)
-{
- return surf_workstation_model->extension.workstation.
- link_create_resource(name, bw_initial, bw_trace, lat_initial,
- lat_trace, state_initial, state_trace, policy,
- properties);
-}
-
-/**
- *
- *init new routing model component
- */
-
-void surf_AS_new(const char *AS_id, const char *AS_mode)
-{
- routing_AS_init(AS_id, AS_mode);
-}
-
-void surf_AS_finalize(const char *AS_id)
-{
- routing_AS_end(AS_id);
-}
-
-/*
- * add host to the network element list
- */
-void surf_route_add_host(const char *host_id)
-{
- routing_add_host(host_id);
-}
-
-/**
- * set route
- */
-void surf_routing_add_route(const char *src_id, const char *dst_id,
- xbt_dynar_t links_id)
-{
- unsigned int i;
- const char *link_id;
- routing_set_route(src_id, dst_id);
- xbt_dynar_foreach(links_id, i, link_id) {
- routing_add_link(link_id);
- }
-
- //store the route
- routing_store_route();
-}
-
-/**
- * Add Traces
- */
-void surf_add_host_traces(void)
-{
- return surf_cpu_model->extension.cpu.add_traces();
-}
-
-void surf_add_link_traces(void)
-{
- return surf_network_model->extension.network.add_traces();
-}
-
-void surf_wsL07_add_traces(void)
-{
- return surf_workstation_model->extension.workstation.add_traces();
-}
