X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=ac66a8b08d878e2be09548be0320d2a3bb0321fc;hp=b2935ac9fa488cc3406549df69eebea9cf035c47;hb=a4dfa07bd488d4dd77e558ad9e611415441183e7;hpb=ca8b2b0219410977c3e27592f93b8d2e12ec5065 diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index b2935ac9..ac66a8b0 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -3,7 +3,9 @@ * * BabelTrace - Convert Text Log to CTF * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -18,6 +20,7 @@ * Depends on glibc 2.10 for getline(). */ +#include #include #include #include @@ -32,23 +35,22 @@ #include #include -#include +#include #include +#include -#define NSEC_PER_SEC 1000000UL - -#ifndef UUID_STR_LEN -#define UUID_STR_LEN 37 /* With \0 */ -#endif +#define USEC_PER_SEC 1000000UL int babeltrace_debug, babeltrace_verbose; static char *s_outputname; static int s_timestamp; +static int s_help; static uuid_t s_uuid; /* Metadata format string */ static const char metadata_fmt[] = +"/* CTF 1.8 */\n" "typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n" "typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n" "\n" @@ -59,7 +61,7 @@ static const char metadata_fmt[] = " byte_order = %s;\n" /* be or le */ " packet.header := struct {\n" " uint32_t magic;\n" -" uint8_t trace_uuid[16];\n" +" uint8_t uuid[16];\n" " };\n" "};\n" "\n" @@ -85,12 +87,17 @@ static const char metadata_stream_event_header_timestamp[] = static void print_metadata(FILE *fp) { - char uuid_str[UUID_STR_LEN]; + char uuid_str[BABELTRACE_UUID_STR_LEN]; + unsigned int major = 0, minor = 0; + int ret; - uuid_unparse(s_uuid, uuid_str); + ret = sscanf(VERSION, "%u.%u", &major, &minor); + if (ret != 2) + fprintf(stderr, "[warning] Incorrect babeltrace version format\n."); + babeltrace_uuid_unparse(s_uuid, uuid_str); fprintf(fp, metadata_fmt, - BABELTRACE_VERSION_MAJOR, - BABELTRACE_VERSION_MINOR, + major, + minor, uuid_str, BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be", s_timestamp ? metadata_stream_event_header_timestamp : ""); @@ -111,7 +118,7 @@ void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid) *(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1; ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT); - /* trace_uuid */ + /* uuid */ ctf_dummy_pos(pos, &dummy); ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT); ctf_move_pos(&dummy, 16 * CHAR_BIT); @@ -154,7 +161,7 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, char **tline, size_t len, size_t *tlen, uint64_t *ts) { - unsigned long sec, nsec; + unsigned long sec, usec; int ret; if (!s_timestamp) @@ -163,19 +170,22 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, /* Only need to be executed on first pass (dummy) */ if (pos->dummy) { /* Extract time from input line */ - ret = sscanf(line, "[%lu.%lu] ", &sec, &nsec); + ret = sscanf(line, "[%lu.%lu] ", &sec, &usec); if (ret == 2) { *tline = strchr(line, ']'); - if ((*tline)[1] == ' ') + assert(*tline); + (*tline)++; + if ((*tline)[0] == ' ') { (*tline)++; + } *tlen = len + line - *tline; - *ts = (uint64_t) sec * NSEC_PER_SEC + (uint64_t) nsec; + *ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec; } } /* timestamp */ ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT); if (!pos->dummy) - *(uint32_t *) ctf_get_pos_addr(pos) = *ts; + *(uint64_t *) ctf_get_pos_addr(pos) = *ts; ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT); } @@ -199,7 +209,7 @@ retry: write_packet_header(pos, s_uuid); write_packet_context(pos); if (attempt++ == 1) { - fprintf(stdout, "[Error] Line too large for packet size (%zukB) (discarded)\n", + fprintf(stderr, "[Error] Line too large for packet size (%zukB) (discarded)\n", pos->packet_size / CHAR_BIT / 1024); return; } @@ -239,16 +249,16 @@ void trace_text(FILE *input, int output) static void usage(FILE *fp) { - fprintf(fp, "BabelTrace Log Converter %u.%u\n", - BABELTRACE_VERSION_MAJOR, - BABELTRACE_VERSION_MINOR); + fprintf(fp, "BabelTrace Log Converter %s\n", VERSION); fprintf(fp, "\n"); fprintf(fp, "Convert for a text log (read from standard input) to CTF.\n"); fprintf(fp, "\n"); - fprintf(fp, "usage : babeltrace-log OUTPUT\n"); + fprintf(fp, "usage : babeltrace-log [OPTIONS] OUTPUT\n"); fprintf(fp, "\n"); fprintf(fp, " OUTPUT Output trace path\n"); fprintf(fp, "\n"); + fprintf(fp, " -t With timestamps (format: [sec.usec] string\\n)\n"); + fprintf(fp, "\n"); } static @@ -259,6 +269,11 @@ int parse_args(int argc, char **argv) for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-t")) s_timestamp = 1; + else if (!strcmp(argv[i], "-h")) { + s_help = 1; + return 0; + } else if (argv[i][0] == '-') + return -EINVAL; else s_outputname = argv[i]; } @@ -276,10 +291,16 @@ int main(int argc, char **argv) ret = parse_args(argc, argv); if (ret) { - usage(stdout); + fprintf(stderr, "Error: invalid argument.\n"); + usage(stderr); goto error; } + if (s_help) { + usage(stdout); + exit(EXIT_SUCCESS); + } + ret = mkdir(s_outputname, S_IRWXU|S_IRWXG); if (ret) { perror("mkdir");