/*
* 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);
}
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);
"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){
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;
+ 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_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
- sg_platf_new_AS_open(A_surfxml_AS_id,A_surfxml_AS_routing);
+ sg_platf_new_AS_begin(A_surfxml_AS_id,A_surfxml_AS_routing);
}
void ETag_surfxml_AS(void){
- sg_platf_new_AS_close();
+ sg_platf_new_AS_end();
}
void STag_surfxml_ASroute(void){
surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
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();
}
}