X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6135d964e2f6309e0c3e1608c84faa8264553eba..a1688a8f4d3a06b7dfd59fdcf06c7a198b235fbb:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 69a1b6ca7c..661240fdae 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -4,6 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include #include /* va_arg */ #include "xbt/misc.h" @@ -12,6 +14,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 +25,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 */ @@ -46,6 +51,7 @@ double surf_parse_get_double(const char *string) { int ret = sscanf(string, "%lg", &res); if (ret != 1) surf_parse_error("%s is not a double", string); + //printf("Parsed double [%lg] %s\n", res, string); return res; } @@ -57,6 +63,132 @@ int surf_parse_get_int(const char *string) { return res; } +struct unit_scale { + const char *unit; + double scale; +}; + +/* Note: field `unit' for the last element of parametre `units' should be + * NULL. */ +static double surf_parse_get_value_with_unit(const char *string, + const struct unit_scale *units) +{ + char* ptr; + double res; + int i; + errno = 0; + res = strtod(string, &ptr); + if (errno == ERANGE) + surf_parse_error("value out of range: %s", string); + if (ptr == string) + surf_parse_error("cannot parse number: %s", string); + for (i = 0; units[i].unit != NULL && strcmp(ptr, units[i].unit) != 0; i++) { + } + if (units[i].unit != NULL) + res *= units[i].scale; + else + surf_parse_error("unknown unit: %s", ptr); + return res; +} + +double surf_parse_get_time(const char *string) +{ + const struct unit_scale units[] = { + { "w", 7 * 24 * 60 * 60 }, + { "d", 24 * 60 * 60 }, + { "h", 60 * 60 }, + { "m", 60 }, + { "s", 1.0 }, + { "", 1.0 }, /* default unit is seconds */ + { "ms", 1e-3 }, + { "us", 1e-6 }, + { "ns", 1e-9 }, + { "ps", 1e-12 }, + { NULL, 0 } + }; + return surf_parse_get_value_with_unit(string, units); +} + +double surf_parse_get_size(const char *string) +{ + const struct unit_scale units[] = { + { "TiB", pow(1024, 4) }, + { "GiB", pow(1024, 3) }, + { "MiB", pow(1024, 2) }, + { "KiB", 1024 }, + { "TB", 1e12 }, + { "GB", 1e9 }, + { "MB", 1e6 }, + { "kB", 1e3 }, + { "B", 1.0 }, + { "", 1.0 }, /* default unit is bytes*/ + { "Tib", 0.125 * pow(1024, 4) }, + { "Gib", 0.125 * pow(1024, 3) }, + { "Mib", 0.125 * pow(1024, 2) }, + { "Kib", 0.125 * 1024 }, + { "Tb", 0.125 * 1e12 }, + { "Gb", 0.125 * 1e9 }, + { "Mb", 0.125 * 1e6 }, + { "kb", 0.125 * 1e3 }, + { "b", 0.125 }, + { NULL, 0 } + }; + return surf_parse_get_value_with_unit(string, units); +} + +double surf_parse_get_bandwidth(const char *string) +{ + const struct unit_scale units[] = { + { "TiBps", pow(1024, 4) }, + { "GiBps", pow(1024, 3) }, + { "MiBps", pow(1024, 2) }, + { "KiBps", 1024 }, + { "TBps", 1e12 }, + { "GBps", 1e9 }, + { "MBps", 1e6 }, + { "kBps", 1e3 }, + { "Bps", 1.0 }, + { "", 1.0 }, /* default unit is bytes per second */ + { "Tibps", 0.125 * pow(1024, 4) }, + { "Gibps", 0.125 * pow(1024, 3) }, + { "Mibps", 0.125 * pow(1024, 2) }, + { "Kibps", 0.125 * 1024 }, + { "Tbps", 0.125 * 1e12 }, + { "Gbps", 0.125 * 1e9 }, + { "Mbps", 0.125 * 1e6 }, + { "kbps", 0.125 * 1e3 }, + { "bps", 0.125 }, + { NULL, 0 } + }; + return surf_parse_get_value_with_unit(string, units); +} + +double surf_parse_get_power(const char *string) +{ + const struct unit_scale units[] = { + { "yottaflops", 1e24 }, + { "Yf", 1e24 }, + { "zettaflops", 1e21 }, + { "Zf", 1e21 }, + { "exaflops", 1e18 }, + { "Ef", 1e18 }, + { "petaflops", 1e15 }, + { "Pf", 1e15 }, + { "teraflops", 1e12 }, + { "Tf", 1e12 }, + { "gigaflops", 1e9 }, + { "Gf", 1e9 }, + { "megaflops", 1e6 }, + { "Mf", 1e6 }, + { "kiloflops", 1e3 }, + { "kf", 1e3 }, + { "flops", 1.0 }, + { "f", 1.0 }, + { "", 1.0 }, /* default unit is flops */ + { NULL, 0 } + }; + return surf_parse_get_value_with_unit(string, units); +} /* * All the callback lists that can be overridden anywhere. @@ -64,19 +196,19 @@ int surf_parse_get_int(const char *string) { */ /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ -xbt_dynar_t STag_surfxml_process_cb_list = NULL; -xbt_dynar_t ETag_surfxml_process_cb_list = NULL; -xbt_dynar_t STag_surfxml_argument_cb_list = NULL; -xbt_dynar_t ETag_surfxml_argument_cb_list = NULL; /* 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; @@ -88,7 +220,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) { @@ -98,23 +232,28 @@ 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.content_type = A_surfxml_storage_content___type; + 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.content_type = A_surfxml_storage___type_content___type; + 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_size(A_surfxml_storage___type_size); sg_platf_new_storage_type(&storage_type); current_property_set = NULL; } @@ -141,7 +280,7 @@ void ETag_surfxml_mount(void) memset(&mount,0,sizeof(mount)); mount.name = A_surfxml_mount_name; - mount.id = A_surfxml_mount_id; + mount.storageId = A_surfxml_mount_storageId; sg_platf_new_mount(&mount); } @@ -210,15 +349,7 @@ int ETag_surfxml_include_state(void) void surf_parse_init_callbacks(void) { - sg_platf_init(); // FIXME: move to a proper place? - STag_surfxml_process_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_process_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_argument_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_argument_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); + sg_platf_init(); } void surf_parse_reset_callbacks(void) @@ -229,12 +360,7 @@ void surf_parse_reset_callbacks(void) void surf_parse_free_callbacks(void) { - sg_platf_exit(); // FIXME: better place? - - xbt_dynar_free(&STag_surfxml_process_cb_list); - xbt_dynar_free(&ETag_surfxml_process_cb_list); - xbt_dynar_free(&STag_surfxml_argument_cb_list); - xbt_dynar_free(&ETag_surfxml_argument_cb_list); + sg_platf_exit(); } /* Stag and Etag parse functions */ @@ -269,29 +395,70 @@ 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) { s_sg_platf_host_cbarg_t host; + char* buf; memset(&host,0,sizeof(host)); + host.properties = current_property_set; host.id = A_surfxml_host_id; - host.power_peak = get_cpu_power(A_surfxml_host_power); + + buf = A_surfxml_host_power; + XBT_DEBUG("Buffer: %s", buf); + host.power_peak = xbt_dynar_new(sizeof(double), NULL); + if (strchr(buf, ',') == NULL){ + double power_value = get_cpu_power(A_surfxml_host_power); + xbt_dynar_push_as(host.power_peak,double, power_value); + } + else { + xbt_dynar_t pstate_list = xbt_str_split(buf, ","); + int i; + for (i = 0; i < xbt_dynar_length(pstate_list); i++) { + double power_value; + char* power_value_str; + + xbt_dynar_get_cpy(pstate_list, i, &power_value_str); + xbt_str_trim(power_value_str, NULL); + power_value = get_cpu_power(power_value_str); + xbt_dynar_push_as(host.power_peak, double, power_value); + XBT_DEBUG("Power value: %lf", power_value); + } + } + + XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); + //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); + host.pstate = surf_parse_get_int(A_surfxml_host_pstate); + 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) @@ -304,14 +471,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); } @@ -325,31 +492,39 @@ void STag_surfxml_router(void){ sg_platf_new_router(&router); } -void STag_surfxml_cluster(void){ +void ETag_surfxml_cluster(void){ s_sg_platf_cluster_cbarg_t cluster; memset(&cluster,0,sizeof(cluster)); + cluster.properties = current_property_set; + 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.power = surf_parse_get_power(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,"")) - 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.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw); + cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat); + if(strcmp(A_surfxml_cluster_bb___bw,"")) + cluster.bb_bw = surf_parse_get_bandwidth(A_surfxml_cluster_bb___bw); + if(strcmp(A_surfxml_cluster_bb___lat,"")) + cluster.bb_lat = surf_parse_get_time(A_surfxml_cluster_bb___lat); + if(strcmp(A_surfxml_cluster_limiter___link,"")) + cluster.limiter_link = surf_parse_get_double(A_surfxml_cluster_limiter___link); + if(strcmp(A_surfxml_cluster_loopback___bw,"")) + cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw); + if(strcmp(A_surfxml_cluster_loopback___lat,"")) + cluster.loopback_lat = surf_parse_get_time(A_surfxml_cluster_loopback___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: @@ -357,11 +532,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: @@ -370,9 +545,15 @@ 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); + + current_property_set = NULL; +} + +void STag_surfxml_cluster(void){ + 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_cabinet(void){ @@ -381,9 +562,9 @@ void STag_surfxml_cabinet(void){ cabinet.id = A_surfxml_cabinet_id; cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; - cabinet.power = surf_parse_get_double(A_surfxml_cabinet_power); - cabinet.bw = surf_parse_get_double(A_surfxml_cabinet_bw); - cabinet.lat = surf_parse_get_double(A_surfxml_cabinet_lat); + cabinet.power = surf_parse_get_power(A_surfxml_cabinet_power); + cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw); + cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat); cabinet.radical = A_surfxml_cabinet_radical; sg_platf_new_cabinet(&cabinet); @@ -393,18 +574,19 @@ void STag_surfxml_peer(void){ 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); - 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.power = surf_parse_get_power(A_surfxml_peer_power); + peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in); + peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out); + peer.lat = surf_parse_get_time(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)"); } @@ -415,10 +597,12 @@ void ETag_surfxml_link(void){ link.properties = current_property_set; 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.latency = surf_parse_get_double(A_surfxml_link_latency); - link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency_file); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth); + //printf("Link bandwidth [%lg]\n", link.bandwidth); + link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file); + link.latency = surf_parse_get_time(A_surfxml_link_latency); + //printf("Link latency [%lg]\n", link.latency); + link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency___file); switch (A_surfxml_link_state) { case A_surfxml_link_state_ON: @@ -431,16 +615,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: @@ -453,26 +637,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)); - - linkctn.id = A_surfxml_link_ctn_id; +void STag_surfxml_link___ctn(void){ - 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){ @@ -482,39 +665,50 @@ void ETag_surfxml_backbone(void){ link.properties = NULL; link.id = A_surfxml_backbone_id; - link.bandwidth = surf_parse_get_double(A_surfxml_backbone_bandwidth); - link.latency = surf_parse_get_double(A_surfxml_backbone_latency); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth); + link.latency = surf_parse_get_time(A_surfxml_backbone_latency); link.state = SURF_RESOURCE_ON; link.policy = SURF_LINK_SHARED; 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){ @@ -523,6 +717,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: @@ -535,16 +732,20 @@ 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; + + 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: @@ -552,33 +753,43 @@ 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; + + 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){ @@ -593,44 +804,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; @@ -639,45 +874,90 @@ 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){ + s_sg_platf_process_cbarg_t process; + memset(&process,0,sizeof(process)); + + process.argc = argc; + process.argv = (const char **)argv; + 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); + + 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: + process.on_failure = SURF_PROCESS_ON_FAILURE_RESTART; + break; + } + + sg_platf_new_process(&process); + current_property_set = NULL; +} + +void STag_surfxml_argument(void){ + argc++; + argv = xbt_realloc(argv, (argc) * sizeof(char *)); + 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_cluster(void){} +void ETag_surfxml_host___link(void){} void ETag_surfxml_cabinet(void){} void ETag_surfxml_peer(void){} void STag_surfxml_backbone(void){} -void ETag_surfxml_link_ctn(void){} - -// FIXME should not call surfxml_call_cb_functions -void STag_surfxml_process(void){ - surfxml_call_cb_functions(STag_surfxml_process_cb_list); -} -void STag_surfxml_argument(void){ - surfxml_call_cb_functions(STag_surfxml_argument_cb_list); -} - -#define parse_method(type,name) \ - void type##Tag_surfxml_##name(void) \ - { surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); } \ - void type##Tag_surfxml_##name(void) - -parse_method(E, process); -parse_method(E, argument); +void ETag_surfxml_link___ctn(void){} +void ETag_surfxml_argument(void){} /* Open and Close parse file */ @@ -717,6 +997,7 @@ void surf_parse_close(void) xbt_dynar_free(&surf_parsed_filename_stack); free(surf_parsed_filename); + surf_parsed_filename = NULL; if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer); @@ -733,43 +1014,6 @@ static int _surf_parse(void) { int_f_void_t surf_parse = _surf_parse; -/* Aux parse functions */ - -void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function) -{ - xbt_dynar_push(cb_list, &function); -} - -void surfxml_del_callback(xbt_dynar_t cb_list, void_f_void_t function) -{ - xbt_ex_t e; - unsigned int it=0; - void_f_void_t null_f=NULL; - - TRY { - it = xbt_dynar_search(cb_list,&function); - } - CATCH(e) { - if (e.category == not_found_error) { - xbt_ex_free(e); - xbt_die("Trying to remove a callback that is not here! This should not happen"); - } - RETHROW; - } - - xbt_dynar_replace(cb_list, it,&null_f); -} - -static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) -{ - unsigned int iterator; - void_f_void_t fun; - xbt_dynar_foreach(cb_list, iterator, fun) { - if (fun) fun(); - } -} - - /* Prop tag functions */ /** @@ -796,7 +1040,7 @@ double get_cpu_power(const char *power) power_scale = random_generate(random); } } else { - power_scale = surf_parse_get_double(power); + power_scale = surf_parse_get_power(power); } return power_scale; } @@ -811,7 +1055,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: @@ -842,3 +1086,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); +} +