static xbt_dynar_t surfxml_bufferstack_stack = NULL;
static int surfxml_bufferstack_size = 2048;
static char *old_buff=NULL;
+static void surf_parse_error(char *msg);
static void push_surfxml_bufferstack(int new)
{
int_f_void_t surf_parse = _surf_parse;
+void surf_parse_error(char *msg)
+{
+ fprintf(stderr,"Parse error on line %d: %s\n",surf_parse_lineno,msg);
+ abort();
+}
+
+
void surf_parse_get_double(double *value, const char *string)
{
int ret = 0;
ret = sscanf(string, "%lg", value);
- xbt_assert2((ret == 1), "Parse error line %d : %s not a number",
- surf_parse_lineno, string);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not a double", string));
}
void surf_parse_get_int(int *value, const char *string)
int ret = 0;
ret = sscanf(string, "%d", value);
- xbt_assert2((ret == 1), "Parse error line %d : %s not a number",
- surf_parse_lineno, string);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not an integer", string));
}
void surf_parse_get_trace(tmgr_trace_t * trace, const char *string)
{
char *key,*data;
xbt_dict_cursor_t cursor = NULL;
+ char *name;
+ unsigned int cpt = 0;
xbt_dict_foreach(route_table, cursor, key, data) {
xbt_dynar_t links = (xbt_dynar_t)data;
xbt_dict_free(&route_table);
route_link_list = NULL;
+ xbt_dict_free(&route_multi_table);
+
+ xbt_dynar_foreach (route_multi_elements, cpt, name) free(name);
+ xbt_dynar_free(&route_multi_elements);
+
xbt_dict_foreach(set_list, cursor, key, data) {
xbt_dynar_t set = (xbt_dynar_t)data;
- char *name;
- unsigned int cpt = 0;
xbt_dynar_foreach (set, cpt, name) free(name);
xbt_dynar_free(&set);
{
char *id, *suffix, *prefix, *radical;
int start, end;
+ xbt_dynar_t radical_elements;
xbt_dynar_t radical_ends;
xbt_dynar_t current_set;
- char *value;
+ char *value,*groups;
int i;
+ unsigned int iter;
id = xbt_strdup(A_surfxml_set_id);
prefix = xbt_strdup(A_surfxml_set_prefix);
suffix = xbt_strdup(A_surfxml_set_suffix);
radical = xbt_strdup(A_surfxml_set_radical);
- xbt_assert1(!xbt_dict_get_or_null(set_list, id),
- "Set '%s' declared several times in the platform file.",id);
- radical_ends = xbt_str_split(radical, "-");
- xbt_assert1((xbt_dynar_length(radical_ends)==2), "Radical must be in the form lvalue-rvalue! Provided value: %s", radical);
+ if (xbt_dict_get_or_null(set_list, id))
+ surf_parse_error(bprintf("Set '%s' declared several times in the platform file.",id));
+
+ current_set = xbt_dynar_new(sizeof(char*), NULL);
- surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char*));
- surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char*));
+ radical_elements = xbt_str_split(radical,",");
+ xbt_dynar_foreach(radical_elements,iter, groups) {
+
+ radical_ends = xbt_str_split(groups, "-");
+ switch (xbt_dynar_length(radical_ends)) {
+ case 1:
+ surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char*));
+ value = bprintf("%s%d%s", prefix, start, suffix);
+ xbt_dynar_push(current_set, &value);
+ break;
+
+ case 2:
- current_set = xbt_dynar_new(sizeof(char*), NULL);
+ surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char*));
+ surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char*));
-
- for (i=start; i<=end; i++) {
- value = bprintf("%s%d%s", prefix, i, suffix);
- xbt_dynar_push(current_set, &value);
- }
-
- xbt_dict_set(set_list, id, current_set, NULL);
- xbt_dynar_free(&radical_ends);
+ for (i=start; i<=end; i++) {
+ value = bprintf("%s%d%s", prefix, i, suffix);
+ xbt_dynar_push(current_set, &value);
+ }
+ break;
+
+ default:
+ surf_parse_error(xbt_strdup("Malformed radical"));
+ }
+
+ xbt_dynar_free(&radical_ends);
+ }
+
+ xbt_dict_set(set_list, id, current_set, NULL);
+ xbt_dynar_free(&radical_elements);
free(radical);
free(suffix);
free(prefix);
xbt_dict_t cluster_host_props = current_property_set;
- xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)),
- "Set name '%s' reffered by foreach tag not found.", foreach_set_name);
-
- xbt_assert1((strcmp(A_surfxml_host_id, "$1") == 0), "The id of the host within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_host_id);
+ names = xbt_dict_get_or_null(set_list, foreach_set_name);
+ if (!names)
+ surf_parse_error(bprintf("Set name '%s' used in <foreach> not found.",
+ foreach_set_name));
+ if (strcmp(A_surfxml_host_id, "$1"))
+ surf_parse_error(bprintf("The host id within <foreach> should point to the foreach set_id (use $1 instead of %s)",
+ A_surfxml_host_id));
/* foreach name in set call the main host callback */
xbt_dict_t cluster_link_props = current_property_set;
- xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)),
- "Set name '%s' reffered by foreach tag not found.", foreach_set_name);
-
- xbt_assert1((strcmp(A_surfxml_link_id, "$1") == 0), "The id of the link within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_link_id);
-
+ names = xbt_dict_get_or_null(set_list, foreach_set_name);
+ if (!names)
+ surf_parse_error(bprintf("Set name '%s' used in <foreach> not found.",
+ foreach_set_name));
+ if (strcmp(A_surfxml_link_id, "$1"))
+ surf_parse_error(bprintf("The host id within <foreach> should point to the foreach set_id (use $1 instead of %s)",
+ A_surfxml_link_id));
/* for each name in set call the main link callback */
xbt_dynar_foreach (names, cpt, name) {
xbt_dynar_free(&keys);
}
pop_surfxml_bufferstack(0);
- xbt_dict_free(&route_multi_table);
- xbt_dynar_free(&route_multi_elements);
}
/* Cluster tag functions */
SURFXML_END_TAG(route_c_multi);
+ free(backbone_name);
+
/* Restore buff */
pop_surfxml_bufferstack(1);
}
return power_scale;
}
-int random_min, random_max, random_mean, random_std_deviation, random_generator;
+double random_min, random_max, random_mean, random_std_deviation, random_generator;
char *random_id;
static void init_randomness(void)
{
random_id = A_surfxml_random_id;
- surf_parse_get_int(&random_min, A_surfxml_random_min);
- surf_parse_get_int(&random_max, A_surfxml_random_max);
- surf_parse_get_int(&random_mean, A_surfxml_random_mean);
- surf_parse_get_int(&random_std_deviation, A_surfxml_random_std_deviation);
+ surf_parse_get_double(&random_min, A_surfxml_random_min);
+ surf_parse_get_double(&random_max, A_surfxml_random_max);
+ surf_parse_get_double(&random_mean, A_surfxml_random_mean);
+ surf_parse_get_double(&random_std_deviation, A_surfxml_random_std_deviation);
random_generator = A_surfxml_random_generator;
}
