X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=c9007c3d9c9f2f5c467c4e9435d4055dd474a06c;hp=55d89c895a47c0df8cb78bb48d9259bc4c3054d3;hb=b4b292cc76e04e9efda111e492251d8e7aefe451;hpb=34224260f687a555f30f4862c44c92e1f63c4d14 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 55d89c89..c9007c3d 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include /* for clocks */ @@ -73,7 +73,7 @@ enum { OPT_FIELDS, OPT_NO_DELTA, OPT_CLOCK_OFFSET, - OPT_CLOCK_RAW, + OPT_CLOCK_CYCLES, OPT_CLOCK_SECONDS, OPT_CLOCK_DATE, OPT_CLOCK_GMT, @@ -92,7 +92,7 @@ static struct poptOption long_options[] = { { "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-cycles", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_CYCLES, 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 }, @@ -131,7 +131,7 @@ 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-cycles Timestamp in cycles\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"); @@ -261,8 +261,8 @@ 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; + case OPT_CLOCK_CYCLES: + opt_clock_cycles = 1; break; case OPT_CLOCK_OFFSET: { @@ -317,7 +317,62 @@ end: return ret; } +static GPtrArray *traversed_paths = 0; +/* + * traverse_trace_dir() is the callback function 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 add the path to a global list to be processed later in + * add_traces_recursive. + */ +static int traverse_trace_dir(const char *fpath, const struct stat *sb, + int tflag, struct FTW *ftwbuf) +{ + int dirfd, metafd; + int closeret; + + if (tflag != FTW_D) + return 0; + + dirfd = open(fpath, 0); + if (dirfd < 0) { + fprintf(stderr, "[error] [Context] Unable to open trace " + "directory file descriptor.\n"); + return 0; /* partial error */ + } + metafd = openat(dirfd, "metadata", O_RDONLY); + if (metafd < 0) { + closeret = close(dirfd); + if (closeret < 0) { + perror("close"); + return -1; + } + /* No meta data, just return */ + return 0; + } else { + closeret = close(metafd); + if (closeret < 0) { + perror("close"); + return -1; /* failure */ + } + closeret = close(dirfd); + if (closeret < 0) { + perror("close"); + return -1; /* failure */ + } + + /* Add path to the global list */ + if (traversed_paths == NULL) { + fprintf(stderr, "[error] [Context] Invalid open path array.\n"); + return -1; + } + g_ptr_array_add(traversed_paths, g_string_new(fpath)); + } + + return 0; +} /* * bt_context_add_traces_recursive: Open a trace recursively * @@ -335,83 +390,45 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path, 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; + int i; - /* - * 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; - } + /* Should lock traversed_paths mutex here if used in multithread */ + traversed_paths = g_ptr_array_new(); 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); + ret = nftw(path, traverse_trace_dir, 10, 0); + + /* Process the array if ntfw did not return a fatal error */ + if (ret >= 0) { + for (i = 0; i < traversed_paths->len; i++) { + GString *trace_path = g_ptr_array_index(traversed_paths, + i); + int trace_id = bt_context_add_trace(ctx, + trace_path->str, + 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); + fprintf(stderr, "[warning] [Context] cannot open trace \"%s\" from %s " + "for reading.\n", trace_path->str, path); /* Allow to skip erroneous traces. */ ret = 1; /* partial error */ - continue; + } else { + g_array_append_val(trace_ids, trace_id); } - g_array_append_val(trace_ids, trace_id); + g_string_free(trace_path, TRUE); } } + g_ptr_array_free(traversed_paths, TRUE); + traversed_paths = NULL; + + /* Should unlock traversed paths mutex here if used in multithread */ -error: /* * Return an error if no trace can be opened. */ @@ -423,8 +440,6 @@ error: return ret; } - - int convert_trace(struct trace_descriptor *td_write, struct bt_context *ctx) { @@ -487,7 +502,7 @@ int main(int argc, char **argv) } strlower(opt_input_format); } - if (opt_output_format) { + if (opt_output_format_arg) { opt_output_format = strdup(opt_output_format_arg); if (!opt_output_format) { partial_error = 1; @@ -534,6 +549,9 @@ int main(int argc, char **argv) } ctx = bt_context_create(); + if (!ctx) { + goto error_td_read; + } ret = bt_context_add_traces_recursive(ctx, opt_input_path, opt_input_format, NULL);