-/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2006-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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();
+ surf_exit();
+ xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg);
}
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 [%lg] %s\n", res, string);
+ //printf("Parsed double [%g] %s\n", res, string);
return res;
}
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);
}
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) {
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).");
}
}