Make API CTF-agnostic

[babeltrace.git] / plugins / ctf / common / metadata / decoder.c

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index cba4756c07d9ce34ccd85535006be8cd08d19be5..38733ae38b444a0fe04cc9d33424021ef33e14dd 100644 (file)
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -20,10 +20,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <glib.h>
 #include <string.h>
 
@@ -103,6 +103,11 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp,
        int ret = 0;
        const long offset = ftell(in_fp);
 
+       if (offset < 0) {
+               BT_LOGE_ERRNO("Failed to get current metadata file position",
+                       ".");
+               goto error;
+       }
        BT_LOGV("Decoding metadata packet: mdec-addr=%p, offset=%ld",
                mdec, offset);
        readlen = fread(&header, sizeof(header), 1, in_fp);
@@ -207,20 +212,28 @@ int decode_packet(struct ctf_metadata_decoder *mdec, FILE *in_fp, FILE *out_fp,
        toread = header.content_size / CHAR_BIT - sizeof(header);
 
        for (;;) {
-               readlen = fread(buf, sizeof(uint8_t),
-                       MIN(sizeof(buf) - 1, toread), in_fp);
+               size_t loop_read;
+
+               loop_read = MIN(sizeof(buf) - 1, toread);
+               readlen = fread(buf, sizeof(uint8_t), loop_read, in_fp);
                if (ferror(in_fp)) {
                        BT_LOGE("Cannot read metadata packet buffer: "
-                               "offset=%ld, read-size=%u",
-                               ftell(in_fp), (unsigned int) readlen);
+                               "offset=%ld, read-size=%zu",
+                               ftell(in_fp), loop_read);
+                       goto error;
+               }
+               if (readlen > loop_read) {
+                       BT_LOGE("fread returned more byte than expected: "
+                               "read-size-asked=%zu, read-size-returned=%zu",
+                               loop_read, readlen);
                        goto error;
                }
 
                writelen = fwrite(buf, sizeof(uint8_t), readlen, out_fp);
                if (writelen < readlen || ferror(out_fp)) {
                        BT_LOGE("Cannot write decoded metadata text to buffer: "
-                               "read-offset=%ld, write-size=%u",
-                               ftell(in_fp), (unsigned int) readlen);
+                               "read-offset=%ld, write-size=%zu",
+                               ftell(in_fp), readlen);
                        goto error;
                }
 
@@ -291,6 +304,13 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf_with_mdec(
 
        /* Close stream, which also flushes the buffer */
        ret = bt_close_memstream(buf, &size, out_fp);
+       /*
+        * See fclose(3). Further access to out_fp after both success
+        * and error, even through another bt_close_memstream(), results
+        * in undefined behavior. Nullify out_fp to ensure we don't
+        * fclose it twice on error.
+        */
+       out_fp = NULL;
        if (ret < 0) {
                BT_LOGE("Cannot close memory stream: %s: mdec-addr=%p",
                        strerror(errno), mdec);
@@ -397,7 +417,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
        char *buf = NULL;
        bool close_fp = false;
 
-       assert(mdec);
+       BT_ASSERT(mdec);
 
        if (ctf_metadata_decoder_is_packetized(fp, &mdec->bo)) {
                BT_LOGD("Metadata stream is packetized: mdec-addr=%p", mdec);
@@ -475,7 +495,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
                goto end;
        }
 
-       assert(fp);
+       BT_ASSERT(fp);
        ret = ctf_scanner_append_ast(scanner, fp);
        if (ret) {
                BT_LOGE("Cannot create the metadata AST out of the metadata text: "
@@ -494,6 +514,10 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 
        ret = ctf_visitor_generate_ir_visit_node(mdec->visitor,
                &scanner->ast->root);
+       // TODO
+       ret = -1;
+       goto end;
+
        switch (ret) {
        case 0:
                /* Success */
@@ -532,8 +556,15 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_trace *ctf_metadata_decoder_get_trace(
+struct bt_trace *ctf_metadata_decoder_get_ir_trace(
+               struct ctf_metadata_decoder *mdec)
+{
+       return ctf_visitor_generate_ir_get_ir_trace(mdec->visitor);
+}
+
+BT_HIDDEN
+struct ctf_trace_class *ctf_metadata_decoder_borrow_ctf_trace_class(
                struct ctf_metadata_decoder *mdec)
 {
-       return ctf_visitor_generate_ir_get_trace(mdec->visitor);
+       return ctf_visitor_generate_ir_borrow_ctf_trace_class(mdec->visitor);
 }