#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,
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;
{
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);
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_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);
}
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;
+ 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:
- struct_cluster->sharing_policy = SURF_LINK_SHARED;
+ cluster.sharing_policy = SURF_LINK_SHARED;
break;
case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
- struct_cluster->sharing_policy = SURF_LINK_FULLDUPLEX;
+ cluster.sharing_policy = SURF_LINK_FULLDUPLEX;
break;
case A_surfxml_cluster_sharing_policy_FATPIPE:
- struct_cluster->sharing_policy = SURF_LINK_FATPIPE;
+ cluster.sharing_policy = SURF_LINK_FATPIPE;
break;
default:
surf_parse_error(bprintf
("Invalid cluster sharing policy for cluster %s",
- struct_cluster->id));
+ 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;
+ cluster.bb_sharing_policy = SURF_LINK_FATPIPE;
break;
case A_surfxml_cluster_bb_sharing_policy_SHARED:
- struct_cluster->bb_sharing_policy = SURF_LINK_SHARED;
+ cluster.bb_sharing_policy = SURF_LINK_SHARED;
break;
default:
surf_parse_error(bprintf
("Invalid bb sharing policy in cluster %s",
- struct_cluster->id));
+ 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);
+ 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){
/* 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);
}
