X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6d1ca27d8852f9922141ea15eae6b339c2d2bc7..a65af9cc95088e0b83af31e744ff4a9bbae3fad7:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 041ed3b614..2c03573f2b 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -12,6 +12,7 @@ #include "xbt/dict.h" #include "surf/surfxml_parse.h" #include "surf/surf_private.h" +#include "simgrid/sg_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); @@ -22,6 +23,8 @@ int ETag_surfxml_include_state(void); 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 */ @@ -67,12 +70,16 @@ int surf_parse_get_int(const char *string) { /* 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; @@ -84,7 +91,9 @@ static void add_randomness(void); */ 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) { @@ -94,23 +103,26 @@ 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) +void STag_surfxml_storage___type(void) { - XBT_DEBUG("STag_surfxml_storage_type"); + 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 ETag_surfxml_storage_type(void) +void ETag_surfxml_storage___type(void) { s_sg_platf_storage_type_cbarg_t storage_type; memset(&storage_type,0,sizeof(storage_type)); - storage_type.content = A_surfxml_storage_type_content; - storage_type.id = A_surfxml_storage_type_id; - storage_type.model = A_surfxml_storage_type_model; + storage_type.content = A_surfxml_storage___type_content; + storage_type.id = A_surfxml_storage___type_id; + storage_type.model = A_surfxml_storage___type_model; storage_type.properties = current_property_set; - storage_type.size = surf_parse_get_int(A_surfxml_storage_type_size); + storage_type.size = surf_parse_get_int(A_surfxml_storage___type_size); sg_platf_new_storage_type(&storage_type); current_property_set = NULL; } @@ -252,15 +264,28 @@ void ETag_surfxml_platform(void){ } 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) { @@ -273,8 +298,8 @@ void ETag_surfxml_host(void) { host.power_peak = get_cpu_power(A_surfxml_host_power); host.power_scale = surf_parse_get_double( A_surfxml_host_availability); host.core_amount = surf_parse_get_int(A_surfxml_host_core); - host.power_trace = tmgr_trace_new_from_file(A_surfxml_host_availability_file); - host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state_file); + host.power_trace = tmgr_trace_new_from_file(A_surfxml_host_availability___file); + host.state_trace = tmgr_trace_new_from_file(A_surfxml_host_state___file); xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) || (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); if (A_surfxml_host_state == A_surfxml_host_state_ON) @@ -287,14 +312,14 @@ void ETag_surfxml_host(void) { current_property_set = NULL; } -void STag_surfxml_host_link(void){ - XBT_DEBUG("Create a Host_link for %s",A_surfxml_host_link_id); +void STag_surfxml_host___link(void){ + XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id); s_sg_platf_host_link_cbarg_t host_link; memset(&host_link,0,sizeof(host_link)); - host_link.id = A_surfxml_host_link_id; - host_link.link_up = A_surfxml_host_link_up; - host_link.link_down = A_surfxml_host_link_down; + host_link.id = A_surfxml_host___link_id; + host_link.link_up = A_surfxml_host___link_up; + host_link.link_down = A_surfxml_host___link_down; sg_platf_new_host_link(&host_link); } @@ -319,20 +344,20 @@ void STag_surfxml_cluster(void){ 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,"")) - cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); - if(strcmp(A_surfxml_cluster_bb_lat,"")) - 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: + if(strcmp(A_surfxml_cluster_bb___bw,"")) + cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb___bw); + if(strcmp(A_surfxml_cluster_bb___lat,"")) + 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: + case A_surfxml_cluster_sharing___policy_FULLDUPLEX: cluster.sharing_policy = SURF_LINK_FULLDUPLEX; break; - case A_surfxml_cluster_sharing_policy_FATPIPE: + case A_surfxml_cluster_sharing___policy_FATPIPE: cluster.sharing_policy = SURF_LINK_FATPIPE; break; default: @@ -340,11 +365,11 @@ void STag_surfxml_cluster(void){ cluster.id); break; } - switch (AX_surfxml_cluster_bb_sharing_policy) { - case A_surfxml_cluster_bb_sharing_policy_FATPIPE: + 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: + case A_surfxml_cluster_bb___sharing___policy_SHARED: cluster.bb_sharing_policy = SURF_LINK_SHARED; break; default: @@ -353,8 +378,8 @@ void STag_surfxml_cluster(void){ break; } - cluster.availability_trace = A_surfxml_cluster_availability_file; - cluster.state_trace = A_surfxml_cluster_state_file; + cluster.availability_trace = A_surfxml_cluster_availability___file; + cluster.state_trace = A_surfxml_cluster_state___file; sg_platf_new_cluster(&cluster); } @@ -377,17 +402,18 @@ void STag_surfxml_peer(void){ 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.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_from_file(A_surfxml_peer_availability_file); - peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state_file); + peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability___file); + peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state___file); sg_platf_new_peer(&peer); } 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)"); } @@ -399,9 +425,9 @@ void ETag_surfxml_link(void){ link.id = A_surfxml_link_id; link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); - link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth_file); + link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file); link.latency = surf_parse_get_double(A_surfxml_link_latency); - link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency_file); + link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency___file); switch (A_surfxml_link_state) { case A_surfxml_link_state_ON: @@ -414,16 +440,16 @@ void ETag_surfxml_link(void){ surf_parse_error("invalid state for link %s", link.id); break; } - link.state_trace = tmgr_trace_new_from_file(A_surfxml_link_state_file); + link.state_trace = tmgr_trace_new_from_file(A_surfxml_link_state___file); - switch (A_surfxml_link_sharing_policy) { - case A_surfxml_link_sharing_policy_SHARED: + switch (A_surfxml_link_sharing___policy) { + case A_surfxml_link_sharing___policy_SHARED: link.policy = SURF_LINK_SHARED; break; - case A_surfxml_link_sharing_policy_FATPIPE: + case A_surfxml_link_sharing___policy_FATPIPE: link.policy = SURF_LINK_FATPIPE; break; - case A_surfxml_link_sharing_policy_FULLDUPLEX: + case A_surfxml_link_sharing___policy_FULLDUPLEX: link.policy = SURF_LINK_FULLDUPLEX; break; default: @@ -436,26 +462,25 @@ void ETag_surfxml_link(void){ current_property_set = NULL; } -void STag_surfxml_link_ctn(void){ - s_sg_platf_linkctn_cbarg_t linkctn; - memset(&linkctn,0,sizeof(linkctn)); +void STag_surfxml_link___ctn(void){ - linkctn.id = A_surfxml_link_ctn_id; - - switch (A_surfxml_link_ctn_direction) { - case AU_surfxml_link_ctn_direction: - case A_surfxml_link_ctn_direction_NONE: - linkctn.direction = SURF_LINK_DIRECTION_NONE; + char *link_id; + switch (A_surfxml_link___ctn_direction) { + case AU_surfxml_link___ctn_direction: + case A_surfxml_link___ctn_direction_NONE: + link_id = xbt_strdup(A_surfxml_link___ctn_id); break; - case A_surfxml_link_ctn_direction_UP: - linkctn.direction = SURF_LINK_DIRECTION_UP; + case A_surfxml_link___ctn_direction_UP: + link_id = bprintf("%s_UP", A_surfxml_link___ctn_id); break; - case A_surfxml_link_ctn_direction_DOWN: - linkctn.direction = SURF_LINK_DIRECTION_DOWN; + case A_surfxml_link___ctn_direction_DOWN: + link_id = bprintf("%s_DOWN", A_surfxml_link___ctn_id); break; } - sg_platf_new_linkctn(&linkctn); + // FIXME we should push the surf link object but it don't + // work because of model rulebased + xbt_dynar_push(parsed_link_list, &link_id); } void ETag_surfxml_backbone(void){ @@ -472,32 +497,43 @@ void ETag_surfxml_backbone(void){ 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){ xbt_assert(strlen(A_surfxml_route_src) > 0 || strlen(A_surfxml_route_dst) > 0, "Missing end-points while defining route \"%s\"->\"%s\"", 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, - "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", - A_surfxml_ASroute_src, A_surfxml_ASroute_dst, - A_surfxml_ASroute_gw_src,A_surfxml_ASroute_gw_dst); + 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, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + A_surfxml_ASroute_src, A_surfxml_ASroute_dst, + 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); + 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, - "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", - A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst, - A_surfxml_bypassASroute_gw_src,A_surfxml_bypassASroute_gw_dst); + 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, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst, + A_surfxml_bypassASroute_gw___src,A_surfxml_bypassASroute_gw___dst); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } void ETag_surfxml_route(void){ @@ -506,6 +542,9 @@ void ETag_surfxml_route(void){ 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) { case AU_surfxml_route_symmetrical: @@ -518,16 +557,29 @@ void ETag_surfxml_route(void){ } sg_platf_new_route(&route); + parsed_link_list = NULL; } 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) { case AU_surfxml_ASroute_symmetrical: @@ -535,33 +587,52 @@ void ETag_surfxml_ASroute(void){ ASroute.symmetrical = TRUE; break; case A_surfxml_ASroute_symmetrical_NO: - ASroute.symmetrical = FALSE;; + ASroute.symmetrical = FALSE; break; } sg_platf_new_ASroute(&ASroute); + parsed_link_list = NULL; } 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 ETag_surfxml_trace(void){ @@ -576,44 +647,68 @@ void ETag_surfxml_trace(void){ sg_platf_new_trace(&trace); } -void STag_surfxml_trace_connect(void){ +void STag_surfxml_trace___connect(void){ s_sg_platf_trace_connect_cbarg_t trace_connect; memset(&trace_connect,0,sizeof(trace_connect)); - trace_connect.element = A_surfxml_trace_connect_element; - trace_connect.trace = A_surfxml_trace_connect_trace; + trace_connect.element = A_surfxml_trace___connect_element; + trace_connect.trace = A_surfxml_trace___connect_trace; - switch (A_surfxml_trace_connect_kind) { - case AU_surfxml_trace_connect_kind: - case A_surfxml_trace_connect_kind_POWER: + switch (A_surfxml_trace___connect_kind) { + case AU_surfxml_trace___connect_kind: + case A_surfxml_trace___connect_kind_POWER: trace_connect.kind = SURF_TRACE_CONNECT_KIND_POWER; break; - case A_surfxml_trace_connect_kind_BANDWIDTH: + case A_surfxml_trace___connect_kind_BANDWIDTH: trace_connect.kind = SURF_TRACE_CONNECT_KIND_BANDWIDTH; break; - case A_surfxml_trace_connect_kind_HOST_AVAIL: + case A_surfxml_trace___connect_kind_HOST___AVAIL: trace_connect.kind = SURF_TRACE_CONNECT_KIND_HOST_AVAIL; break; - case A_surfxml_trace_connect_kind_LATENCY: + case A_surfxml_trace___connect_kind_LATENCY: trace_connect.kind = SURF_TRACE_CONNECT_KIND_LATENCY; break; - case A_surfxml_trace_connect_kind_LINK_AVAIL: + case A_surfxml_trace___connect_kind_LINK___AVAIL: trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL; break; } - sg_platf_new_trace_connect(&trace_connect); + sg_platf_trace_connect(&trace_connect); } 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 _sg_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 (_sg_init_status == 2) { + surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); + } } void ETag_surfxml_config(void){ xbt_dict_cursor_t cursor = NULL; @@ -622,23 +717,26 @@ void ETag_surfxml_config(void){ char *cfg; xbt_dict_foreach(current_property_set, cursor, key, elem) { cfg = bprintf("%s:%s",key,elem); - if(xbt_cfg_is_default_value(_surf_cfg_set, key)) - xbt_cfg_set_parse(_surf_cfg_set, cfg); + if(xbt_cfg_is_default_value(_sg_cfg_set, key)) + xbt_cfg_set_parse(_sg_cfg_set, cfg); else XBT_INFO("The custom configuration '%s' is already defined by user!",key); free(cfg); } 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){ @@ -650,15 +748,15 @@ void ETag_surfxml_process(void){ process.properties = current_property_set; process.host = A_surfxml_process_host; process.function = A_surfxml_process_function; - process.start_time = surf_parse_get_double(A_surfxml_process_start_time); - process.kill_time = surf_parse_get_double(A_surfxml_process_kill_time); + process.start_time = surf_parse_get_double(A_surfxml_process_start___time); + process.kill_time = surf_parse_get_double(A_surfxml_process_kill___time); - switch (A_surfxml_process_on_failure) { - case AU_surfxml_process_on_failure: - case A_surfxml_process_on_failure_DIE: + switch (A_surfxml_process_on___failure) { + case AU_surfxml_process_on___failure: + case A_surfxml_process_on___failure_DIE: process.on_failure = SURF_PROCESS_ON_FAILURE_DIE; break; - case A_surfxml_process_on_failure_RESTART: + case A_surfxml_process_on___failure_RESTART: process.on_failure = SURF_PROCESS_ON_FAILURE_RESTART; break; } @@ -673,19 +771,36 @@ void STag_surfxml_argument(void){ argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value); } +/* ***************************************** */ +/* TUTORIAL: New TAG */ +void STag_surfxml_gpu(void) +{ + XBT_DEBUG("STag_surfxml_gpu"); +} +void ETag_surfxml_gpu(void) +{ + s_sg_platf_gpu_cbarg_t gpu; + memset(&gpu,0,sizeof(gpu)); + + gpu.name = A_surfxml_gpu_name; + + sg_platf_new_gpu(&gpu); +} +/* ***************************************** */ + /* nothing to do in those functions */ void ETag_surfxml_prop(void){} void STag_surfxml_random(void){} void ETag_surfxml_random(void){} -void ETag_surfxml_trace_connect(void){} +void ETag_surfxml_trace___connect(void){} void STag_surfxml_trace(void){} void ETag_surfxml_router(void){} -void ETag_surfxml_host_link(void){} +void ETag_surfxml_host___link(void){} void ETag_surfxml_cluster(void){} void ETag_surfxml_cabinet(void){} void ETag_surfxml_peer(void){} void STag_surfxml_backbone(void){} -void ETag_surfxml_link_ctn(void){} +void ETag_surfxml_link___ctn(void){} void ETag_surfxml_argument(void){} /* Open and Close parse file */ @@ -783,7 +898,7 @@ static void init_randomness(void) random_min = surf_parse_get_double(A_surfxml_random_min); random_max = surf_parse_get_double(A_surfxml_random_max); random_mean = surf_parse_get_double(A_surfxml_random_mean); - random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation); + random_std_deviation = surf_parse_get_double(A_surfxml_random_std___deviation); switch (A_surfxml_random_generator) { case AU_surfxml_random_generator: case A_surfxml_random_generator_NONE: @@ -814,3 +929,9 @@ static void add_randomness(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); +} +