#include <babeltrace/context.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/ctf/events.h>
+/* TODO: fix object model for format-agnostic callbacks */
+#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/ctf/iterator.h>
#include <babeltrace/ctf-text/types.h>
#include <babeltrace/iterator.h>
#include <popt.h>
fprintf(fp, " --no-delta Do not print time delta between consecutive events\n");
fprintf(fp, " -n, --names name1<,name2,...> Print field names:\n");
fprintf(fp, " (payload OR args OR arg)\n");
- fprintf(fp, " all, scope, header, (context OR ctx)\n");
- fprintf(fp, " (payload active by default)\n");
+ fprintf(fp, " none, all, scope, header, (context OR ctx)\n");
+ fprintf(fp, " (default: payload,context)\n");
fprintf(fp, " -f, --fields name1<,name2,...> Print additional fields:\n");
fprintf(fp, " all, trace, trace:domain, trace:procname,\n");
fprintf(fp, " trace:vpid, loglevel.\n");
char *str, *strlist, *strctx;
opt_payload_field_names = 0;
+ opt_context_field_names = 0;
strlist = (char *) poptGetOptArg(*pc);
if (!strlist) {
return -EINVAL;
opt_header_field_names = 1;
else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
opt_payload_field_names = 1;
- else {
+ else if (!strcmp(str, "none")) {
+ opt_all_field_names = 0;
+ opt_scope_field_names = 0;
+ opt_context_field_names = 0;
+ opt_header_field_names = 0;
+ opt_payload_field_names = 0;
+ } else {
fprintf(stderr, "[error] unknown field name type %s\n", str);
return -EINVAL;
}
poptReadDefaultConfig(pc, 0);
/* set default */
+ opt_context_field_names = 1;
opt_payload_field_names = 1;
while ((opt = poptGetNextOpt(pc)) != -1) {
* path, and add them to the context. The packet_seek parameter can be
* NULL: this specify to use the default format packet_seek.
*
- * Return: 0 on success, nonzero on failure.
+ * Return: 0 on success, < 0 on failure, > 0 on partial failure.
* Unable to open toplevel: failure.
- * Unable to open some subdirectory or file: warn and continue;
+ * Unable to open some subdirectory or file: warn and continue (partial
+ * failure);
*/
int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
const char *format_str,
GArray *trace_ids;
char lpath[PATH_MAX];
char * const paths[2] = { lpath, NULL };
- int ret;
+ int ret = 0;
/*
* Need to copy path, because fts_open can change it.
while ((node = fts_read(tree))) {
int dirfd, metafd;
+ int closeret;
if (!(node->fts_info & FTS_D))
continue;
if (dirfd < 0) {
fprintf(stderr, "[error] [Context] Unable to open trace "
"directory file descriptor.\n");
- ret = dirfd;
+ ret = 1; /* partial error */
goto error;
}
metafd = openat(dirfd, "metadata", O_RDONLY);
if (metafd < 0) {
- ret = close(dirfd);
- if (ret < 0) {
+ closeret = close(dirfd);
+ if (closeret < 0) {
perror("close");
+ ret = -1; /* failure */
goto error;
}
+ continue;
} else {
int trace_id;
- ret = close(metafd);
- if (ret < 0) {
+ closeret = close(metafd);
+ if (closeret < 0) {
perror("close");
+ ret = -1; /* failure */
goto error;
}
- ret = close(dirfd);
- if (ret < 0) {
+ closeret = close(dirfd);
+ if (closeret < 0) {
perror("close");
+ ret = -1; /* failure */
goto error;
}
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);
- ret = trace_id;
- goto error;
+ /* Allow to skip erroneous traces. */
+ ret = 1; /* partial error */
+ continue;
}
g_array_append_val(trace_ids, trace_id);
}
}
- g_array_free(trace_ids, TRUE);
- return 0;
-
error:
+ /*
+ * Return an error if no trace can be opened.
+ */
+ if (trace_ids->len == 0) {
+ fprintf(stderr, "[error] Cannot open any trace for reading.\n\n");
+ ret = -ENOENT; /* failure */
+ }
+ g_array_free(trace_ids, TRUE);
return ret;
}
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;
int main(int argc, char **argv)
{
- int ret;
+ int ret, partial_error = 0;
struct format *fmt_write;
struct trace_descriptor *td_write;
struct bt_context *ctx;
ret = bt_context_add_traces_recursive(ctx, opt_input_path,
opt_input_format, NULL);
- if (ret) {
+ if (ret < 0) {
fprintf(stderr, "[error] opening trace \"%s\" for reading.\n\n",
opt_input_path);
goto error_td_read;
+ } else if (ret > 0) {
+ fprintf(stderr, "[warning] errors occurred when opening trace \"%s\" for reading, continuing anyway.\n\n",
+ opt_input_path);
+ partial_error = 1;
}
td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
bt_context_put(ctx);
printf_verbose("finished converting. Output written to:\n%s\n",
opt_output_path ? : "<stdout>");
- exit(EXIT_SUCCESS);
+ if (partial_error)
+ exit(EXIT_FAILURE);
+ else
+ exit(EXIT_SUCCESS);
/* Error handling */
error_copy_trace:
projects / babeltrace.git / blobdiff