X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=19cf3692a795ded50d645b7d5934788aaeb0412f;hp=b320cbb0cd280484e91522b4a4c3357da71461e7;hb=d8ff4d5c628434353a45ec43ed11bd03e020c60e;hpb=1e3d1ceedd6d5deac1a652b9e8e2d4e0726c3163 diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index b320cbb0..19cf3692 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -35,23 +35,31 @@ #include #include +#define USEC_PER_SEC 1000000UL + #ifndef UUID_STR_LEN #define UUID_STR_LEN 37 /* With \0 */ #endif +int babeltrace_debug, babeltrace_verbose; + +static char *s_outputname; +static int s_timestamp; +static uuid_t s_uuid; + /* Metadata format string */ static const char metadata_fmt[] = "typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n" "typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n" "\n" "trace {\n" -" major = %s;\n" /* major (e.g. 0) */ -" minor = %s;\n" /* minor (e.g. 1) */ +" major = %u;\n" /* major (e.g. 0) */ +" minor = %u;\n" /* minor (e.g. 1) */ " uuid = \"%s\";\n" /* UUID */ " 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" @@ -60,6 +68,7 @@ static const char metadata_fmt[] = " uint32_t content_size;\n" " uint32_t packet_size;\n" " };\n" +"%s" /* Stream event header (opt.) */ "};\n" "\n" "event {\n" @@ -67,9 +76,11 @@ static const char metadata_fmt[] = " fields := struct { string str; };\n" "};\n"; -int babeltrace_debug, babeltrace_verbose; - -static uuid_t s_uuid; +static const char metadata_stream_event_header_timestamp[] = +" typealias integer { size = 64; align = 64; signed = false; } := uint64_t;\n" +" event.header := struct {\n" +" uint64_t timestamp;\n" +" };\n"; static void print_metadata(FILE *fp) @@ -78,13 +89,13 @@ void print_metadata(FILE *fp) uuid_unparse(s_uuid, uuid_str); fprintf(fp, metadata_fmt, - __stringify(BABELTRACE_VERSION_MAJOR), - __stringify(BABELTRACE_VERSION_MINOR), + BABELTRACE_VERSION_MAJOR, + BABELTRACE_VERSION_MINOR, uuid_str, - BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be"); + BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be", + s_timestamp ? metadata_stream_event_header_timestamp : ""); } - static void write_packet_header(struct ctf_stream_pos *pos, uuid_t uuid) { @@ -100,7 +111,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); @@ -138,17 +149,54 @@ void write_packet_context(struct ctf_stream_pos *pos) ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT); } +static +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, usec; + int ret; + + if (!s_timestamp) + return; + + /* Only need to be executed on first pass (dummy) */ + if (pos->dummy) { + /* Extract time from input line */ + ret = sscanf(line, "[%lu.%lu] ", &sec, &usec); + if (ret == 2) { + *tline = strchr(line, ']'); + assert(*tline); + (*tline)++; + if ((*tline)[0] == ' ') { + (*tline)++; + } + *tlen = len + line - *tline; + *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; + ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT); +} + static void trace_string(char *line, struct ctf_stream_pos *pos, size_t len) { struct ctf_stream_pos dummy; int attempt = 0; + char *tline = line; /* tline is start of text, after timestamp */ + size_t tlen = len; + uint64_t ts = 0; printf_debug("read: %s\n", line); retry: ctf_dummy_pos(pos, &dummy); + write_event_header(&dummy, line, &tline, len, &tlen, &ts); ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT); - ctf_move_pos(&dummy, len * CHAR_BIT); + ctf_move_pos(&dummy, tlen * CHAR_BIT); if (ctf_pos_packet(&dummy)) { ctf_pos_pad_packet(pos); write_packet_header(pos, s_uuid); @@ -161,9 +209,10 @@ retry: goto retry; } + write_event_header(pos, line, &tline, len, &tlen, &ts); ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT); - memcpy(ctf_get_pos_addr(pos), line, len); - ctf_move_pos(pos, len * CHAR_BIT); + memcpy(ctf_get_pos_addr(pos), tline, tlen); + ctf_move_pos(pos, tlen * CHAR_BIT); } static @@ -190,7 +239,8 @@ void trace_text(FILE *input, int output) ctf_fini_pos(&pos); } -static void usage(FILE *fp) +static +void usage(FILE *fp) { fprintf(fp, "BabelTrace Log Converter %u.%u\n", BABELTRACE_VERSION_MAJOR, @@ -198,33 +248,50 @@ static void usage(FILE *fp) 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 +int parse_args(int argc, char **argv) +{ + int i; + + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-t")) + s_timestamp = 1; + else + s_outputname = argv[i]; + } + if (!s_outputname) + return -EINVAL; + return 0; } int main(int argc, char **argv) { int fd, metadata_fd, ret; - char *outputname; DIR *dir; int dir_fd; FILE *metadata_fp; - if (argc < 2) { + ret = parse_args(argc, argv); + if (ret) { usage(stdout); goto error; } - outputname = argv[1]; - ret = mkdir(outputname, S_IRWXU|S_IRWXG); + ret = mkdir(s_outputname, S_IRWXU|S_IRWXG); if (ret) { perror("mkdir"); goto error; } - dir = opendir(outputname); + dir = opendir(s_outputname); if (!dir) { perror("opendir"); goto error_rmdir; @@ -279,7 +346,7 @@ error_closedir: if (ret) perror("closedir"); error_rmdir: - ret = rmdir(outputname); + ret = rmdir(s_outputname); if (ret) perror("rmdir"); error: