X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=db7f60f1d2b60b2eeccf114ab24e2965a5641caa;hp=d24f011e5ed214785840da4435fe447b4a491c1f;hb=54d1c81f52d1f8ac081a4b06996cc69db9294ce6;hpb=fef3bf22431390dae389d378b7709366b158b83d diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index d24f011e..db7f60f1 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -17,16 +17,20 @@ * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * - * Depends on glibc 2.10 for getline(). + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * 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. */ -#define _GNU_SOURCE -#include #include #include #include #include -#include +#include #include #include #include @@ -37,9 +41,14 @@ #include #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; @@ -96,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, @@ -112,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 @@ -138,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 @@ -163,17 +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; - int ret; - if (!s_timestamp) return; /* Only need to be executed on first pass (dummy) */ - if (pos->dummy) { + 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)++; @@ -181,14 +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; } } /* 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 @@ -201,27 +271,42 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t 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, tlen * CHAR_BIT); - if (ctf_pos_packet(&dummy)) { - ctf_pos_pad_packet(pos); - write_packet_header(pos, s_uuid); - write_packet_context(pos); - if (attempt++ == 1) { - fprintf(stderr, "[Error] Line too large for packet size (%" PRIu64 "kB) (discarded)\n", - pos->packet_size / CHAR_BIT / 1024); - return; + + for (;;) { + int packet_filled = 0; + + ctf_dummy_pos(pos, &dummy); + write_event_header(&dummy, line, &tline, len, &tlen, &ts); + 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); + if (attempt++ == 1) { + fprintf(stderr, "[Error] Line too large for packet size (%" PRIu64 "kB) (discarded)\n", + pos->packet_size / CHAR_BIT / 1024); + return; + } + continue; + } else { + break; } - goto retry; } 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 @@ -230,15 +315,20 @@ 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)); - ctf_init_pos(&pos, output, O_RDWR); - + ret = ctf_init_pos(&pos, NULL, output, O_RDWR); + if (ret) { + 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'); @@ -249,7 +339,10 @@ void trace_text(FILE *input, int output) trace_string(line, &pos, strlen(line) + 1); } } - ctf_fini_pos(&pos); + ret = ctf_fini_pos(&pos); + if (ret) { + fprintf(stderr, "Error in ctf_fini_pos\n"); + } } static @@ -264,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"); } @@ -318,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; @@ -333,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; } @@ -343,11 +437,13 @@ 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); - close(fd); + ret = close(fd); + if (ret) + perror("close"); exit(EXIT_SUCCESS); /* error handling */