X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=db8c8d65b0e94975f3f9544e122a4845e8af9f2a;hp=4bfd430574c6abcb98f8a683bbb3db72df72ee9f;hb=11e1d04883854321d5d31ef2a59de34dfa39a44e;hpb=6cba487f031260536d6a77acde888c8b1a876fcf diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 4bfd4305..db8c8d65 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -18,12 +18,16 @@ * all copies or substantial portions of the Software. */ -#define _XOPEN_SOURCE 700 +#define _GNU_SOURCE #include #include #include #include #include +#include +/* TODO: fix object model for format-agnostic callbacks */ +#include +#include #include #include #include @@ -33,22 +37,24 @@ #include #include #include -#include -#include #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) { @@ -71,12 +77,13 @@ enum { OPT_CLOCK_SECONDS, OPT_CLOCK_DATE, OPT_CLOCK_GMT, + OPT_CLOCK_FORCE_CORRELATE, }; 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 }, @@ -89,6 +96,7 @@ static struct poptOption long_options[] = { { "clock-seconds", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_SECONDS, NULL, NULL }, { "clock-date", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL }, { "clock-gmt", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_GMT, NULL, NULL }, + { "clock-force-correlate", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -118,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"); @@ -129,6 +137,8 @@ static void usage(FILE *fp) fprintf(fp, " (default is: [hh:mm:ss.ns])\n"); fprintf(fp, " --clock-date Print clock date\n"); fprintf(fp, " --clock-gmt Print clock in GMT time zone (default: local time zone)\n"); + fprintf(fp, " --clock-force-correlate Assume that clocks are inherently correlated\n"); + fprintf(fp, " across traces.\n"); list_formats(fp); fprintf(fp, "\n"); } @@ -138,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; @@ -154,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; } @@ -210,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) { @@ -274,6 +292,9 @@ static int parse_options(int argc, char **argv) case OPT_CLOCK_GMT: opt_clock_gmt = 1; break; + case OPT_CLOCK_FORCE_CORRELATE: + opt_clock_force_correlate = 1; + break; default: ret = -EINVAL; @@ -296,49 +317,152 @@ end: } +/* + * bt_context_add_traces_recursive: Open a trace recursively + * + * Find each trace present in the subdirectory starting from the given + * 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, < 0 on failure, > 0 on partial failure. + * Unable to open toplevel: failure. + * 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, + void (*packet_seek)(struct stream_pos *pos, + size_t offset, int whence)) +{ + FTS *tree; + FTSENT *node; + GArray *trace_ids; + char lpath[PATH_MAX]; + char * const paths[2] = { lpath, NULL }; + int ret = 0; + + /* + * Need to copy path, because fts_open can change it. + * It is the pointer array, not the strings, that are constant. + */ + strncpy(lpath, path, PATH_MAX); + lpath[PATH_MAX - 1] = '\0'; + + tree = fts_open(paths, FTS_NOCHDIR | FTS_LOGICAL, 0); + if (tree == NULL) { + fprintf(stderr, "[error] [Context] Cannot traverse \"%s\" for reading.\n", + path); + return -EINVAL; + } + + trace_ids = g_array_new(FALSE, TRUE, sizeof(int)); + + while ((node = fts_read(tree))) { + int dirfd, metafd; + int closeret; + + if (!(node->fts_info & FTS_D)) + continue; + + dirfd = open(node->fts_accpath, 0); + if (dirfd < 0) { + fprintf(stderr, "[error] [Context] Unable to open trace " + "directory file descriptor.\n"); + ret = 1; /* partial error */ + goto error; + } + metafd = openat(dirfd, "metadata", O_RDONLY); + if (metafd < 0) { + closeret = close(dirfd); + if (closeret < 0) { + perror("close"); + ret = -1; /* failure */ + goto error; + } + continue; + } else { + int trace_id; + + closeret = close(metafd); + if (closeret < 0) { + perror("close"); + ret = -1; /* failure */ + goto error; + } + closeret = close(dirfd); + if (closeret < 0) { + perror("close"); + ret = -1; /* failure */ + goto error; + } + + trace_id = bt_context_add_trace(ctx, + node->fts_accpath, format_str, + packet_seek, NULL, NULL); + if (trace_id < 0) { + fprintf(stderr, "[warning] [Context] opening trace \"%s\" from %s " + "for reading.\n", node->fts_accpath, path); + /* Allow to skip erroneous traces. */ + ret = 1; /* partial error */ + continue; + } + g_array_append_val(trace_ids, trace_id); + } + } + +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; +} int convert_trace(struct trace_descriptor *td_write, struct bt_context *ctx) { - struct bt_iter *iter; - struct ctf_stream *stream; - struct ctf_stream_event *event; + struct bt_ctf_iter *iter; struct ctf_text_stream_pos *sout; struct bt_iter_pos begin_pos; + struct bt_ctf_event *ctf_event; int ret; sout = container_of(td_write, struct ctf_text_stream_pos, trace_descriptor); begin_pos.type = BT_SEEK_BEGIN; - iter = bt_iter_create(ctx, &begin_pos, NULL); + iter = bt_ctf_iter_create(ctx, &begin_pos, NULL); if (!iter) { ret = -1; goto error_iter; } - while (bt_iter_read_event(iter, &stream, &event) == 0) { - ret = sout->parent.event_cb(&sout->parent, stream); + while ((ctf_event = bt_ctf_iter_read_event(iter))) { + ret = sout->parent.event_cb(&sout->parent, ctf_event->parent->stream); if (ret) { fprintf(stderr, "[error] Writing event failed.\n"); goto end; } - ret = bt_iter_next(iter); + ret = bt_iter_next(bt_ctf_get_iter(iter)); if (ret < 0) goto end; } ret = 0; end: - bt_iter_destroy(iter); + bt_ctf_iter_destroy(iter); error_iter: return ret; } 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; @@ -354,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", @@ -367,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(ctx, opt_input_path, - opt_input_format); - if (ret) { + ret = bt_context_add_traces_recursive(ctx, opt_input_path, + opt_input_format, NULL); + 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); @@ -412,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: @@ -420,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); }