tmgr_trace_t tmgr_trace;
if (!trace->file || strcmp(trace->file, "") != 0) {
tmgr_trace = tmgr_trace_new_from_file(trace->file);
- } else if (strcmp(trace->pc_data, "") == 0) {
- tmgr_trace = NULL;
} else {
- tmgr_trace =
- tmgr_trace_new_from_string(trace->id, trace->pc_data,
- trace->periodicity);
+ xbt_assert(strcmp(trace->pc_data, ""),
+ "Trace '%s' must have either a content, or point to a file on disk.",trace->id);
+ tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity);
}
xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
}
void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
{
- xbt_assert(xbt_dict_get_or_null
- (traces_set_list, trace_connect->trace),
+ xbt_assert(xbt_dict_get_or_null(traces_set_list, trace_connect->trace),
"Cannot connect trace %s to %s: trace unknown",
trace_connect->trace,
trace_connect->element);
tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
{
- char *tstr = NULL;
- FILE *f = NULL;
tmgr_trace_t trace = NULL;
if ((!filename) || (strcmp(filename, "") == 0))
}
}
- f = surf_fopen(filename, "r");
- if (f == NULL)
- xbt_die("Cannot open file '%s' (path=%s)", filename,
- xbt_str_join(surf_path, ":"));
+ FILE *f = surf_fopen(filename, "r");
+ xbt_assert(f != NULL,
+ "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
- tstr = xbt_str_from_file(f);
+ char *tstr = xbt_str_from_file(f);
fclose(f);
trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);