projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: babeltrace should skip erroneous traces
[babeltrace.git]
/
converter
/
babeltrace.c
diff --git
a/converter/babeltrace.c
b/converter/babeltrace.c
index aadeb441cf18ed81fa4a43b14d77e8d27389af72..904c0150868630c47e60820a4e359635b6bf9588 100644
(file)
--- a/
converter/babeltrace.c
+++ b/
converter/babeltrace.c
@@
-383,10
+383,10
@@
int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
node->fts_accpath, format_str,
packet_seek, NULL, NULL);
if (trace_id < 0) {
node->fts_accpath, format_str,
packet_seek, NULL, NULL);
if (trace_id < 0) {
- fprintf(stderr, "[
error
] [Context] opening trace \"%s\" from %s "
+ fprintf(stderr, "[
warning
] [Context] opening trace \"%s\" from %s "
"for reading.\n", node->fts_accpath, path);
"for reading.\n", node->fts_accpath, path);
- ret = trace_id;
-
goto error
;
+ /* Allow to skip erroneous traces. */
+
continue
;
}
g_array_append_val(trace_ids, trace_id);
}
}
g_array_append_val(trace_ids, trace_id);
}
@@
-420,7
+420,7
@@
int convert_trace(struct trace_descriptor *td_write,
goto error_iter;
}
while ((ctf_event = bt_ctf_iter_read_event(iter))) {
goto error_iter;
}
while ((ctf_event = bt_ctf_iter_read_event(iter))) {
- ret = sout->parent.event_cb(&sout->parent, ctf_event->stream);
+ ret = sout->parent.event_cb(&sout->parent, ctf_event->
parent->
stream);
if (ret) {
fprintf(stderr, "[error] Writing event failed.\n");
goto end;
if (ret) {
fprintf(stderr, "[error] Writing event failed.\n");
goto end;
This page took
0.023524 seconds
and
4
git commands to generate.