*
* BabelTrace - Convert Text Log to CTF
*
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
#include <babeltrace/babeltrace.h>
#include <babeltrace/ctf/types.h>
+#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 int s_help;
+static uuid_t s_uuid;
+
/* Metadata format string */
static const char metadata_fmt[] =
"typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n"
" 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"
" uint32_t content_size;\n"
" uint32_t packet_size;\n"
" };\n"
+"%s" /* Stream event header (opt.) */
"};\n"
"\n"
"event {\n"
" 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)
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)
{
*(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);
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)
+ *(uint64_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);
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
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,
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 if (!strcmp(argv[i], "-h")) {
+ s_help = 1;
+ return 0;
+ } else if (argv[i][0] == '-')
+ return -EINVAL;
+ 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) {
+ fprintf(stdout, "Error: invalid argument.\n");
usage(stdout);
goto error;
}
- outputname = argv[1];
- ret = mkdir(outputname, S_IRWXU|S_IRWXG);
+ if (s_help) {
+ usage(stdout);
+ exit(EXIT_SUCCESS);
+ }
+
+ 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;
if (ret)
perror("closedir");
error_rmdir:
- ret = rmdir(outputname);
+ ret = rmdir(s_outputname);
if (ret)
perror("rmdir");
error: