X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=db8c8d65b0e94975f3f9544e122a4845e8af9f2a;hp=6905070a25a062ed50aff09fc54537fb302b64dd;hb=11e1d04883854321d5d31ef2a59de34dfa39a44e;hpb=0d4c669fab9287d78d5d34e3de9e1e701da431cb diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 6905070a..db8c8d65 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -25,6 +25,9 @@ #include #include #include +/* TODO: fix object model for format-agnostic callbacks */ +#include +#include #include #include #include @@ -37,18 +40,21 @@ #include #include #include +#include #include /* for clocks */ #define DEFAULT_FILE_ARRAY_SIZE 1 -static char *opt_input_format; -static char *opt_output_format; +static char *opt_input_format, *opt_output_format; +/* Pointer into const argv */ +static const char *opt_input_format_arg, *opt_output_format_arg; static const char *opt_input_path; static const char *opt_output_path; static struct format *fmt_read; +static void strlower(char *str) { while (*str) { @@ -76,8 +82,8 @@ enum { static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - { "input-format", 'i', POPT_ARG_STRING, &opt_input_format, OPT_NONE, NULL, NULL }, - { "output-format", 'o', POPT_ARG_STRING, &opt_output_format, OPT_NONE, NULL, NULL }, + { "input-format", 'i', POPT_ARG_STRING, &opt_input_format_arg, OPT_NONE, NULL, NULL }, + { "output-format", 'o', POPT_ARG_STRING, &opt_output_format_arg, OPT_NONE, NULL, NULL }, { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL }, { "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL }, { "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL }, @@ -120,8 +126,8 @@ static void usage(FILE *fp) 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"); @@ -142,6 +148,7 @@ static int get_names_args(poptContext *pc) char *str, *strlist, *strctx; opt_payload_field_names = 0; + opt_context_field_names = 0; strlist = (char *) poptGetOptArg(*pc); if (!strlist) { return -EINVAL; @@ -158,7 +165,13 @@ static int get_names_args(poptContext *pc) 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; } @@ -214,6 +227,7 @@ static int parse_options(int argc, char **argv) poptReadDefaultConfig(pc, 0); /* set default */ + opt_context_field_names = 1; opt_payload_field_names = 1; while ((opt = poptGetNextOpt(pc)) != -1) { @@ -310,9 +324,10 @@ end: * 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, @@ -324,7 +339,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path, 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. @@ -344,6 +359,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path, while ((node = fts_read(tree))) { int dirfd, metafd; + int closeret; if (!(node->fts_info & FTS_D)) continue; @@ -352,27 +368,31 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path, 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; } @@ -380,19 +400,25 @@ 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) { - 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; } @@ -417,7 +443,7 @@ int convert_trace(struct trace_descriptor *td_write, 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; @@ -436,7 +462,7 @@ error_iter: 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; @@ -452,10 +478,22 @@ int main(int argc, char **argv) printf_verbose("Verbose mode active.\n"); printf_debug("Debug mode active.\n"); - if (opt_input_format) + if (opt_input_format_arg) { + opt_input_format = strdup(opt_input_format_arg); + if (!opt_input_format) { + partial_error = 1; + goto end; + } strlower(opt_input_format); - if (opt_output_format) + } + if (opt_output_format) { + opt_output_format = strdup(opt_output_format_arg); + if (!opt_output_format) { + partial_error = 1; + goto end; + } strlower(opt_output_format); + } printf_verbose("Converting from directory: %s\n", opt_input_path); printf_verbose("Converting from format: %s\n", @@ -465,31 +503,47 @@ int main(int argc, char **argv) printf_verbose("Converting to format: %s\n", opt_output_format ? : "text "); - if (!opt_input_format) - opt_input_format = "ctf"; - if (!opt_output_format) - opt_output_format = "text"; + if (!opt_input_format) { + opt_input_format = strdup("ctf"); + if (!opt_input_format) { + partial_error = 1; + goto end; + } + } + if (!opt_output_format) { + opt_output_format = strdup("text"); + if (!opt_output_format) { + partial_error = 1; + goto end; + } + } fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format)); if (!fmt_read) { fprintf(stderr, "[error] Format \"%s\" is not supported.\n\n", opt_input_format); - exit(EXIT_FAILURE); + partial_error = 1; + goto end; } fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format)); if (!fmt_write) { fprintf(stderr, "[error] format \"%s\" is not supported.\n\n", opt_output_format); - exit(EXIT_FAILURE); + partial_error = 1; + goto end; } ctx = bt_context_create(); 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); @@ -510,7 +564,7 @@ int main(int argc, char **argv) bt_context_put(ctx); printf_verbose("finished converting. Output written to:\n%s\n", opt_output_path ? : ""); - exit(EXIT_SUCCESS); + goto end; /* Error handling */ error_copy_trace: @@ -518,5 +572,14 @@ error_copy_trace: error_td_write: bt_context_put(ctx); error_td_read: - exit(EXIT_FAILURE); + partial_error = 1; + + /* teardown and exit */ +end: + free(opt_input_format); + free(opt_output_format); + if (partial_error) + exit(EXIT_FAILURE); + else + exit(EXIT_SUCCESS); }