#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 "simgrid_dtd.c"
-char* surf_parsed_filename = NULL; // to locate parse error messages
+char* surf_parsed_filename = nullptr; // to locate parse error messages
-xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */
+xbt_dynar_t parsed_link_list = nullptr; /* temporary store of current list link of a route */
/*
* Helping functions
*/
double scale;
};
-/* Note: field `unit' for the last element of parameter `units' should be
- * NULL. */
+/* 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)
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 != NULL && 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 != NULL)
+ if (units[i].unit != nullptr)
res *= units[i].scale;
else
surf_parse_error("unknown unit: %s", ptr);
{ "us", 1e-6 },
{ "ns", 1e-9 },
{ "ps", 1e-12 },
- { NULL, 0 }
+ { nullptr, 0 }
};
return surf_parse_get_value_with_unit(string, units, entity_kind, name,
"Append 's' to your time to get seconds", "s");
{ "Mb", 0.125 * 1e6 },
{ "kb", 0.125 * 1e3 },
{ "b", 0.125 },
- { NULL, 0 }
+ { nullptr, 0 }
};
return surf_parse_get_value_with_unit(string, units, entity_kind, name,
"Append 'B' to get bytes (or 'b' for bits but 1B = 8b).", "B");
{ "Mbps", 0.125 * 1e6 },
{ "kbps", 0.125 * 1e3 },
{ "bps", 0.125 },
- { NULL, 0 }
+ { nullptr, 0 }
};
return surf_parse_get_value_with_unit(string, units, entity_kind, name,
"Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps");
{ "kf", 1e3 },
{ "flops", 1.0 },
{ "f", 1.0 },
- { NULL, 0 }
+ { nullptr, 0 }
};
return surf_parse_get_value_with_unit(string, units, entity_kind, name,
"Append 'f' or 'flops' to your speed to get flop per second", "f");
/* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
/* The default current property receiver. Setup in the corresponding opening callbacks. */
-xbt_dict_t current_property_set = NULL;
-xbt_dict_t current_model_property_set = NULL;
-xbt_dict_t as_current_property_set = NULL;
+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];
/* dictionary of random generator data */
-xbt_dict_t random_data_list = NULL;
+xbt_dict_t random_data_list = nullptr;
YY_BUFFER_STATE surf_input_buffer;
-FILE *surf_file_to_parse = NULL;
+FILE *surf_file_to_parse = nullptr;
/*
* Stuff relative to storage
{
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)");
+ 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)
{
storage.properties = current_property_set;
storage.attach = A_surfxml_storage_attach;
sg_platf_new_storage(&storage);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void STag_surfxml_storage___type(void)
{
AS_TAG = 0;
XBT_DEBUG("STag_surfxml_storage___type");
- xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
- xbt_assert(current_model_property_set == NULL, "Someone forgot to reset the model property set to NULL in its closing tag (or XML malformed)");
+ 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)
{
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 = NULL;
- current_model_property_set = NULL;
+ current_property_set = nullptr;
+ current_model_property_set = nullptr;
}
void STag_surfxml_mstorage(void)
{
/*
* Stuff relative to the <include> tag
*/
-static xbt_dynar_t surf_input_buffer_stack = NULL;
-static xbt_dynar_t surf_file_to_parse_stack = NULL;
-static xbt_dynar_t surf_parsed_filename_stack = NULL;
+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;
void STag_surfxml_include(void)
{
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse_push_buffer_state(surf_input_buffer);
- fflush(NULL);
+ fflush(nullptr);
}
void ETag_surfxml_include(void) {
*/
int ETag_surfxml_include_state(void)
{
- fflush(NULL);
+ 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.
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)");
+ 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)
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), NULL);
+ xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr);
}
else{
if (!current_property_set)
buf = A_surfxml_host_speed;
XBT_DEBUG("Buffer: %s", buf);
- host.speed_peak = xbt_dynar_new(sizeof(double), NULL);
- if (strchr(buf, ',') == NULL){
+ 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);
}
char* speed_str;
xbt_dynar_get_cpy(pstate_list, i, &speed_str);
- xbt_str_trim(speed_str, NULL);
+ 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);
sg_platf_new_host(&host);
xbt_dynar_free(&host.speed_peak);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void STag_surfxml_host___link(void){
cluster.state_trace = A_surfxml_cluster_state___file;
sg_platf_new_cluster(&cluster);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void STag_surfxml_cluster(void){
parse_after_config();
- xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ 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_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)");
+ 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){
sg_platf_new_link(&link);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void STag_surfxml_link___ctn(void){
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link,0,sizeof(link));
- link.properties = NULL;
+ link.properties = nullptr;
link.id = A_surfxml_backbone_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id);
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:
- case A_surfxml_route_symmetrical_YES:
- route.symmetrical = TRUE;
- break;
- case A_surfxml_route_symmetrical_NO:
- route.symmetrical = FALSE;;
- break;
+ route.gw_src = nullptr;
+ route.gw_dst = nullptr;
+ route.link_list = new std::vector<Link*>();
+ 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);
+ route.link_list->push_back(link);
}
+
+
sg_platf_new_route(&route);
- parsed_link_list = NULL;
+ parsed_link_list = nullptr;
}
void ETag_surfxml_ASroute(void){
surf_parse_error("gw_dst=\"%s\" not found for ASroute from \"%s\" to \"%s\"",
A_surfxml_ASroute_gw___dst, ASroute.src, ASroute.dst);
- ASroute.link_list = parsed_link_list;
+ 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.link_list->push_back(link);
+ }
switch (A_surfxml_ASroute_symmetrical) {
case AU_surfxml_ASroute_symmetrical:
case A_surfxml_ASroute_symmetrical_YES:
- ASroute.symmetrical = TRUE;
+ ASroute.symmetrical = true;
break;
case A_surfxml_ASroute_symmetrical_NO:
- ASroute.symmetrical = FALSE;
+ ASroute.symmetrical = false;
break;
}
sg_platf_new_route(&ASroute);
- parsed_link_list = NULL;
+ parsed_link_list = nullptr;
}
void ETag_surfxml_bypassRoute(void){
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;
+ route.gw_src = nullptr;
+ route.gw_dst = nullptr;
+ route.symmetrical = false;
+ route.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);
+ route.link_list->push_back(link);
+ }
+ xbt_dynar_free(&parsed_link_list);
sg_platf_new_bypassRoute(&route);
- xbt_dynar_free(&parsed_link_list);
}
void ETag_surfxml_bypassASroute(void){
ASroute.src = A_surfxml_bypassASroute_src;
ASroute.dst = A_surfxml_bypassASroute_dst;
- ASroute.link_list = parsed_link_list;
- ASroute.symmetrical = FALSE;
+ 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.link_list->push_back(link);
+ }
+ xbt_dynar_free(&parsed_link_list);
+ 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);
sg_platf_new_bypassRoute(&ASroute);
- xbt_dynar_free(&parsed_link_list);
}
void ETag_surfxml_trace(void){
AS.id = A_surfxml_AS_id;
AS.routing = (int)A_surfxml_AS_routing;
- as_current_property_set = NULL;
+ as_current_property_set = nullptr;
sg_platf_new_AS_begin(&AS);
}
void STag_surfxml_config(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)");
+ 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);
if (_sg_cfg_init_status == 2) {
surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
}
}
void ETag_surfxml_config(void){
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
char *key;
char *elem;
char *cfg;
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
xbt_dict_free(¤t_property_set);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
static int argc;
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)");
+ 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){
}
sg_platf_new_process(&process);
- current_property_set = NULL;
+ current_property_set = nullptr;
}
void STag_surfxml_argument(void){
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), NULL);
+ xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr);
}
void STag_surfxml_gpu(void) {}
void surf_parse_open(const char *file)
{
- static int warned = 0; /* warn only once */
- if (!file) {
- if (!warned) {
- XBT_WARN
- ("Bypassing the XML parser since surf_parse_open received a NULL pointer. "
- "If it is not what you want, go fix your code.");
- warned = 1;
- }
- return;
- }
+ 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), NULL);
+ 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 *), NULL);
+ 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_dynar_free(&surf_file_to_parse_stack);
xbt_dynar_free(&surf_parsed_filename_stack);
if (surf_parsed_filename) {
- char *dir = NULL;
+ char *dir = nullptr;
xbt_dynar_pop(surf_path, &dir);
free(dir);
}
free(surf_parsed_filename);
- surf_parsed_filename = NULL;
+ surf_parsed_filename = nullptr;
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);
fclose(surf_file_to_parse);
- surf_file_to_parse = NULL; //Must be reset for Bypass
+ surf_file_to_parse = nullptr; //Must be reset for Bypass
}
}
