static int warned = 0; /* warn only once */
if (!file) {
if (!warned) {
- WARN0
+ 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;
}
if (!surfxml_bufferstack_stack)
surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL);
- random_data_list = xbt_dict_new();
traces_set_list = xbt_dict_new();
trace_connect_list_host_avail = xbt_dict_new();
trace_connect_list_power = xbt_dict_new();
trace_connect_list_bandwidth = xbt_dict_new();
trace_connect_list_latency = xbt_dict_new();
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
- surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness);
- surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness);
surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace);
surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
surfxml_add_callback(STag_surfxml_trace_connect_cb_list,
xbt_strdup(A_surfxml_trace_connect_element), free);
break;
default:
- xbt_die(bprintf("Cannot connect trace %s to %s: kind of trace unknown",
- A_surfxml_trace_connect_trace,
- A_surfxml_trace_connect_element));
+ xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
+ A_surfxml_trace_connect_trace, A_surfxml_trace_connect_element);
}
}
generator = xbt_malloc(q - (p + 6) + 1);
memcpy(generator, p + 6, q - (p + 6));
generator[q - (p + 6)] = '\0';
- xbt_assert1((random =
- xbt_dict_get_or_null(random_data_list, generator)),
- "Random generator %s undefined", generator);
+ random = xbt_dict_get_or_null(random_data_list, generator);
+ xbt_assert1(random, "Random generator %s undefined", generator);
power_scale = random_generate(random);
}
} else {