-/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. 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
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <errno.h>
+#include <math.h>
#include <stdarg.h> /* va_arg */
#include "xbt/misc.h"
#include "xbt/log.h"
#include "xbt/str.h"
+#include "xbt/file.h"
#include "xbt/dict.h"
#include "surf/surfxml_parse.h"
#include "surf/surf_private.h"
+#include "surf/random_mgr.h"
#include "simgrid/sg_config.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
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
*/
void surf_parse_error(const char *fmt, ...) {
va_list va;
va_start(va,fmt);
+ int lineno = surf_parse_lineno;
char *msg = bvprintf(fmt,va);
va_end(va);
- xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+ cleanup();
+ XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg);
+ surf_exit();
+ xbt_die("Exiting now");
}
void surf_parse_warn(const char *fmt, ...) {
va_list va;
int ret = sscanf(string, "%lg", &res);
if (ret != 1)
surf_parse_error("%s is not a double", string);
+ //printf("Parsed double [%g] %s\n", res, string);
return res;
}
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.
/* 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;
int AS_TAG = 0;
char* as_name_tab[1024];
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
-static void init_randomness(void);
-static void add_randomness(void);
-
/*
* Stuff relative to storage
*/
}
void ETag_surfxml_storage(void)
{
- s_sg_platf_storage_cbarg_t storage;
+ s_sg_platf_storage_cbarg_t storage = SG_PLATF_STORAGE_INITIALIZER;
memset(&storage,0,sizeof(storage));
- storage.id = A_surfxml_storage_id;
- storage.type_id = A_surfxml_storage_typeId;
- storage.content = A_surfxml_storage_content;
- storage.properties = current_property_set;
+ 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 = NULL;
}
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)");
}
void ETag_surfxml_storage___type(void)
{
- s_sg_platf_storage_type_cbarg_t storage_type;
+ s_sg_platf_storage_type_cbarg_t storage_type = SG_PLATF_STORAGE_TYPE_INITIALIZER;
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.properties = current_property_set;
- storage_type.size = surf_parse_get_int(A_surfxml_storage___type_size);
+ 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);
sg_platf_new_storage_type(&storage_type);
- current_property_set = NULL;
+ current_property_set = NULL;
+ current_model_property_set = NULL;
}
void STag_surfxml_mstorage(void)
{
}
void ETag_surfxml_mstorage(void)
{
- s_sg_platf_mstorage_cbarg_t mstorage;
+ s_sg_platf_mstorage_cbarg_t mstorage = SG_PLATF_MSTORAGE_INITIALIZER;
memset(&mstorage,0,sizeof(mstorage));
- mstorage.name = A_surfxml_mstorage_name;
+ mstorage.name = A_surfxml_mstorage_name;
mstorage.type_id = A_surfxml_mstorage_typeId;
sg_platf_new_mstorage(&mstorage);
}
}
void ETag_surfxml_mount(void)
{
- s_sg_platf_mount_cbarg_t mount;
+ s_sg_platf_mount_cbarg_t mount = SG_PLATF_MOUNT_INITIALIZER;
memset(&mount,0,sizeof(mount));
- mount.name = A_surfxml_mount_name;
- mount.id = A_surfxml_mount_id;
+ mount.name = A_surfxml_mount_name;
+ mount.storageId = A_surfxml_mount_storageId;
sg_platf_new_mount(&mount);
}
/*
* 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_input_buffer_stack = NULL;
+static xbt_dynar_t surf_file_to_parse_stack = NULL;
static xbt_dynar_t surf_parsed_filename_stack = NULL;
void STag_surfxml_include(void)
{
+ 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 = xbt_strdup(A_surfxml_include_file);
/** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes
*
- * This function is called automatically by sedding the parser in buildtools/Cmake/MaintainerMode.cmake
+ * This function is called automatically by sedding the parser in tools/cmake/MaintainerMode.cmake
* Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the
* previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the
* error message in that case.
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]);
+ 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), 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);
+ 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);
}
}
void ETag_surfxml_host(void) {
- s_sg_platf_host_cbarg_t host;
+ s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
+ 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: %f", power_value);
+ }
+ xbt_dynar_free(&pstate_list);
+ }
+
+ 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.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)
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;
+ s_sg_platf_host_link_cbarg_t host_link = SG_PLATF_HOST_LINK_INITIALIZER;
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.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);
}
void STag_surfxml_router(void){
- s_sg_platf_router_cbarg_t router;
+ s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
memset(&router, 0, sizeof(router));
- router.id = A_surfxml_router_id;
+ router.id = A_surfxml_router_id;
router.coord = A_surfxml_router_coordinates;
sg_platf_new_router(&router);
}
-void STag_surfxml_cluster(void){
- s_sg_platf_cluster_cbarg_t cluster;
+void ETag_surfxml_cluster(void){
+ s_sg_platf_cluster_cbarg_t cluster = SG_PLATF_CLUSTER_INITIALIZER;
memset(&cluster,0,sizeof(cluster));
- 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.properties = as_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_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);
+ 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_double(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_double(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);
+
+ switch(AX_surfxml_cluster_topology){
+ case A_surfxml_cluster_topology_FLAT:
+ cluster.topology= SURF_CLUSTER_FLAT ;
+ break;
+ case A_surfxml_cluster_topology_TORUS:
+ cluster.topology= SURF_CLUSTER_TORUS ;
+ break;
+ case A_surfxml_cluster_topology_FAT___TREE:
+ cluster.topology = SURF_CLUSTER_FAT_TREE;
+ break;
+ default:
+ surf_parse_error("Invalid cluster topology for cluster %s",
+ cluster.id);
+ break;
+ }
+ cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
switch (AX_surfxml_cluster_sharing___policy) {
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){
+ 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)");
}
void STag_surfxml_cabinet(void){
- s_sg_platf_cabinet_cbarg_t cabinet;
+ parse_after_config();
+ s_sg_platf_cabinet_cbarg_t cabinet = SG_PLATF_CABINET_INITIALIZER;
memset(&cabinet,0,sizeof(cabinet));
- 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.id = A_surfxml_cabinet_id;
+ cabinet.prefix = A_surfxml_cabinet_prefix;
+ cabinet.suffix = A_surfxml_cabinet_suffix;
+ 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);
}
void STag_surfxml_peer(void){
- s_sg_platf_peer_cbarg_t peer;
+ parse_after_config();
+ s_sg_platf_peer_cbarg_t peer = SG_PLATF_PEER_INITIALIZER;
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.coord = A_surfxml_peer_coordinates;
+ peer.id = A_surfxml_peer_id;
+ 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.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state___file);
sg_platf_new_peer(&peer);
}
}
void ETag_surfxml_link(void){
- s_sg_platf_link_cbarg_t link;
+ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link,0,sizeof(link));
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.id = A_surfxml_link_id;
+ link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth);
+ //printf("Link bandwidth [%g]\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 [%g]\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:
}
void ETag_surfxml_backbone(void){
- s_sg_platf_link_cbarg_t link;
+ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
memset(&link,0,sizeof(link));
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));
+ routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id));
}
void STag_surfxml_route(void){
}
void ETag_surfxml_route(void){
- s_sg_platf_route_cbarg_t route;
+ s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
memset(&route,0,sizeof(route));
- route.src = A_surfxml_route_src;
- route.dst = A_surfxml_route_dst;
- route.gw_src = NULL;
- route.gw_dst = NULL;
+ 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) {
}
void ETag_surfxml_ASroute(void){
- s_sg_platf_route_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute = SG_PLATF_ROUTE_INITIALIZER;
memset(&ASroute,0,sizeof(ASroute));
ASroute.src = A_surfxml_ASroute_src;
ASroute.dst = A_surfxml_ASroute_dst;
- if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
- // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
- // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
- //
- // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
- ASroute.gw_src = (sg_routing_edge_t) A_surfxml_ASroute_gw___src;
- ASroute.gw_dst = (sg_routing_edge_t) A_surfxml_ASroute_gw___dst;
- } else {
- ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw___src);
- ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_ASroute_gw___dst);
- }
+ ASroute.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);
+
+ 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.link_list = parsed_link_list;
}
void ETag_surfxml_bypassRoute(void){
- s_sg_platf_route_cbarg_t route;
+ s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
memset(&route,0,sizeof(route));
route.src = A_surfxml_bypassRoute_src;
}
void ETag_surfxml_bypassASroute(void){
- s_sg_platf_route_cbarg_t ASroute;
+ s_sg_platf_route_cbarg_t ASroute = SG_PLATF_ROUTE_INITIALIZER;
memset(&ASroute,0,sizeof(ASroute));
- ASroute.src = A_surfxml_bypassASroute_src;
- ASroute.dst = A_surfxml_bypassASroute_dst;
- ASroute.link_list = parsed_link_list;
+ ASroute.src = A_surfxml_bypassASroute_src;
+ ASroute.dst = A_surfxml_bypassASroute_dst;
+ ASroute.link_list = parsed_link_list;
ASroute.symmetrical = FALSE;
- if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
- // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
- // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
- //
- // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
- ASroute.gw_src = (sg_routing_edge_t) A_surfxml_bypassASroute_gw___src;
- ASroute.gw_dst = (sg_routing_edge_t) A_surfxml_bypassASroute_gw___dst;
- } else {
- ASroute.gw_src = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw___src);
- ASroute.gw_dst = sg_routing_edge_by_name_or_null(A_surfxml_bypassASroute_gw___dst);
- }
+ 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){
- s_sg_platf_trace_cbarg_t trace;
+ s_sg_platf_trace_cbarg_t trace = SG_PLATF_TRACE_INITIALIZER;
memset(&trace,0,sizeof(trace));
trace.id = A_surfxml_trace_id;
}
void STag_surfxml_trace___connect(void){
- s_sg_platf_trace_connect_cbarg_t trace_connect;
+ parse_after_config();
+ s_sg_platf_trace_connect_cbarg_t trace_connect = SG_PLATF_TRACE_CONNECT_INITIALIZER;
memset(&trace_connect,0,sizeof(trace_connect));
trace_connect.element = A_surfxml_trace___connect_element;
}
void STag_surfxml_AS(void){
- AS_TAG = 1;
+ 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.id = A_surfxml_AS_id;
+ AS.routing = (int)A_surfxml_AS_routing;
as_current_property_set = NULL;
}
void ETag_surfxml_AS(void){
if(as_prop_nb){
- char *name = as_name_tab[as_prop_nb-1];
+ 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);
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){
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) {
+ 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).");
}
}
free(cfg);
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
+
xbt_dict_free(¤t_property_set);
current_property_set = NULL;
}
static char **argv;
void STag_surfxml_process(void){
- AS_TAG = 0;
- argc = 1;
- argv = xbt_new(char *, 1);
+ 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;
+ s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
memset(&process,0,sizeof(process));
- process.argc = argc;
- process.argv = (const char **)argv;
+ 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.host = A_surfxml_process_host;
+ process.function = A_surfxml_process_function;
process.start_time = surf_parse_get_double(A_surfxml_process_start___time);
- process.kill_time = surf_parse_get_double(A_surfxml_process_kill___time);
+ process.kill_time = surf_parse_get_double(A_surfxml_process_kill___time);
switch (A_surfxml_process_on___failure) {
case AU_surfxml_process_on___failure:
argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
}
+void STag_surfxml_model___prop(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);
+}
+
/* ***************************************** */
/* TUTORIAL: New TAG */
void STag_surfxml_gpu(void)
}
void ETag_surfxml_gpu(void)
{
- s_sg_platf_gpu_cbarg_t gpu;
+ s_sg_platf_gpu_cbarg_t gpu = SG_PLATF_GPU_INITIALIZER;
memset(&gpu,0,sizeof(gpu));
gpu.name = A_surfxml_gpu_name;
void STag_surfxml_random(void){}
void ETag_surfxml_random(void){}
void ETag_surfxml_trace___connect(void){}
-void STag_surfxml_trace(void){}
+void STag_surfxml_trace(void){parse_after_config();}
void ETag_surfxml_router(void){}
void ETag_surfxml_host___link(void){}
-void ETag_surfxml_cluster(void){}
void ETag_surfxml_cabinet(void){}
void ETag_surfxml_peer(void){}
void STag_surfxml_backbone(void){}
void ETag_surfxml_link___ctn(void){}
void ETag_surfxml_argument(void){}
+void ETag_surfxml_model___prop(void){}
/* Open and Close parse file */
if (!surf_parsed_filename_stack)
surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- surf_parsed_filename = xbt_strdup(file);
+
+ char *dir = xbt_dirname(file);
+ xbt_dynar_push(surf_path, &dir);
surf_file_to_parse = surf_fopen(file, "r");
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file);
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 = NULL;
+ xbt_dynar_pop(surf_path, dir);
+ free(dir);
+ }
free(surf_parsed_filename);
surf_parsed_filename = NULL;
* With XML parser
*/
-/* Random tag functions */
-
double get_cpu_power(const char *power)
{
double power_scale = 0.0;
power_scale = random_generate(random);
}
} else {
- power_scale = surf_parse_get_double(power);
+ power_scale = surf_parse_get_power(power);
}
return power_scale;
}
e_random_generator_t random_generator;
char *random_id;
-static void init_randomness(void)
-{
- random_id = A_surfxml_random_id;
- 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);
- switch (A_surfxml_random_generator) {
- case AU_surfxml_random_generator:
- case A_surfxml_random_generator_NONE:
- random_generator = NONE;
- break;
- case A_surfxml_random_generator_DRAND48:
- random_generator = DRAND48;
- break;
- case A_surfxml_random_generator_RAND:
- random_generator = RAND;
- break;
- case A_surfxml_random_generator_RNGSTREAM:
- random_generator = RNGSTREAM;
- break;
- default:
- surf_parse_error("Invalid random generator");
- break;
- }
-}
-
-static void add_randomness(void)
-{
- /* If needed aditional properties can be added by using the prop tag */
- random_data_t random =
- random_new(random_generator, 0, random_min, random_max, random_mean,
- random_std_deviation);
- xbt_dict_set(random_data_list, random_id, (void *) random,
- &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);
