Change UUID API prefix from babeltrace_ to bt_

[babeltrace.git] / converter / babeltrace-log.c

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index b6d798f797d0f86094b69c3e507dbf045ebed60f..b724ccd67ebd5aecbb26d671d2e858e2d978b533 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -108,7 +108,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 +124,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 +163,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
@@ -225,10 +251,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 +276,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 +300,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
@@ -283,6 +327,7 @@ 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 (;;) {
@@ -395,7 +440,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);