X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=38cf8392d47802224f63990d7a80d7055798fff8;hb=8b596b57e1ff348a11b596b85278c17445e06afb;hp=b6d798f797d0f86094b69c3e507dbf045ebed60f;hpb=a386e24609752742b100120db6798d311fab512a;p=babeltrace.git diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index b6d798f7..38cf8392 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 @@ -42,11 +38,14 @@ #include #include #include +#include +#include #include #include #include #include +#include #include #define NSEC_PER_USEC 1000UL @@ -54,7 +53,7 @@ #define NSEC_PER_SEC 1000000000ULL #define USEC_PER_SEC 1000000UL -int babeltrace_debug, babeltrace_verbose; +bool babeltrace_debug, babeltrace_verbose; static char *s_outputname; static int s_timestamp; @@ -108,7 +107,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, @@ -124,23 +123,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 @@ -150,24 +162,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 @@ -207,7 +232,7 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, ti.tm_min = min; ti.tm_sec = sec; - ep_sec = babeltrace_timegm(&ti); + ep_sec = bt_timegm(&ti); if (ep_sec != (time_t) -1) { *ts = (uint64_t) ep_sec * NSEC_PER_SEC + (uint64_t) msec * NSEC_PER_MSEC; @@ -225,10 +250,17 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, } } /* 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 @@ -243,11 +275,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); @@ -263,9 +299,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 @@ -274,7 +317,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)); @@ -283,10 +326,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'); @@ -359,9 +403,9 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); } - ret = mkdir(s_outputname, S_IRWXU|S_IRWXG); + ret = g_mkdir(s_outputname, S_IRWXU|S_IRWXG); if (ret) { - perror("mkdir"); + perror("g_mkdir"); goto error; } @@ -370,7 +414,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; @@ -395,7 +439,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);