XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
#undef CLEANUP
-int ETag_surfxml_include_state(void);
+int ETag_surfxml_include_state();
#include "simgrid_dtd.c"
/*
* Stuff relative to storage
*/
-void STag_surfxml_storage(void)
+void STag_surfxml_storage()
{
AS_TAG = 0;
XBT_DEBUG("STag_surfxml_storage");
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
-void ETag_surfxml_storage(void)
+void ETag_surfxml_storage()
{
s_sg_platf_storage_cbarg_t storage;
memset(&storage,0,sizeof(storage));
sg_platf_new_storage(&storage);
current_property_set = nullptr;
}
-void STag_surfxml_storage___type(void)
+void STag_surfxml_storage___type()
{
AS_TAG = 0;
XBT_DEBUG("STag_surfxml_storage___type");
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)");
}
-void ETag_surfxml_storage___type(void)
+void ETag_surfxml_storage___type()
{
s_sg_platf_storage_type_cbarg_t storage_type;
memset(&storage_type,0,sizeof(storage_type));
current_property_set = nullptr;
current_model_property_set = nullptr;
}
-void STag_surfxml_mount(void)
+void STag_surfxml_mount()
{
XBT_DEBUG("STag_surfxml_mount");
}
-void ETag_surfxml_mount(void)
+void ETag_surfxml_mount()
{
s_sg_platf_mount_cbarg_t mount;
memset(&mount,0,sizeof(mount));
static xbt_dynar_t surf_file_to_parse_stack = nullptr;
static xbt_dynar_t surf_parsed_filename_stack = nullptr;
-void STag_surfxml_include(void)
+void STag_surfxml_include()
{
parse_after_config();
XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file);
fflush(nullptr);
}
-void ETag_surfxml_include(void) {
+void ETag_surfxml_include() {
/* Nothing to do when done with reading the include tag.
* Instead, the handling should be deferred until the EOF of current buffer -- see below */
}
* directly: a command line flag could instruct it to do the correct thing when #include is encountered
* on a line. One day maybe, if the maya allow it.
*/
-int ETag_surfxml_include_state(void)
+int ETag_surfxml_include_state()
{
fflush(nullptr);
XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
/* Stag and Etag parse functions */
-void STag_surfxml_platform(void) {
+void STag_surfxml_platform() {
XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
sg_platf_begin();
}
-void ETag_surfxml_platform(void){
+void ETag_surfxml_platform(){
sg_platf_end();
}
-void STag_surfxml_host(void){
+void STag_surfxml_host(){
AS_TAG = 0;
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
-void STag_surfxml_prop(void)
+void STag_surfxml_prop()
{
if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS
if (!as_current_property_set){
}
}
-void ETag_surfxml_host(void) {
+void ETag_surfxml_host() {
s_sg_platf_host_cbarg_t host;
memset(&host,0,sizeof(host));
char* buf;
XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
host.core_amount = surf_parse_get_int(A_surfxml_host_core);
- host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : NULL;
- host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : NULL;
+ host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr;
+ host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr;
host.pstate = surf_parse_get_int(A_surfxml_host_pstate);
host.coord = A_surfxml_host_coordinates;
current_property_set = nullptr;
}
-void STag_surfxml_host___link(void){
+void STag_surfxml_host___link(){
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));
sg_platf_new_hostlink(&host_link);
}
-void STag_surfxml_router(void){
+void STag_surfxml_router(){
s_sg_platf_router_cbarg_t router;
memset(&router, 0, sizeof(router));
sg_platf_new_router(&router);
}
-void ETag_surfxml_cluster(void){
+void ETag_surfxml_cluster(){
s_sg_platf_cluster_cbarg_t cluster;
memset(&cluster,0,sizeof(cluster));
cluster.properties = as_current_property_set;
if(strcmp(A_surfxml_cluster_bb___lat,""))
cluster.bb_lat = surf_parse_get_time(A_surfxml_cluster_bb___lat, "bb_lat of cluster", cluster.id);
if(strcmp(A_surfxml_cluster_limiter___link,""))
- cluster.limiter_link = surf_parse_get_double(A_surfxml_cluster_limiter___link);
+ cluster.limiter_link = surf_parse_get_bandwidth(A_surfxml_cluster_limiter___link, "limiter_link of cluster", cluster.id);
if(strcmp(A_surfxml_cluster_loopback___bw,""))
cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw, "loopback_bw of cluster", cluster.id);
if(strcmp(A_surfxml_cluster_loopback___lat,""))
case A_surfxml_cluster_topology_FAT___TREE:
cluster.topology = SURF_CLUSTER_FAT_TREE;
break;
+ case A_surfxml_cluster_topology_DRAGONFLY:
+ cluster.topology= SURF_CLUSTER_DRAGONFLY ;
+ break;
default:
surf_parse_error("Invalid cluster topology for cluster %s",
cluster.id);
current_property_set = nullptr;
}
-void STag_surfxml_cluster(void){
+void STag_surfxml_cluster(){
parse_after_config();
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
-void STag_surfxml_cabinet(void){
+void STag_surfxml_cabinet(){
parse_after_config();
s_sg_platf_cabinet_cbarg_t cabinet;
memset(&cabinet,0,sizeof(cabinet));
sg_platf_new_cabinet(&cabinet);
}
-void STag_surfxml_peer(void){
+void STag_surfxml_peer(){
parse_after_config();
s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
peer.lat = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
peer.coord = A_surfxml_peer_coordinates;
- peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : NULL;
- peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : NULL;
+ peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
+ peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
sg_platf_new_peer(&peer);
}
-void STag_surfxml_link(void){
+void STag_surfxml_link(){
AS_TAG = 0;
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
-void ETag_surfxml_link(void){
+void ETag_surfxml_link(){
s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
link.properties = current_property_set;
link.id = A_surfxml_link_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id);
- link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : NULL;
+ link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr;
link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id);
- link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : NULL;
- link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):NULL;
+ link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr;
+ link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr;
switch (A_surfxml_link_sharing___policy) {
case A_surfxml_link_sharing___policy_SHARED:
current_property_set = nullptr;
}
-void STag_surfxml_link___ctn(void){
+void STag_surfxml_link___ctn(){
char *link_id;
switch (A_surfxml_link___ctn_direction) {
xbt_dynar_push(parsed_link_list, &link_id);
}
-void ETag_surfxml_backbone(void){
+void ETag_surfxml_backbone(){
s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id));
}
-void STag_surfxml_route(void){
+void STag_surfxml_route(){
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_src),
"Route src='%s' does name a node.", A_surfxml_route_src);
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_dst),
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
-void STag_surfxml_ASroute(void){
+void STag_surfxml_ASroute(){
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_src),
"ASroute src='%s' does name a node.", A_surfxml_route_src);
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_dst),
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
-void STag_surfxml_bypassRoute(void){
+void STag_surfxml_bypassRoute(){
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src),
"bypassRoute src='%s' does name a node.", A_surfxml_bypassRoute_src);
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst),
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
-void STag_surfxml_bypassASroute(void){
+void STag_surfxml_bypassASroute(){
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src),
"bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src);
surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst),
parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
-void ETag_surfxml_route(void){
+void ETag_surfxml_route(){
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- route.src = A_surfxml_route_src;
- route.dst = A_surfxml_route_dst;
+
+ route.src = sg_netcard_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag
+ route.dst = sg_netcard_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag
route.gw_src = nullptr;
route.gw_dst = nullptr;
route.link_list = new std::vector<Link*>();
xbt_dynar_free(&parsed_link_list);
}
-void ETag_surfxml_ASroute(void){
+void ETag_surfxml_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 = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src);
- ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst);
+ ASroute.src = sg_netcard_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag
+ ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag
- if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)
- surf_parse_error("gw_src=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
- A_surfxml_ASroute_gw___src, ASroute.src, ASroute.dst);
- if (A_surfxml_ASroute_gw___dst && !ASroute.gw_dst)
- surf_parse_error("gw_dst=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
- A_surfxml_ASroute_gw___dst, ASroute.src, ASroute.dst);
+ ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag
+ ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag
ASroute.link_list = new std::vector<Link*>();
}
sg_platf_new_route(&ASroute);
+ delete ASroute.link_list;
}
-void ETag_surfxml_bypassRoute(void){
+void ETag_surfxml_bypassRoute(){
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.src = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag
+ route.dst = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag
route.gw_src = nullptr;
route.gw_dst = nullptr;
route.symmetrical = false;
sg_platf_new_bypassRoute(&route);
}
-void ETag_surfxml_bypassASroute(void){
+void ETag_surfxml_bypassASroute(){
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.link_list = new std::vector<Link*>();
+ ASroute.src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src);
+ ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst);
+ ASroute.link_list = new std::vector<Link*>();
unsigned int cpt;
char *link_name;
xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
sg_platf_new_bypassRoute(&ASroute);
}
-void ETag_surfxml_trace(void){
+void ETag_surfxml_trace(){
s_sg_platf_trace_cbarg_t trace;
memset(&trace,0,sizeof(trace));
sg_platf_new_trace(&trace);
}
-void STag_surfxml_trace___connect(void){
+void STag_surfxml_trace___connect(){
parse_after_config();
s_sg_platf_trace_connect_cbarg_t trace_connect;
memset(&trace_connect,0,sizeof(trace_connect));
sg_platf_trace_connect(&trace_connect);
}
-void STag_surfxml_AS(void){
+void STag_surfxml_AS(){
parse_after_config();
AS_TAG = 1;
s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing};
sg_platf_new_AS_begin(&AS);
}
-void ETag_surfxml_AS(void){
+void ETag_surfxml_AS(){
if(as_prop_nb){
char *name = as_name_tab[as_prop_nb-1];
xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
sg_platf_new_AS_seal();
}
-void STag_surfxml_config(void){
+void STag_surfxml_config(){
AS_TAG = 0;
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
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){
+void ETag_surfxml_config(){
xbt_dict_cursor_t cursor = nullptr;
char *key;
char *elem;
static int argc;
static char **argv;
-void STag_surfxml_process(void){
+void STag_surfxml_process(){
AS_TAG = 0;
argc = 1;
argv = xbt_new(char *, 1);
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
-void ETag_surfxml_process(void){
+void ETag_surfxml_process(){
s_sg_platf_process_cbarg_t process;
memset(&process,0,sizeof(process));
}
sg_platf_new_process(&process);
+
+ for (int i = 0; i != argc; ++i)
+ xbt_free(argv[i]);
+ xbt_free(argv);
+ argv = nullptr;
+
current_property_set = nullptr;
}
-void STag_surfxml_argument(void){
+void STag_surfxml_argument(){
argc++;
argv = (char**)xbt_realloc(argv, (argc) * sizeof(char **));
argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
}
-void STag_surfxml_model___prop(void){
+void STag_surfxml_model___prop(){
if (!current_model_property_set)
current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f);
}
/* 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 STag_surfxml_trace(void){parse_after_config();}
-void ETag_surfxml_router(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){}
-void ETag_surfxml_argument(void){}
-void ETag_surfxml_model___prop(void){}
+void ETag_surfxml_prop(){}
+void STag_surfxml_random(){}
+void ETag_surfxml_random(){}
+void ETag_surfxml_trace___connect(){}
+void STag_surfxml_trace(){parse_after_config();}
+void ETag_surfxml_router(){}
+void ETag_surfxml_host___link(){}
+void ETag_surfxml_cabinet(){}
+void ETag_surfxml_peer(){}
+void STag_surfxml_backbone(){}
+void ETag_surfxml_link___ctn(){}
+void ETag_surfxml_argument(){}
+void ETag_surfxml_model___prop(){}
/* Open and Close parse file */
void surf_parse_open(const char *file)
{
- xbt_assert(file, "Cannot parse the NULL file. Bypassing the parser is strongly deprecated nowadays.");
+ xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
if (!surf_input_buffer_stack)
surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr);
surf_parse_lineno = 1;
}
-void surf_parse_close(void)
+void surf_parse_close()
{
xbt_dynar_free(&surf_input_buffer_stack);
xbt_dynar_free(&surf_file_to_parse_stack);
/* Call the lexer to parse the currently opened file. This pointer to function enables bypassing of the parser */
-static int _surf_parse(void) {
+static int _surf_parse() {
return surf_parse_lex();
}
int_f_void_t surf_parse = _surf_parse;
