-/* Copyright (c) 2006-2015. The SimGrid Team.
+ /* Copyright (c) 2006-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <math.h>
#include <stdarg.h> /* va_arg */
-#include "xbt/misc.h"
+#include "simgrid/link.h"
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/sg_config.h"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_private.h"
+#include "xbt/dict.h"
+#include "xbt/file.h"
#include "xbt/log.h"
+#include "xbt/misc.h"
#include "xbt/str.h"
-#include "xbt/file.h"
-#include "xbt/dict.h"
-#include "src/surf/surf_private.h"
-#include "src/surf/network_interface.hpp"
-#include "simgrid/sg_config.h"
-#include "simgrid/link.h"
+#include <string>
#include "src/surf/xml/platf_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
-#undef CLEANUP
-int ETag_surfxml_include_state(void);
+
+SG_BEGIN_DECL()
+
+int ETag_surfxml_include_state();
#include "simgrid_dtd.c"
char* surf_parsed_filename = nullptr; // to locate parse error messages
-xbt_dynar_t parsed_link_list = nullptr; /* temporary store of current list link of a route */
+std::vector<simgrid::surf::LinkImpl*> parsed_link_list; /* temporary store of current list link of a route */
+
/*
* Helping functions
*/
return res;
}
+/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
+static std::vector<int>* explodesRadical(const char* radicals)
+{
+ std::vector<int>* exploded = new std::vector<int>();
+ char* groups;
+ unsigned int iter;
+
+ // Make all hosts
+ xbt_dynar_t radical_elements = xbt_str_split(radicals, ",");
+ xbt_dynar_foreach (radical_elements, iter, groups) {
+
+ xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
+ int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*));
+ int end = 0;
+
+ switch (xbt_dynar_length(radical_ends)) {
+ case 1:
+ end = start;
+ break;
+ case 2:
+ end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*));
+ break;
+ default:
+ surf_parse_error("Malformed radical: %s", groups);
+ break;
+ }
+
+ for (int i = start; i <= end; i++)
+ exploded->push_back(i);
+
+ xbt_dynar_free(&radical_ends);
+ }
+ xbt_dynar_free(&radical_elements);
+
+ return exploded;
+}
+
struct unit_scale {
const char *unit;
double scale;
/* Note: field `unit' for the last element of parameter `units' should be nullptr. */
static double surf_parse_get_value_with_unit(const char *string, const struct unit_scale *units,
- const char *entity_kind, const char *name,
- const char *error_msg, const char *default_unit)
+ const char *entity_kind, const char *name, const char *error_msg, const char *default_unit)
{
char* ptr;
- double res;
int i;
errno = 0;
- res = strtod(string, &ptr);
+ double res = strtod(string, &ptr);
if (errno == ERANGE)
surf_parse_error("value out of range: %s", string);
if (ptr == string)
XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s",string, entity_kind, name, error_msg);
ptr = (char*)default_unit;
}
- for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++) {
- }
+ for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++);
+
if (units[i].unit != nullptr)
res *= units[i].scale;
else
double surf_parse_get_size(const char *string, const char *entity_kind, const char *name)
{
const struct unit_scale units[] = {
+ { "EiB", pow(1024, 6) },
+ { "PiB", pow(1024, 5) },
{ "TiB", pow(1024, 4) },
{ "GiB", pow(1024, 3) },
{ "MiB", pow(1024, 2) },
{ "KiB", 1024 },
+ { "EB", 1e18 },
+ { "PB", 1e15 },
{ "TB", 1e12 },
{ "GB", 1e9 },
{ "MB", 1e6 },
{ "kB", 1e3 },
{ "B", 1.0 },
+ { "Eib", 0.125 * pow(1024, 6) },
+ { "Pib", 0.125 * pow(1024, 5) },
{ "Tib", 0.125 * pow(1024, 4) },
{ "Gib", 0.125 * pow(1024, 3) },
{ "Mib", 0.125 * pow(1024, 2) },
{ "Kib", 0.125 * 1024 },
+ { "Eb", 0.125 * 1e18 },
+ { "Pb", 0.125 * 1e15 },
{ "Tb", 0.125 * 1e12 },
{ "Gb", 0.125 * 1e9 },
{ "Mb", 0.125 * 1e6 },
double surf_parse_get_bandwidth(const char *string, const char *entity_kind, const char *name)
{
const struct unit_scale units[] = {
+ { "EiBps", pow(1024, 6) },
+ { "PiBps", pow(1024, 5) },
{ "TiBps", pow(1024, 4) },
{ "GiBps", pow(1024, 3) },
{ "MiBps", pow(1024, 2) },
{ "KiBps", 1024 },
+ { "EBps", 1e18 },
+ { "PBps", 1e15 },
{ "TBps", 1e12 },
{ "GBps", 1e9 },
{ "MBps", 1e6 },
{ "kBps", 1e3 },
{ "Bps", 1.0 },
+ { "Eibps", 0.125 * pow(1024, 6) },
+ { "Pibps", 0.125 * pow(1024, 5) },
{ "Tibps", 0.125 * pow(1024, 4) },
{ "Gibps", 0.125 * pow(1024, 3) },
{ "Mibps", 0.125 * pow(1024, 2) },
"Append 'f' or 'flops' to your speed to get flop per second", "f");
}
+static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){
+
+ std::vector<double> speed_per_pstate;
+
+ if (strchr(speeds, ',') == nullptr){
+ double speed = surf_parse_get_speed(speeds, entity_kind, id);
+ speed_per_pstate.push_back(speed);
+ } else {
+ xbt_dynar_t pstate_list = xbt_str_split(speeds, ",");
+ unsigned int i;
+ char* speed_str;
+ xbt_dynar_foreach(pstate_list, i, speed_str) {
+ xbt_str_trim(speed_str, nullptr);
+ double speed = surf_parse_get_speed(speed_str,entity_kind, id);
+ speed_per_pstate.push_back(speed);
+ XBT_DEBUG("Speed value: %f", speed);
+ }
+ xbt_dynar_free(&pstate_list);
+ }
+ return speed_per_pstate;
+}
+
/*
* All the callback lists that can be overridden anywhere.
* (this list should probably be reduced to the bare minimum to allow the models to work)
/* The default current property receiver. Setup in the corresponding opening callbacks. */
xbt_dict_t current_property_set = nullptr;
xbt_dict_t current_model_property_set = nullptr;
-xbt_dict_t as_current_property_set = nullptr;
-int AS_TAG = 0;
-char* as_name_tab[1024];
-void* as_dict_tab[1024];
-int as_prop_nb = 0;
-
+int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties)
/* dictionary of random generator data */
xbt_dict_t random_data_list = nullptr;
/*
* 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 = SG_PLATF_STORAGE_INITIALIZER;
+ s_sg_platf_storage_cbarg_t storage;
memset(&storage,0,sizeof(storage));
+ storage.properties = current_property_set;
+ current_property_set = nullptr;
+
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;
storage.attach = A_surfxml_storage_attach;
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 = SG_PLATF_STORAGE_TYPE_INITIALIZER;
+ s_sg_platf_storage_type_cbarg_t storage_type;
memset(&storage_type,0,sizeof(storage_type));
+ storage_type.properties = current_property_set;
+ current_property_set = nullptr;
+
+ storage_type.model_properties = current_model_property_set;
+ current_model_property_set = nullptr;
+
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.model_properties = current_model_property_set;
storage_type.size = surf_parse_get_size(A_surfxml_storage___type_size,
"size of storage type", storage_type.id);
sg_platf_new_storage_type(&storage_type);
- current_property_set = nullptr;
- current_model_property_set = nullptr;
-}
-void STag_surfxml_mstorage(void)
-{
- XBT_DEBUG("STag_surfxml_mstorage");
-}
-void ETag_surfxml_mstorage(void)
-{
- s_sg_platf_mstorage_cbarg_t mstorage = SG_PLATF_MSTORAGE_INITIALIZER;
- memset(&mstorage,0,sizeof(mstorage));
-
- mstorage.name = A_surfxml_mstorage_name;
- mstorage.type_id = A_surfxml_mstorage_typeId;
- sg_platf_new_mstorage(&mstorage);
}
-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 = SG_PLATF_MOUNT_INITIALIZER;
+ s_sg_platf_mount_cbarg_t mount;
memset(&mount,0,sizeof(mount));
mount.name = A_surfxml_mount_name;
/*
* Stuff relative to the <include> tag
*/
-static xbt_dynar_t surf_input_buffer_stack = nullptr;
-static xbt_dynar_t surf_file_to_parse_stack = nullptr;
-static xbt_dynar_t surf_parsed_filename_stack = nullptr;
+static std::vector<YY_BUFFER_STATE> surf_input_buffer_stack;
+static std::vector<FILE*> surf_file_to_parse_stack;
+static std::vector<char*> surf_parsed_filename_stack;
-void STag_surfxml_include(void)
+void STag_surfxml_include()
{
parse_after_config();
XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file);
- xbt_dynar_push(surf_parsed_filename_stack,&surf_parsed_filename); // save old file name
+ surf_parsed_filename_stack.push_back(surf_parsed_filename); // save old file name
surf_parsed_filename = xbt_strdup(A_surfxml_include_file);
- xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor
+ surf_file_to_parse_stack.push_back(surf_file_to_parse); // save old file descriptor
surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", A_surfxml_include_file);
- xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer);
+ surf_input_buffer_stack.push_back(surf_input_buffer);
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse_push_buffer_state(surf_input_buffer);
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 */
}
* error message in that case.
*
* Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
- * directly: a command line flag could instruct it to do the correct thing when #include is encountered
+ * directly: a command line flag could instruct it to do the correct thing when the include directive 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);
- if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely.
+ if (surf_input_buffer_stack.empty()) // nope, that's a true premature EOF. Let the parser die verbosely.
return 0;
// Yeah, we were in an <include> Restore state and proceed.
fclose(surf_file_to_parse);
- xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
+ surf_file_to_parse_stack.pop_back();
surf_parse_pop_buffer_state();
- xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+ surf_input_buffer_stack.pop_back();
// Restore the filename for error messages
free(surf_parsed_filename);
- xbt_dynar_pop(surf_parsed_filename_stack,&surf_parsed_filename);
+ surf_parsed_filename_stack.pop_back();
return 1;
}
/* 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){
- 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 set %p for AS '%s'",as_dict_tab[as_prop_nb],as_name_tab[as_prop_nb]);
- as_prop_nb++;
- }
- XBT_DEBUG("add prop %s=%s into current AS property set", A_surfxml_prop_id, A_surfxml_prop_value);
- xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr);
+ if (AS_TAG) { // We need to retrieve the most recently opened AS
+ XBT_DEBUG("Set AS property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
+ simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id);
+
+ netzone->setProperty(A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value));
}
else{
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), xbt_free_f);
- XBT_DEBUG("add prop %s=%s into current property set", A_surfxml_prop_id, A_surfxml_prop_value);
+ 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), nullptr);
+ XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value,
+ current_property_set);
}
}
-void ETag_surfxml_host(void) {
- s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
- char* buf;
+void ETag_surfxml_host() {
+ s_sg_platf_host_cbarg_t host;
memset(&host,0,sizeof(host));
-
host.properties = current_property_set;
+ current_property_set = nullptr;
host.id = A_surfxml_host_id;
- buf = A_surfxml_host_speed;
- XBT_DEBUG("Buffer: %s", buf);
- host.speed_peak = xbt_dynar_new(sizeof(double), nullptr);
- if (strchr(buf, ',') == nullptr){
- double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id);
- xbt_dynar_push_as(host.speed_peak,double, speed);
- }
- else {
- xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
- unsigned int i;
- for (i = 0; i < xbt_dynar_length(pstate_list); i++) {
- double speed;
- char* speed_str;
-
- xbt_dynar_get_cpy(pstate_list, i, &speed_str);
- xbt_str_trim(speed_str, nullptr);
- speed = surf_parse_get_speed(speed_str,"speed of host", host.id);
- xbt_dynar_push_as(host.speed_peak, double, speed);
- XBT_DEBUG("Speed value: %f", speed);
- }
- xbt_dynar_free(&pstate_list);
- }
+ host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id);
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;
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_peak);
- 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 = SG_PLATF_HOST_LINK_INITIALIZER;
+ s_sg_platf_host_link_cbarg_t host_link;
memset(&host_link,0,sizeof(host_link));
host_link.id = A_surfxml_host___link_id;
sg_platf_new_hostlink(&host_link);
}
-void STag_surfxml_router(void){
- s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
- memset(&router, 0, sizeof(router));
-
- router.id = A_surfxml_router_id;
- router.coord = A_surfxml_router_coordinates;
-
- sg_platf_new_router(&router);
+void STag_surfxml_router(){
+ sg_platf_new_router(A_surfxml_router_id, A_surfxml_router_coordinates);
}
-void ETag_surfxml_cluster(void){
- s_sg_platf_cluster_cbarg_t cluster = SG_PLATF_CLUSTER_INITIALIZER;
+void ETag_surfxml_cluster(){
+ s_sg_platf_cluster_cbarg_t cluster;
memset(&cluster,0,sizeof(cluster));
- cluster.properties = as_current_property_set;
+ cluster.properties = current_property_set;
+ current_property_set = nullptr;
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.speed = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id);
+ cluster.radicals = explodesRadical(A_surfxml_cluster_radical);
+ cluster.speeds = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id);
cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core);
cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id);
cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id);
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);
cluster.sharing_policy = SURF_LINK_FATPIPE;
break;
default:
- surf_parse_error("Invalid cluster sharing policy for cluster %s",
- cluster.id);
+ surf_parse_error("Invalid cluster sharing policy for cluster %s", cluster.id);
break;
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
cluster.bb_sharing_policy = SURF_LINK_SHARED;
break;
default:
- surf_parse_error("Invalid bb sharing policy in cluster %s",
- cluster.id);
+ surf_parse_error("Invalid bb sharing policy in cluster %s", cluster.id);
break;
}
- cluster.availability_trace = A_surfxml_cluster_availability___file;
- cluster.state_trace = A_surfxml_cluster_state___file;
sg_platf_new_cluster(&cluster);
-
- current_property_set = nullptr;
}
-void STag_surfxml_cluster(void){
+void STag_surfxml_cluster(){
+ AS_TAG = 0;
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 = SG_PLATF_CABINET_INITIALIZER;
+ s_sg_platf_cabinet_cbarg_t cabinet;
memset(&cabinet,0,sizeof(cabinet));
cabinet.id = A_surfxml_cabinet_id;
cabinet.prefix = A_surfxml_cabinet_prefix;
cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id);
cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id);
cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id);
- cabinet.radical = A_surfxml_cabinet_radical;
+ cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical);
sg_platf_new_cabinet(&cabinet);
}
-void STag_surfxml_peer(void){
+void STag_surfxml_peer(){
parse_after_config();
- s_sg_platf_peer_cbarg_t peer = SG_PLATF_PEER_INITIALIZER;
+ s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
- peer.id = A_surfxml_peer_id;
- peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
- peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
- 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.id = A_surfxml_peer_id;
+ peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
+ peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
+ peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
+ peer.coord = A_surfxml_peer_coordinates;
+ peer.speed_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;
+
+ if (A_surfxml_peer_lat[0] != '\0')
+ XBT_WARN("The latency parameter in <peer> is now deprecated. Use the z coordinate instead of '%s'.",
+ A_surfxml_peer_lat);
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){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
- memset(&link,0,sizeof(link));
+void ETag_surfxml_link(){
+ LinkCreationArgs 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.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;
+ current_property_set = nullptr;
+
+ link.id = std::string(A_surfxml_link_id);
+ link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str());
+ 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.c_str());
+ 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:
link.policy = SURF_LINK_FULLDUPLEX;
break;
default:
- surf_parse_error("Invalid sharing policy in link %s", link.id);
+ surf_parse_error("Invalid sharing policy in link %s", link.id.c_str());
break;
}
sg_platf_new_link(&link);
-
- current_property_set = nullptr;
}
-void STag_surfxml_link___ctn(void){
+void STag_surfxml_link___ctn(){
- char *link_id;
+ simgrid::surf::LinkImpl* link = nullptr;
+ char *link_name=nullptr;
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);
+ link = simgrid::surf::LinkImpl::byName(A_surfxml_link___ctn_id);
break;
case A_surfxml_link___ctn_direction_UP:
- link_id = bprintf("%s_UP", A_surfxml_link___ctn_id);
+ link_name = bprintf("%s_UP", A_surfxml_link___ctn_id);
+ link = simgrid::surf::LinkImpl::byName(link_name);
break;
case A_surfxml_link___ctn_direction_DOWN:
- link_id = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+ link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id);
+ link = simgrid::surf::LinkImpl::byName(link_name);
break;
}
+ xbt_free(link_name); // no-op if it's already nullptr
- // 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);
+ const char* dirname = "";
+ switch (A_surfxml_link___ctn_direction) {
+ case A_surfxml_link___ctn_direction_UP:
+ dirname = " (upward)";
+ break;
+ case A_surfxml_link___ctn_direction_DOWN:
+ dirname = " (downward)";
+ break;
+ default:
+ dirname = "";
+ }
+ surf_parse_assert(link != nullptr, "No such link: '%s'%s", A_surfxml_link___ctn_id, dirname);
+ parsed_link_list.push_back(link);
}
-void ETag_surfxml_backbone(void){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
- memset(&link,0,sizeof(link));
+void ETag_surfxml_backbone(){
+ LinkCreationArgs link;
link.properties = nullptr;
-
- link.id = A_surfxml_backbone_id;
- link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id);
- link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id);
+ link.id = std::string(A_surfxml_backbone_id);
+ link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str());
+ link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str());
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id));
+ routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(A_surfxml_backbone_id));
}
-void STag_surfxml_route(void){
- 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),
- "Route dst='%s' does name a node.", A_surfxml_route_dst);
- parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+void STag_surfxml_route(){
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_route_src), "Route src='%s' does name a node.",
+ A_surfxml_route_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_route_dst), "Route dst='%s' does name a node.",
+ A_surfxml_route_dst);
}
-void STag_surfxml_ASroute(void){
- 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),
- "ASroute dst='%s' does name a node.", A_surfxml_route_dst);
-
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src),
- "ASroute gw_src='%s' does name a node.", A_surfxml_ASroute_gw___src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst),
- "ASroute gw_dst='%s' does name a node.", A_surfxml_ASroute_gw___dst);
+void STag_surfxml_ASroute(){
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_src), "ASroute src='%s' does name a node.",
+ A_surfxml_route_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst), "ASroute dst='%s' does name a node.",
+ A_surfxml_route_dst);
- parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src), "ASroute gw_src='%s' does name a node.",
+ A_surfxml_ASroute_gw___src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst), "ASroute gw_dst='%s' does name a node.",
+ A_surfxml_ASroute_gw___dst);
}
-void STag_surfxml_bypassRoute(void){
- 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),
- "bypassRoute dst='%s' does name a node.", A_surfxml_bypassRoute_dst);
-
- parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+void STag_surfxml_bypassRoute(){
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src), "bypassRoute src='%s' does name a node.",
+ A_surfxml_bypassRoute_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_dst), "bypassRoute dst='%s' does name a node.",
+ A_surfxml_bypassRoute_dst);
}
-void STag_surfxml_bypassASroute(void){
- 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),
- "bypassASroute dst='%s' does name a node.", A_surfxml_bypassASroute_dst);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src),
- "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassASroute_gw___src);
- surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst),
- "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst);
-
- parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+void STag_surfxml_bypassASroute(){
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_src),
+ "bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst),
+ "bypassASroute dst='%s' does name a node.", A_surfxml_bypassASroute_dst);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src),
+ "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassASroute_gw___src);
+ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst),
+ "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst);
}
-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_netpoint_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag
+ route.dst = sg_netpoint_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*>();
+ route.link_list = new std::vector<simgrid::surf::LinkImpl*>();
route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES);
- unsigned int cpt;
- char *link_name;
- xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ for (auto link: parsed_link_list)
route.link_list->push_back(link);
- }
-
-
+ parsed_link_list.clear();
sg_platf_new_route(&route);
- parsed_link_list = nullptr;
+ delete route.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_netpoint_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag
+ ASroute.dst = sg_netpoint_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_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag
+ ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag
- ASroute.link_list = new std::vector<Link*>();
+ ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
- unsigned int cpt;
- char *link_name;
- xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ for (auto link: parsed_link_list)
ASroute.link_list->push_back(link);
- }
+ parsed_link_list.clear();
switch (A_surfxml_ASroute_symmetrical) {
case AU_surfxml_ASroute_symmetrical:
}
sg_platf_new_route(&ASroute);
- parsed_link_list = nullptr;
+ 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_netpoint_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag
+ route.dst = sg_netpoint_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;
- route.link_list = new std::vector<Link*>();
+ route.link_list = new std::vector<simgrid::surf::LinkImpl*>();
- unsigned int cpt;
- char *link_name;
- xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ for (auto link: parsed_link_list)
route.link_list->push_back(link);
- }
- xbt_dynar_free(&parsed_link_list);
+ parsed_link_list.clear();
sg_platf_new_bypassRoute(&route);
+ delete route.link_list;
}
-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*>();
- unsigned int cpt;
- char *link_name;
- xbt_dynar_foreach(parsed_link_list, cpt, link_name) {
- simgrid::surf::Link *link = Link::byName(link_name);
+ ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_src);
+ ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst);
+ ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
+ for (auto link: parsed_link_list)
ASroute.link_list->push_back(link);
- }
- xbt_dynar_free(&parsed_link_list);
+ parsed_link_list.clear();
+
ASroute.symmetrical = false;
- ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src);
- ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
+ ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src);
+ ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
sg_platf_new_bypassRoute(&ASroute);
+ delete ASroute.link_list;
}
-void ETag_surfxml_trace(void){
- s_sg_platf_trace_cbarg_t trace = SG_PLATF_TRACE_INITIALIZER;
+void ETag_surfxml_trace(){
+ s_sg_platf_trace_cbarg_t trace;
memset(&trace,0,sizeof(trace));
trace.id = A_surfxml_trace_id;
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 = SG_PLATF_TRACE_CONNECT_INITIALIZER;
+ s_sg_platf_trace_connect_cbarg_t trace_connect;
memset(&trace_connect,0,sizeof(trace_connect));
trace_connect.element = A_surfxml_trace___connect_element;
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 = SG_PLATF_AS_INITIALIZER;
- AS.id = A_surfxml_AS_id;
- AS.routing = (int)A_surfxml_AS_routing;
-
- as_current_property_set = nullptr;
+ 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){
- 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];
- 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();
+void ETag_surfxml_AS(){
+ 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;
- char *cfg;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
- cfg = bprintf("%s:%s",key,elem);
- if(xbt_cfg_is_default_value(_sg_cfg_set, key))
- xbt_cfg_set_parse(_sg_cfg_set, cfg);
- else
+ if (xbt_cfg_is_default_value(key)) {
+ char* cfg = bprintf("%s:%s", key, elem);
+ xbt_cfg_set_parse(cfg);
+ free(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);
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){
- s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
+void ETag_surfxml_process(){
+ s_sg_platf_process_cbarg_t process;
memset(&process,0,sizeof(process));
process.argc = argc;
}
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);
xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr);
}
-/* 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(){/* Nothing to do */}
+void STag_surfxml_random(){/* Nothing to do */}
+void ETag_surfxml_random(){/* Nothing to do */}
+void ETag_surfxml_trace___connect(){/* Nothing to do */}
+void STag_surfxml_trace(){parse_after_config();}
+void ETag_surfxml_router(){/*Nothing to do*/}
+void ETag_surfxml_host___link(){/* Nothing to do */}
+void ETag_surfxml_cabinet(){/* Nothing to do */}
+void ETag_surfxml_peer(){/* Nothing to do */}
+void STag_surfxml_backbone(){/* Nothing to do */}
+void ETag_surfxml_link___ctn(){/* Nothing to do */}
+void ETag_surfxml_argument(){/* Nothing to do */}
+void ETag_surfxml_model___prop(){/* Nothing to do */}
/* 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.");
-
- if (!surf_input_buffer_stack)
- surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr);
- if (!surf_file_to_parse_stack)
- surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), nullptr);
-
- if (!surf_parsed_filename_stack)
- surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
surf_parsed_filename = xbt_strdup(file);
char *dir = xbt_dirname(file);
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);
- xbt_dynar_free(&surf_parsed_filename_stack);
if (surf_parsed_filename) {
char *dir = nullptr;
xbt_dynar_pop(surf_path, &dir);
}
/* 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;
+int_f_void_t surf_parse = _surf_parse;
-/* Prop tag functions */
-
-/**
- * With XML parser
- */
-xbt_dict_t get_as_router_properties(const char* name)
-{
- return (xbt_dict_t)xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
-}
-
+SG_END_DECL()
