/*
* 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){
}
void STag_surfxml_peer(void){
- s_surf_parsing_peer_arg_t peer;
+ 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);
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);