char* surf_parsed_filename = NULL; // to locate parse error messages
xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */
-
+extern AS_t current_routing;
/*
* Helping functions
*/
/* The default current property receiver. Setup in the corresponding opening callbacks. */
xbt_dict_t current_property_set = NULL;
+xbt_dict_t as_current_property_set = NULL;
+int AS_TAG = 0;
+char* as_name_tab[1024];
+void* as_dict_tab[1024];
+int as_prop_nb = 0;
+
+
/* 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;
*/
void STag_surfxml_storage(void)
{
+ AS_TAG = 0;
XBT_DEBUG("STag_surfxml_storage");
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
void ETag_surfxml_storage(void)
{
storage.id = A_surfxml_storage_id;
storage.type_id = A_surfxml_storage_typeId;
storage.content = A_surfxml_storage_content;
+ storage.properties = current_property_set;
sg_platf_new_storage(&storage);
+ current_property_set = NULL;
}
void STag_surfxml_storage_type(void)
{
+ AS_TAG = 0;
XBT_DEBUG("STag_surfxml_storage_type");
xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
}
void STag_surfxml_host(void){
+ AS_TAG = 0;
xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
void STag_surfxml_prop(void)
{
- if (!current_property_set)
- current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
-
- xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
+ if(AS_TAG){
+ if (!as_current_property_set){
+ xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!");
+ as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
+ as_name_tab[as_prop_nb] = xbt_strdup(A_surfxml_AS_id);
+ as_dict_tab[as_prop_nb] = as_current_property_set;
+ XBT_DEBUG("PUSH prop %p for AS '%s'",as_dict_tab[as_prop_nb],as_name_tab[as_prop_nb]);
+ as_prop_nb++;
+ }
+ xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
+ }
+ else{
+ if (!current_property_set)
+ current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error
+ xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL);
+ }
}
void ETag_surfxml_host(void) {
}
void STag_surfxml_link(void){
+ AS_TAG = 0;
xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
sg_platf_new_link(&link);
routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, A_surfxml_backbone_id, SURF_LINK_LEVEL));
- current_property_set = NULL;
}
void STag_surfxml_route(void){
A_surfxml_route_src, A_surfxml_route_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
+
void STag_surfxml_ASroute(void){
xbt_assert(strlen(A_surfxml_ASroute_src) > 0 || strlen(A_surfxml_ASroute_dst) > 0
|| strlen(A_surfxml_ASroute_gw_src) > 0 || strlen(A_surfxml_ASroute_gw_dst) > 0,
A_surfxml_ASroute_gw_src,A_surfxml_ASroute_gw_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
+
void STag_surfxml_bypassRoute(void){
xbt_assert(strlen(A_surfxml_bypassRoute_src) > 0 || strlen(A_surfxml_bypassRoute_dst) > 0,
"Missing end-points while defining bupass route \"%s\"->\"%s\"",
A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
+
void STag_surfxml_bypassASroute(void){
xbt_assert(strlen(A_surfxml_bypassASroute_src) > 0 || strlen(A_surfxml_bypassASroute_dst) > 0
|| strlen(A_surfxml_bypassASroute_gw_src) > 0 || strlen(A_surfxml_bypassASroute_gw_dst) > 0,
route.src = A_surfxml_route_src;
route.dst = A_surfxml_route_dst;
+ route.gw_src = NULL;
+ route.gw_dst = NULL;
route.link_list = parsed_link_list;
switch (A_surfxml_route_symmetrical) {
}
void ETag_surfxml_ASroute(void){
- s_sg_platf_ASroute_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
ASroute.src = A_surfxml_ASroute_src;
ASroute.dst = A_surfxml_ASroute_dst;
- ASroute.gw_src = A_surfxml_ASroute_gw_src;
- ASroute.gw_dst = A_surfxml_ASroute_gw_dst;
+
+ if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
+ // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
+ // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
+ //
+ // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
+ ASroute.gw_src = (sg_routing_edge_t) A_surfxml_ASroute_gw_src;
+ ASroute.gw_dst = (sg_routing_edge_t) A_surfxml_ASroute_gw_dst;
+ } else {
+ ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw_src);
+ ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw_dst);
+ }
+
ASroute.link_list = parsed_link_list;
switch (A_surfxml_ASroute_symmetrical) {
}
void ETag_surfxml_bypassRoute(void){
- s_sg_platf_bypassRoute_cbarg_t route;
+ s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
route.src = A_surfxml_bypassRoute_src;
route.dst = A_surfxml_bypassRoute_dst;
+ route.gw_src = NULL;
+ route.gw_dst = NULL;
route.link_list = parsed_link_list;
+ route.symmetrical = FALSE;
sg_platf_new_bypassRoute(&route);
parsed_link_list = NULL;
}
void ETag_surfxml_bypassASroute(void){
- s_sg_platf_bypassASroute_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute;
memset(&ASroute,0,sizeof(ASroute));
ASroute.src = A_surfxml_bypassASroute_src;
ASroute.dst = A_surfxml_bypassASroute_dst;
- ASroute.gw_src = A_surfxml_bypassASroute_gw_src;
- ASroute.gw_dst = A_surfxml_bypassASroute_gw_dst;
ASroute.link_list = parsed_link_list;
+ ASroute.symmetrical = FALSE;
+
+ if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
+ // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
+ // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
+ //
+ // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
+ ASroute.gw_src = (sg_routing_edge_t) A_surfxml_bypassASroute_gw_src;
+ ASroute.gw_dst = (sg_routing_edge_t) A_surfxml_bypassASroute_gw_dst;
+ } else {
+ ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw_src);
+ ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw_dst);
+ }
sg_platf_new_bypassASroute(&ASroute);
parsed_link_list = NULL;
}
void STag_surfxml_AS(void){
- sg_platf_new_AS_begin(A_surfxml_AS_id, (int)A_surfxml_AS_routing);
+ AS_TAG = 1;
+ s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ AS.id = A_surfxml_AS_id;
+ AS.routing = (int)A_surfxml_AS_routing;
+
+ as_current_property_set = NULL;
+
+ sg_platf_new_AS_begin(&AS);
}
void ETag_surfxml_AS(void){
+ if(as_prop_nb){
+ char *name = as_name_tab[as_prop_nb-1];
+ xbt_dict_t dict = as_dict_tab[as_prop_nb-1];
+ as_prop_nb--;
+ XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
+ xbt_lib_set(as_router_lib,
+ name,
+ ROUTING_PROP_ASR_LEVEL,
+ dict);
+ xbt_free(name);
+ }
sg_platf_new_AS_end();
}
+extern int _surf_init_status; /* FIXME: find a proper way to export this at some point */
+
void STag_surfxml_config(void){
- XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+ AS_TAG = 0;
xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+ if (_surf_init_status == 2) {
+ surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
+ }
}
void ETag_surfxml_config(void){
xbt_dict_cursor_t cursor = NULL;
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
xbt_dict_free(¤t_property_set);
+ current_property_set = NULL;
}
static int argc;
static char **argv;
void STag_surfxml_process(void){
+ AS_TAG = 0;
argc = 1;
argv = xbt_new(char *, 1);
argv[0] = xbt_strdup(A_surfxml_process_function);
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
}
void ETag_surfxml_process(void){
&xbt_free_ref);
}
+
+xbt_dict_t get_as_router_properties(const char* name)
+{
+ return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
+}
+
