X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=0cdd42e3611442734efcbe13d33408c260e42ec7;hp=03b9d2f2ff379c57c332a720e75fb4d59f026c1a;hb=70accc147c2372e8fc37d244525ffccb7be73d9a;hpb=359d7456178eeebd3f5a11c7ef2050b91f68123b diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 03b9d2f2..0cdd42e3 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; @@ -64,6 +67,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 +85,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 }, }; @@ -111,6 +124,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"); } @@ -226,6 +245,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; @@ -249,6 +300,7 @@ end: 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); } /* @@ -265,12 +317,126 @@ static void finalize_trace_collection(struct trace_collection *tc) fmt_read->close_trace(temp); } g_ptr_array_free(tc->array, TRUE); + g_hash_table_destroy(tc->clocks); } -static void trace_collection_add(struct trace_collection *tc, - struct trace_descriptor *td) +struct clock_match { + GHashTable *clocks; + struct ctf_clock *clock_match; +}; + +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; + } + } +} + +static void clock_add(gpointer key, gpointer value, gpointer user_data) +{ + GHashTable *tc_clocks = user_data; + 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) { + 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). Choosing one arbitrarily.\n", + g_quark_to_string(tc_clock->name), + diff_ns < 0 ? -diff_ns : diff_ns); + } + } + } +} + +/* + * 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); + + if (tc->array->len > 1) { + struct clock_match clock_match = { + .clocks = tc->clocks, + .clock_match = 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; + } + } + /* + * Add each clock from the trace clocks into the trace + * collection clocks. + */ + g_hash_table_foreach(trace->clocks, + clock_add, + tc->clocks); + return 0; +error: + return -EPERM; } int convert_trace(struct trace_descriptor *td_write, @@ -325,6 +491,7 @@ static int traverse_dir(const char *fpath, const struct stat *sb, int dirfd; int fd; struct trace_descriptor *td_read; + int ret; if (tflag != FTW_D) return 0; @@ -348,7 +515,10 @@ static int traverse_dir(const char *fpath, const struct stat *sb, "for reading.\n\n", fpath); return -1; /* error */ } - trace_collection_add(&trace_collection_read, td_read); + ret = trace_collection_add(&trace_collection_read, td_read); + if (ret) { + return -1; + } } return 0; /* success */ }