X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=c377935edb4eee708113d50dd86ac5e6c54edb1a;hp=0ca1313d6746f8c71fdc9caf46584f4894a4043f;hb=27cd3890b5ad7975669cf3ec3f7d575aa1e55c67;hpb=31bdef5c0395938cf373fee199d4133c8f2f49a8 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 0ca1313d..c377935e 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,10 +37,9 @@ #include #include #include -#include -#include #include #include +#include #include /* for clocks */ @@ -47,7 +50,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) @@ -72,6 +74,7 @@ enum { OPT_CLOCK_SECONDS, OPT_CLOCK_DATE, OPT_CLOCK_GMT, + OPT_CLOCK_FORCE_CORRELATE, }; static struct poptOption long_options[] = { @@ -90,6 +93,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 }, }; @@ -119,8 +123,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"); @@ -130,6 +134,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"); } @@ -139,6 +145,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; @@ -155,7 +162,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; } @@ -211,6 +224,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) { @@ -275,6 +289,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,272 +313,143 @@ end: return ret; } -static void init_trace_collection(struct trace_collection *tc) -{ - tc->array = g_ptr_array_sized_new(DEFAULT_FILE_ARRAY_SIZE); - tc->clocks = g_hash_table_new(g_direct_hash, g_direct_equal); - tc->single_clock_offset_avg = 0; - tc->offset_first = 0; - tc->delta_offset_first_sum = 0; - tc->offset_nr = 0; -} /* - * finalize_trace_collection() closes the opened traces for read - * and free the memory allocated for trace collection + * 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, nonzero on failure. + * Unable to open toplevel: failure. + * Unable to open some subdirectory or file: warn and continue; */ -static void finalize_trace_collection(struct trace_collection *tc) +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)) { - int i; + FTS *tree; + FTSENT *node; + GArray *trace_ids; + char lpath[PATH_MAX]; + char * const paths[2] = { lpath, NULL }; + int ret = -1; + + /* + * 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'; - for (i = 0; i < tc->array->len; i++) { - struct trace_descriptor *temp = - g_ptr_array_index(tc->array, i); - fmt_read->close_trace(temp); + 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; } - g_ptr_array_free(tc->array, TRUE); - g_hash_table_destroy(tc->clocks); -} -struct clock_match { - GHashTable *clocks; - struct ctf_clock *clock_match; - struct trace_collection *tc; -}; + trace_ids = g_array_new(FALSE, TRUE, sizeof(int)); -static void check_clock_match(gpointer key, gpointer value, gpointer user_data) -{ - struct clock_match *match = user_data; - struct ctf_clock *clock_a = value, *clock_b; - - if (clock_a->uuid != 0) { - /* - * Lookup the the trace clocks into the collection - * clocks. - */ - clock_b = g_hash_table_lookup(match->clocks, - (gpointer) (unsigned long) clock_a->uuid); - if (clock_b) { - match->clock_match = clock_b; - return; - } - } else if (clock_a->absolute) { - /* - * Absolute time references, such as NTP, are looked up - * by clock name. - */ - clock_b = g_hash_table_lookup(match->clocks, - (gpointer) (unsigned long) clock_a->name); - if (clock_b) { - match->clock_match = clock_b; - return; - } - } -} + while ((node = fts_read(tree))) { + int dirfd, metafd; -static void clock_add(gpointer key, gpointer value, gpointer user_data) -{ - struct clock_match *clock_match = user_data; - GHashTable *tc_clocks = clock_match->clocks; - struct ctf_clock *t_clock = value; - GQuark v; - - if (t_clock->absolute) - v = t_clock->name; - else - v = t_clock->uuid; - if (v) { - struct ctf_clock *tc_clock; - - tc_clock = g_hash_table_lookup(tc_clocks, - (gpointer) (unsigned long) v); - if (!tc_clock) { - /* - * For now, we only support CTF that has one - * single clock uuid or name (absolute ref). - */ - if (g_hash_table_size(tc_clocks) > 0) { - fprintf(stderr, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n"); - } - if (!clock_match->tc->offset_nr) { - clock_match->tc->offset_first = - (t_clock->offset_s * 1000000000ULL) + t_clock->offset; - clock_match->tc->delta_offset_first_sum = 0; - clock_match->tc->offset_nr++; - clock_match->tc->single_clock_offset_avg = - clock_match->tc->offset_first; + 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 = dirfd; + goto error; + } + metafd = openat(dirfd, "metadata", O_RDONLY); + if (metafd < 0) { + ret = close(dirfd); + if (ret < 0) { + perror("close"); + goto error; } - g_hash_table_insert(tc_clocks, - (gpointer) (unsigned long) v, - value); } else { - int64_t diff_ns; - - /* - * Check that the offsets match. If not, warn - * the user that we do an arbitrary choice. - */ - diff_ns = tc_clock->offset_s; - diff_ns -= t_clock->offset_s; - diff_ns *= 1000000000ULL; - diff_ns += tc_clock->offset; - diff_ns -= t_clock->offset; - printf_debug("Clock \"%s\" offset between traces has a delta of %" PRIu64 " ns.", - g_quark_to_string(tc_clock->name), - diff_ns < 0 ? -diff_ns : diff_ns); - if (diff_ns > 10000) { - fprintf(stderr, "[warning] Clock \"%s\" offset differs between traces (delta %" PRIu64 " ns). Using average.\n", - g_quark_to_string(tc_clock->name), - diff_ns < 0 ? -diff_ns : diff_ns); + int trace_id; + + ret = close(metafd); + if (ret < 0) { + perror("close"); + goto error; + } + ret = close(dirfd); + if (ret < 0) { + perror("close"); + goto error; } - /* Compute average */ - clock_match->tc->delta_offset_first_sum += - (t_clock->offset_s * 1000000000ULL) + t_clock->offset - - clock_match->tc->offset_first; - clock_match->tc->offset_nr++; - clock_match->tc->single_clock_offset_avg = - clock_match->tc->offset_first - + (clock_match->tc->delta_offset_first_sum / clock_match->tc->offset_nr); - } - } -} -/* - * Whenever we add a trace to the trace collection, check that we can - * correlate this trace with at least one other clock in the trace. - */ -static int trace_collection_add(struct trace_collection *tc, - struct trace_descriptor *td) -{ - struct ctf_trace *trace = container_of(td, struct ctf_trace, parent); - - g_ptr_array_add(tc->array, td); - trace->collection = tc; - - if (tc->array->len > 1) { - struct clock_match clock_match = { - .clocks = tc->clocks, - .clock_match = NULL, - .tc = NULL, - }; - - /* - * With two or more traces, we need correlation info - * avalable. - */ - g_hash_table_foreach(trace->clocks, - check_clock_match, - &clock_match); - if (!clock_match.clock_match) { - fprintf(stderr, "[error] No clocks can be correlated and multiple traces are added to the collection.\n"); - 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. */ + continue; + } + g_array_append_val(trace_ids, trace_id); } } - { - struct clock_match clock_match = { - .clocks = tc->clocks, - .clock_match = NULL, - .tc = tc, - }; - - /* - * Add each clock from the trace clocks into the trace - * collection clocks. - */ - g_hash_table_foreach(trace->clocks, - clock_add, - &clock_match); - } - return 0; error: - return -EPERM; + /* + * Return an error if no trace can be opened. + */ + if (ret == 0 && trace_ids->len == 0) { + fprintf(stderr, "[error] Cannot open any trace for reading.\n\n"); + ret = -ENOENT; + } + 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; } - -/* - * 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; - int ret; - - 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 */ - } - ret = trace_collection_add(&trace_collection_read, td_read); - if (ret) { - return -1; - } - } - return 0; /* success */ -} - int main(int argc, char **argv) { int ret; @@ -610,31 +498,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, NULL); + 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 ? : ""); @@ -648,8 +522,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); @@ -658,7 +532,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); }