X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=a7004e1b1e60a21e1531d463f98380afe5dfe7b2;hp=03b9d2f2ff379c57c332a720e75fb4d59f026c1a;hb=02dc4610b1dccefaf545ba77378857ee6188ea33;hpb=359d7456178eeebd3f5a11c7ef2050b91f68123b diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 03b9d2f2..a7004e1b 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -36,6 +36,9 @@ #include #include #include +#include + +#include /* for clocks */ #define DEFAULT_FILE_ARRAY_SIZE 1 static char *opt_input_format; @@ -44,7 +47,6 @@ static char *opt_output_format; static const char *opt_input_path; static const char *opt_output_path; -static struct trace_collection trace_collection_read; static struct format *fmt_read; void strlower(char *str) @@ -64,6 +66,11 @@ enum { OPT_NAMES, OPT_FIELDS, OPT_NO_DELTA, + OPT_CLOCK_OFFSET, + OPT_CLOCK_RAW, + OPT_CLOCK_SECONDS, + OPT_CLOCK_DATE, + OPT_CLOCK_GMT, }; static struct poptOption long_options[] = { @@ -77,6 +84,11 @@ static struct poptOption long_options[] = { { "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL }, { "fields", 'f', POPT_ARG_STRING, NULL, OPT_FIELDS, NULL, NULL }, { "no-delta", 0, POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL }, + { "clock-offset", 0, POPT_ARG_STRING, NULL, OPT_CLOCK_OFFSET, NULL, NULL }, + { "clock-raw", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_RAW, NULL, NULL }, + { "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 }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -88,7 +100,7 @@ static void list_formats(FILE *fp) static void usage(FILE *fp) { - fprintf(fp, "BabelTrace Trace Converter %s\n\n", VERSION); + fprintf(fp, "BabelTrace Trace Viewer and Converter %s\n\n", VERSION); fprintf(fp, "usage : babeltrace [OPTIONS] INPUT \n"); fprintf(fp, "\n"); fprintf(fp, " INPUT Input trace path\n"); @@ -111,6 +123,12 @@ static void usage(FILE *fp) 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"); + fprintf(fp, " --clock-raw Disregard internal clock offset (use raw value)\n"); + fprintf(fp, " --clock-offset seconds Clock offset in seconds\n"); + fprintf(fp, " --clock-seconds Print the timestamps as [sec.ns]\n"); + 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"); list_formats(fp); fprintf(fp, "\n"); } @@ -148,7 +166,6 @@ static int get_fields_args(poptContext *pc) { char *str, *strlist, *strctx; - opt_payload_field_names = 0; strlist = (char *) poptGetOptArg(*pc); if (!strlist) { return -EINVAL; @@ -226,6 +243,38 @@ static int parse_options(int argc, char **argv) case OPT_NO_DELTA: opt_delta_field = 0; break; + case OPT_CLOCK_RAW: + opt_clock_raw = 1; + break; + case OPT_CLOCK_OFFSET: + { + char *str, *endptr; + + str = poptGetOptArg(pc); + if (!str) { + fprintf(stderr, "[error] Missing --clock-offset argument\n"); + ret = -EINVAL; + goto end; + } + errno = 0; + opt_clock_offset = strtoull(str, &endptr, 0); + if (*endptr != '\0' || str == endptr || errno != 0) { + fprintf(stderr, "[error] Incorrect --clock-offset argument: %s\n", str); + ret = -EINVAL; + goto end; + } + break; + } + case OPT_CLOCK_SECONDS: + opt_clock_seconds = 1; + break; + case OPT_CLOCK_DATE: + opt_clock_date = 1; + break; + case OPT_CLOCK_GMT: + opt_clock_gmt = 1; + break; + default: ret = -EINVAL; goto end; @@ -246,113 +295,47 @@ end: return ret; } -static void init_trace_collection(struct trace_collection *tc) -{ - tc->array = g_ptr_array_sized_new(DEFAULT_FILE_ARRAY_SIZE); -} -/* - * finalize_trace_collection() closes the opened traces for read - * and free the memory allocated for trace collection - */ -static void finalize_trace_collection(struct trace_collection *tc) -{ - int i; - for (i = 0; i < tc->array->len; i++) { - struct trace_descriptor *temp = - g_ptr_array_index(tc->array, i); - fmt_read->close_trace(temp); - } - g_ptr_array_free(tc->array, TRUE); -} -static void trace_collection_add(struct trace_collection *tc, - struct trace_descriptor *td) -{ - g_ptr_array_add(tc->array, td); -} int convert_trace(struct trace_descriptor *td_write, struct bt_context *ctx) { - struct babeltrace_iter *iter; + struct bt_iter *iter; struct ctf_stream *stream; struct ctf_stream_event *event; struct ctf_text_stream_pos *sout; - struct trace_collection_pos begin_pos; + struct bt_iter_pos begin_pos; int ret; sout = container_of(td_write, struct ctf_text_stream_pos, trace_descriptor); begin_pos.type = BT_SEEK_BEGIN; - iter = babeltrace_iter_create(ctx, &begin_pos, NULL); + iter = bt_iter_create(ctx, &begin_pos, NULL); if (!iter) { ret = -1; goto error_iter; } - while (babeltrace_iter_read_event(iter, &stream, &event) == 0) { + while (bt_iter_read_event(iter, &stream, &event) == 0) { ret = sout->parent.event_cb(&sout->parent, stream); if (ret) { fprintf(stderr, "[error] Writing event failed.\n"); goto end; } - ret = babeltrace_iter_next(iter); + ret = bt_iter_next(iter); if (ret < 0) goto end; } ret = 0; end: - babeltrace_iter_destroy(iter); + bt_iter_destroy(iter); error_iter: return ret; } - -/* - * traverse_dir() is the callback functiion for File Tree Walk (nftw). - * it receives the path of the current entry (file, dir, link..etc) with - * a flag to indicate the type of the entry. - * if the entry being visited is a directory and contains a metadata file, - * then open it for reading and save a trace_descriptor to that directory - * in the read trace collection. - */ -static int traverse_dir(const char *fpath, const struct stat *sb, - int tflag, struct FTW *ftwbuf) -{ - int dirfd; - int fd; - struct trace_descriptor *td_read; - - if (tflag != FTW_D) - return 0; - dirfd = open(fpath, 0); - if (dirfd < 0) { - fprintf(stderr, "[error] unable to open trace " - "directory file descriptor.\n"); - return -1; - } - fd = openat(dirfd, "metadata", O_RDONLY); - if (fd < 0) { - close(dirfd); - } else { - close(fd); - close(dirfd); - td_read = fmt_read->open_trace(opt_input_path, - fpath, O_RDONLY, ctf_move_pos_slow, - NULL); - if (!td_read) { - fprintf(stderr, "Error opening trace \"%s\" " - "for reading.\n\n", fpath); - return -1; /* error */ - } - trace_collection_add(&trace_collection_read, td_read); - } - return 0; /* success */ -} - int main(int argc, char **argv) { int ret; @@ -401,31 +384,17 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - /* - * pass the input path to nftw() . - * specify traverse_dir() as the callback function. - * depth = 10 which is the max number of file descriptors - * that nftw() can open at a given time. - * flags = 0 check nftw documentation for more info . - */ - init_trace_collection(&trace_collection_read); - ret = nftw(opt_input_path, traverse_dir, 10, 0); - if (ret != 0) { + ctx = bt_context_create(); + + ret = bt_context_add_traces_recursive(ctx, opt_input_path, + opt_input_format); + if (ret) { fprintf(stderr, "[error] opening trace \"%s\" for reading.\n\n", opt_input_path); goto error_td_read; } - if (trace_collection_read.array->len == 0) { - fprintf(stderr, "[warning] no metadata file was found." - " no output was generated\n"); - return 0; - } - ctx = bt_context_create(&trace_collection_read); - if (!ctx) { - fprintf(stderr, "Error allocating a new context\n"); - goto error_td_read; - } - td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL); + + td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL); if (!td_write) { fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n", opt_output_path ? : ""); @@ -439,8 +408,8 @@ int main(int argc, char **argv) } fmt_write->close_trace(td_write); - finalize_trace_collection(&trace_collection_read); - bt_context_destroy(ctx); + + bt_context_put(ctx); printf_verbose("finished converting. Output written to:\n%s\n", opt_output_path ? : ""); exit(EXIT_SUCCESS); @@ -449,7 +418,7 @@ int main(int argc, char **argv) error_copy_trace: fmt_write->close_trace(td_write); error_td_write: - finalize_trace_collection(&trace_collection_read); + bt_context_put(ctx); error_td_read: exit(EXIT_FAILURE); }