-/* Copyright (c) 2006-2013. The SimGrid Team.
+/* Copyright (c) 2006-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <errno.h>
#include <math.h>
#include <stdarg.h> /* va_arg */
+#include <libgen.h>
#include "xbt/misc.h"
#include "xbt/log.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
*/
int ret = sscanf(string, "%lg", &res);
if (ret != 1)
surf_parse_error("%s is not a double", string);
- //printf("Parsed double [%lg] %s\n", res, string);
+ //printf("Parsed double [%g] %s\n", res, string);
return res;
}
/* 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
*/
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)
{
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_model_property_set = NULL;
}
void STag_surfxml_mstorage(void)
{
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);
}
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_str_trim(power_value_str, NULL);
power_value = get_cpu_power(power_value_str);
xbt_dynar_push_as(host.power_peak, double, power_value);
- XBT_DEBUG("Power value: %lf", power_value);
+ XBT_DEBUG("Power value: %f", power_value);
}
xbt_dynar_free(&pstate_list);
}
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){
+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){
+ parse_after_config();
s_sg_platf_cabinet_cbarg_t cabinet;
memset(&cabinet,0,sizeof(cabinet));
cabinet.id = A_surfxml_cabinet_id;
}
void STag_surfxml_peer(void){
+ parse_after_config();
s_sg_platf_peer_cbarg_t peer;
memset(&peer,0,sizeof(peer));
peer.id = A_surfxml_peer_id;
link.id = A_surfxml_link_id;
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth);
- //printf("Link bandwidth [%lg]\n", 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 [%lg]\n", 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) {
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;
switch (A_surfxml_ASroute_symmetrical) {
}
void STag_surfxml_trace___connect(void){
+ parse_after_config();
s_sg_platf_trace_connect_cbarg_t trace_connect;
memset(&trace_connect,0,sizeof(trace_connect));
}
void STag_surfxml_AS(void){
+ parse_after_config();
AS_TAG = 1;
s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
AS.id = A_surfxml_AS_id;
free(cfg);
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
+
xbt_dict_free(¤t_property_set);
current_property_set = NULL;
}
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 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_cabinet(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 = dirname(surf_parsed_filename);
+ 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;
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, additional 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);