#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/dict.h"
-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"
#include "surf/surf_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
/*
* Helping functions
*/
-void surf_parse_error(char *msg) {
+void surf_parse_error(const char *msg) {
xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
}
xbt_dynar_t ETag_surfxml_argument_cb_list = NULL;
xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
-xbt_dynar_t STag_surfxml_cluster_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL;
xbt_dynar_t STag_surfxml_peer_cb_list = NULL;
xbt_dynar_t ETag_surfxml_peer_cb_list = NULL;
xbt_dynar_t STag_surfxml_trace_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;
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
-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);
{
fflush(NULL);
XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
- if(xbt_dynar_length(surf_input_buffer_stack)!= 0)
+ if(!xbt_dynar_is_empty(surf_input_buffer_stack))
return 1;
fclose(surf_file_to_parse);
xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
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_bypassRoute_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_cluster_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_cluster_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_peer_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_peer_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_bypassRoute_cb_list);
- xbt_dynar_free(&STag_surfxml_cluster_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_include_cb_list);
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.");
- sg_platf_open();
+ sg_platf_begin();
}
void ETag_surfxml_platform(void){
- sg_platf_close();
+ sg_platf_end();
}
void STag_surfxml_host(void){
}
void STag_surfxml_cluster(void){
- 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);
+ s_sg_platf_cluster_cbarg_t cluster;
+ memset(&cluster,0,sizeof(cluster));
+ cluster.id = A_surfxml_cluster_id;
+ cluster.prefix = A_surfxml_cluster_prefix;
+ cluster.suffix = A_surfxml_cluster_suffix;
+ cluster.radical = A_surfxml_cluster_radical;
+ cluster.power= surf_parse_get_double(A_surfxml_cluster_power);
+ cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
+ cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw);
+ 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);
+ 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;
-
- struct_cluster->sharing_policy = AX_surfxml_cluster_sharing_policy;
- struct_cluster->bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
-
- struct_cluster->availability_trace = A_surfxml_cluster_availability_file;
- struct_cluster->state_trace = A_surfxml_cluster_state_file;
+ cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
+ cluster.router_id = A_surfxml_cluster_router_id;
+
+ switch (AX_surfxml_cluster_sharing_policy) {
+ case A_surfxml_cluster_sharing_policy_SHARED:
+ cluster.sharing_policy = SURF_LINK_SHARED;
+ break;
+ case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
+ cluster.sharing_policy = SURF_LINK_FULLDUPLEX;
+ break;
+ case A_surfxml_cluster_sharing_policy_FATPIPE:
+ cluster.sharing_policy = SURF_LINK_FATPIPE;
+ break;
+ default:
+ surf_parse_error(bprintf
+ ("Invalid cluster sharing policy for cluster %s",
+ cluster.id));
+ break;
+ }
+ switch (AX_surfxml_cluster_bb_sharing_policy) {
+ case A_surfxml_cluster_bb_sharing_policy_FATPIPE:
+ cluster.bb_sharing_policy = SURF_LINK_FATPIPE;
+ break;
+ case A_surfxml_cluster_bb_sharing_policy_SHARED:
+ cluster.bb_sharing_policy = SURF_LINK_SHARED;
+ break;
+ default:
+ surf_parse_error(bprintf
+ ("Invalid bb sharing policy in cluster %s",
+ cluster.id));
+ break;
+ }
- surfxml_call_cb_functions(STag_surfxml_cluster_cb_list);
+ cluster.availability_trace = A_surfxml_cluster_availability_file;
+ cluster.state_trace = A_surfxml_cluster_state_file;
+ sg_platf_new_cluster(&cluster);
}
void ETag_surfxml_cluster(void){
- surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list);
- xbt_free(struct_cluster);
+ /* nothing I can think of */
}
void STag_surfxml_peer(void){
- struct_peer = xbt_new0(s_surf_parsing_peer_arg_t, 1);
- struct_peer->id = A_surfxml_peer_id;
- struct_peer->power = surf_parse_get_double(A_surfxml_peer_power);
- struct_peer->bw_in = surf_parse_get_double(A_surfxml_peer_bw_in);
- struct_peer->bw_out = surf_parse_get_double(A_surfxml_peer_bw_out);
- struct_peer->lat = surf_parse_get_double(A_surfxml_peer_lat);
- struct_peer->coord = A_surfxml_peer_coordinates;
- struct_peer->availability_trace = tmgr_trace_new(A_surfxml_peer_availability_file);
- struct_peer->state_trace = tmgr_trace_new(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);
+ /* nothing to do here */
}
void STag_surfxml_link(void){
s_sg_platf_link_cbarg_t link;
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);
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);
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);
unsigned int iterator;
void_f_void_t fun;
xbt_dynar_foreach(cb_list, iterator, fun) {
- if (fun) (*fun) ();
+ if (fun) fun();
}
}
/* Prop tag functions */
-void parse_properties(const char* prop_id, const char* prop_value)
-{
- if (!current_property_set)
- 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_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value);
- COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
- COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
- }
- if(strcmp(A_surfxml_prop_value,"yes"))
- xbt_die("Setting XML prop coordinates must be \"yes\"");
- }
- else{
- xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free);
- }
-}
-
/**
* With XML parser
*/
-void parse_properties_XML(void)
+void parse_properties(void)
{
- parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
+ if (!current_property_set)
+ current_property_set = xbt_dict_new(); // Maybe, it should raise an error
+
+ xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), free);
}
