X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=db7f60f1d2b60b2eeccf114ab24e2965a5641caa;hp=52a2fe1de89c195d961780d49d5e760ee2be86d4;hb=5f38bc819a3feece3f0c8cf1155735b090e533c1;hpb=4cb26dfbd763c06d99bf1069e2d1f3a569858e32 diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index 52a2fe1d..db7f60f1 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -24,17 +24,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * - * Depends on glibc 2.10 for getline(). */ -#define _GNU_SOURCE -#include #include #include #include #include -#include +#include #include #include #include @@ -46,8 +42,13 @@ #include #include #include +#include +#include #include +#define NSEC_PER_USEC 1000UL +#define NSEC_PER_MSEC 1000000UL +#define NSEC_PER_SEC 1000000000ULL #define USEC_PER_SEC 1000000UL int babeltrace_debug, babeltrace_verbose; @@ -104,7 +105,7 @@ void print_metadata(FILE *fp) 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); + bt_uuid_unparse(s_uuid, uuid_str); fprintf(fp, metadata_fmt, major, minor, @@ -120,23 +121,36 @@ void write_packet_header(struct ctf_stream_pos *pos, unsigned char *uuid) /* magic */ ctf_dummy_pos(pos, &dummy); - ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT); - ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT); + if (!ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT)) + goto error; + if (!ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT)) + goto error; assert(!ctf_pos_packet(&dummy)); - - ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT); + + if (!ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT)) + goto error; *(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1; - ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT); + if (!ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT)) + goto error; /* uuid */ ctf_dummy_pos(pos, &dummy); - ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT); - ctf_move_pos(&dummy, 16 * CHAR_BIT); + if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT)) + goto error; + if (!ctf_move_pos(&dummy, 16 * CHAR_BIT)) + goto error; assert(!ctf_pos_packet(&dummy)); - ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT); + if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT)) + goto error; memcpy(ctf_get_pos_addr(pos), uuid, BABELTRACE_UUID_LEN); - ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT); + if (!ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT)) + goto error; + return; + +error: + fprintf(stderr, "[error] Out of packet bounds when writing packet header\n"); + abort(); } static @@ -146,24 +160,37 @@ void write_packet_context(struct ctf_stream_pos *pos) /* content_size */ ctf_dummy_pos(pos, &dummy); - ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT); - ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT)) + goto error; + if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT)) + goto error; assert(!ctf_pos_packet(&dummy)); - - ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT); + + if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; *(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL; /* Not known yet */ pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos); - ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; /* packet_size */ ctf_dummy_pos(pos, &dummy); - ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT); - ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT)) + goto error; + if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT)) + goto error; assert(!ctf_pos_packet(&dummy)); - - ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT); + + if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; *(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size; - ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; + return; + +error: + fprintf(stderr, "[error] Out of packet bounds when writing packet context\n"); + abort(); } static @@ -171,18 +198,46 @@ 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; - if (!s_timestamp) return; /* Only need to be executed on first pass (dummy) */ - if (pos->dummy) { - int ret; + if (pos->dummy) { + int has_timestamp = 0; + unsigned long sec, usec, msec; + unsigned int year, mon, mday, hour, min; /* Extract time from input line */ - ret = sscanf(line, "[%lu.%lu] ", &sec, &usec); - if (ret == 2) { + if (sscanf(line, "[%lu.%lu] ", &sec, &usec) == 2) { + *ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec; + /* + * Default CTF clock has 1GHz frequency. Convert + * from usec to nsec. + */ + *ts *= NSEC_PER_USEC; + has_timestamp = 1; + } else if (sscanf(line, "[%u-%u-%u %u:%u:%lu.%lu] ", + &year, &mon, &mday, &hour, &min, + &sec, &msec) == 7) { + time_t ep_sec; + struct tm ti; + + memset(&ti, 0, sizeof(ti)); + ti.tm_year = year - 1900; /* from 1900 */ + ti.tm_mon = mon - 1; /* 0 to 11 */ + ti.tm_mday = mday; + ti.tm_hour = hour; + ti.tm_min = min; + ti.tm_sec = sec; + + ep_sec = babeltrace_timegm(&ti); + if (ep_sec != (time_t) -1) { + *ts = (uint64_t) ep_sec * NSEC_PER_SEC + + (uint64_t) msec * NSEC_PER_MSEC; + } + has_timestamp = 1; + } + if (has_timestamp) { *tline = strchr(line, ']'); assert(*tline); (*tline)++; @@ -190,19 +245,20 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, (*tline)++; } *tlen = len + line - *tline; - *ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec; - /* - * Default CTF clock has 1GHz frequency. Convert - * from usec to nsec. - */ - *ts *= 1000; } } /* timestamp */ - ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; if (!pos->dummy) *(uint64_t *) ctf_get_pos_addr(pos) = *ts; - ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT); + if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT)) + goto error; + return; + +error: + fprintf(stderr, "[error] Out of packet bounds when writing event header\n"); + abort(); } static @@ -217,11 +273,15 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t len) printf_debug("read: %s\n", line); for (;;) { + int packet_filled = 0; + 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, tlen * CHAR_BIT); - if (ctf_pos_packet(&dummy)) { + if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT)) + packet_filled = 1; + if (!ctf_move_pos(&dummy, tlen * CHAR_BIT)) + packet_filled = 1; + if (packet_filled || ctf_pos_packet(&dummy)) { ctf_pos_pad_packet(pos); write_packet_header(pos, s_uuid); write_packet_context(pos); @@ -237,9 +297,16 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t len) } write_event_header(pos, line, &tline, len, &tlen, &ts); - ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT); + if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT)) + goto error; memcpy(ctf_get_pos_addr(pos), tline, tlen); - ctf_move_pos(pos, tlen * CHAR_BIT); + if (!ctf_move_pos(pos, tlen * CHAR_BIT)) + goto error; + return; + +error: + fprintf(stderr, "[error] Out of packet bounds when writing event payload\n"); + abort(); } static @@ -248,7 +315,7 @@ void trace_text(FILE *input, int output) struct ctf_stream_pos pos; ssize_t len; char *line = NULL, *nl; - size_t linesize; + size_t linesize = 0; int ret; memset(&pos, 0, sizeof(pos)); @@ -257,10 +324,11 @@ void trace_text(FILE *input, int output) fprintf(stderr, "Error in ctf_init_pos\n"); return; } + ctf_packet_seek(&pos.parent, 0, SEEK_CUR); write_packet_header(&pos, s_uuid); write_packet_context(&pos); for (;;) { - len = getline(&line, &linesize, input); + len = bt_getline(&line, &linesize, input); if (len < 0) break; nl = strrchr(line, '\n'); @@ -289,6 +357,7 @@ void usage(FILE *fp) fprintf(fp, " OUTPUT Output trace path\n"); fprintf(fp, "\n"); fprintf(fp, " -t With timestamps (format: [sec.usec] string\\n)\n"); + fprintf(fp, " (format: [YYYY-MM-DD HH:MM:SS.MS] string\\n)\n"); fprintf(fp, "\n"); } @@ -343,7 +412,7 @@ int main(int argc, char **argv) perror("opendir"); goto error_rmdir; } - dir_fd = dirfd(dir); + dir_fd = bt_dirfd(dir); if (dir_fd < 0) { perror("dirfd"); goto error_closedir; @@ -358,7 +427,7 @@ int main(int argc, char **argv) metadata_fd = openat(dir_fd, "metadata", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); - if (fd < 0) { + if (metadata_fd < 0) { perror("openat"); goto error_closedatastream; } @@ -368,7 +437,7 @@ int main(int argc, char **argv) goto error_closemetadatafd; } - babeltrace_uuid_generate(s_uuid); + bt_uuid_generate(s_uuid); print_metadata(metadata_fp); trace_text(stdin, fd);