projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Namespace the struct trace_descriptor
[babeltrace.git] / formats / ctf / ctf.c
diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index e18fffb1fa43030bb725f62cca380c8f51748f69..2411f7ff43e4afc3ede991396949d3d06a724e85 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -76,33 +76,33 @@ uint64_t opt_clock_offset;
 extern int yydebug;
 
 static
-struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp);
 static
-struct trace_descriptor *ctf_open_mmap_trace(
+struct bt_trace_descriptor *ctf_open_mmap_trace(
                struct mmap_stream_list *mmap_list,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp);
 static
-void ctf_set_context(struct trace_descriptor *descriptor,
+void ctf_set_context(struct bt_trace_descriptor *descriptor,
                struct bt_context *ctx);
 static
-void ctf_set_handle(struct trace_descriptor *descriptor,
+void ctf_set_handle(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle);
 
 static
-int ctf_close_trace(struct trace_descriptor *descriptor);
+int ctf_close_trace(struct bt_trace_descriptor *descriptor);
 static
-uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle, enum bt_clock_type type);
 static
-uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle, enum bt_clock_type type);
 static
-int ctf_convert_index_timestamp(struct trace_descriptor *tdp);
+int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp);
 
 static
 rw_dispatch read_dispatch_table[] = {
@@ -141,7 +141,7 @@ struct format ctf_format = {
 };
 
 static
-uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
+uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle, enum bt_clock_type type)
 {
        struct ctf_trace *tin;
@@ -202,7 +202,7 @@ error:
 }
 
 static
-uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
+uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle, enum bt_clock_type type)
 {
        struct ctf_trace *tin;
@@ -392,7 +392,7 @@ void ctf_print_timestamp(FILE *fp,
 }
 
 static
-int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
@@ -427,7 +427,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
                if (unlikely(ret))
                        goto error;
                /* lookup event id */
-               integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
+               integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "id", FALSE);
                if (integer_definition) {
                        id = integer_definition->value._unsigned;
                } else {
@@ -439,9 +439,9 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
                        }
                }
 
-               variant = lookup_variant(&stream->stream_event_header->p, "v");
+               variant = bt_lookup_variant(&stream->stream_event_header->p, "v");
                if (variant) {
-                       integer_definition = lookup_integer(variant, "id", FALSE);
+                       integer_definition = bt_lookup_integer(variant, "id", FALSE);
                        if (integer_definition) {
                                id = integer_definition->value._unsigned;
                        }
@@ -450,13 +450,13 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
 
                /* lookup timestamp */
                stream->has_timestamp = 0;
-               integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);
+               integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);
                if (integer_definition) {
                        ctf_update_timestamp(stream, integer_definition);
                        stream->has_timestamp = 1;
                } else {
                        if (variant) {
-                               integer_definition = lookup_integer(variant, "timestamp", FALSE);
+                               integer_definition = bt_lookup_integer(variant, "timestamp", FALSE);
                                if (integer_definition) {
                                        ctf_update_timestamp(stream, integer_definition);
                                        stream->has_timestamp = 1;
@@ -504,7 +504,7 @@ error:
 }
 
 static
-int ctf_write_event(struct stream_pos *pos, struct ctf_stream_definition *stream)
+int ctf_write_event(struct bt_stream_pos *pos, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_declaration *stream_class = stream->stream_class;
        struct ctf_event_definition *event;
@@ -617,7 +617,7 @@ int ctf_fini_pos(struct ctf_stream_pos *pos)
  * for SEEK_CUR: go to next packet.
  * for SEEK_POS: go to packet numer (index).
  */
-void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
+void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
 {
        struct ctf_stream_pos *pos =
                container_of(stream_pos, struct ctf_stream_pos, parent);
@@ -961,7 +961,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
                                        char **buf)
 {
        FILE *in, *out;
-       size_t size;
+       size_t size, buflen;
        int ret;
 
        in = *fp;
@@ -1003,7 +1003,12 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
                perror("Error in fclose");
        }
        /* open for reading */
-       *fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb");
+       buflen = strlen(*buf);
+       if (!buflen) {
+               *fp = NULL;
+               return -ENODATA;
+       }
+       *fp = babeltrace_fmemopen(*buf, buflen, "rb");
        if (!*fp) {
                perror("Metadata fmemopen");
                return -errno;
@@ -1013,7 +1018,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 
 static
 int ctf_open_trace_metadata_read(struct ctf_trace *td,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_scanner *scanner;
@@ -1060,8 +1065,11 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td,
 
        if (packet_metadata(td, fp)) {
                ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
-               if (ret)
+               if (ret) {
+                       /* Warn about empty metadata */
+                       fprintf(stderr, "[warning] Empty metadata.\n");
                        goto end_packet_read;
+               }
        } else {
                unsigned int major, minor;
                ssize_t nr_items;
@@ -1168,9 +1176,9 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 
 error:
        if (stream_event->event_fields)
-               definition_unref(&stream_event->event_fields->p);
+               bt_definition_unref(&stream_event->event_fields->p);
        if (stream_event->event_context)
-               definition_unref(&stream_event->event_context->p);
+               bt_definition_unref(&stream_event->event_context->p);
        return NULL;
 }
 
@@ -1246,11 +1254,11 @@ error_event:
        g_ptr_array_free(stream->events_by_id, TRUE);
 error:
        if (stream->stream_event_context)
-               definition_unref(&stream->stream_event_context->p);
+               bt_definition_unref(&stream->stream_event_context->p);
        if (stream->stream_event_header)
-               definition_unref(&stream->stream_event_header->p);
+               bt_definition_unref(&stream->stream_event_header->p);
        if (stream->stream_packet_context)
-               definition_unref(&stream->stream_packet_context->p);
+               bt_definition_unref(&stream->stream_packet_context->p);
        return ret;
 }
 
@@ -1311,13 +1319,13 @@ int create_stream_packet_index(struct ctf_trace *td,
                        ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
                        if (ret)
                                return ret;
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
                        if (len_index >= 0) {
                                struct definition *field;
                                uint64_t magic;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               magic = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               magic = bt_get_unsigned_int(field);
                                if (magic != CTF_MAGIC) {
                                        fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
                                                        magic,
@@ -1328,14 +1336,14 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* check uuid */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
                        if (len_index >= 0) {
                                struct definition_array *defarray;
                                struct definition *field;
                                uint64_t i;
                                uint8_t uuidval[BABELTRACE_UUID_LEN];
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_ARRAY);
                                defarray = container_of(field, struct definition_array, p);
                                assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
@@ -1344,7 +1352,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                        struct definition *elem;
 
                                        elem = bt_array_index(defarray, i);
-                                       uuidval[i] = get_unsigned_int(elem);
+                                       uuidval[i] = bt_get_unsigned_int(elem);
                                }
                                ret = babeltrace_uuid_compare(td->uuid, uuidval);
                                if (ret) {
@@ -1354,12 +1362,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
 
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               stream_id = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               stream_id = bt_get_unsigned_int(field);
                        }
                }
 
@@ -1391,36 +1399,36 @@ int create_stream_packet_index(struct ctf_trace *td,
                        if (ret)
                                return ret;
                        /* read content size from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.content_size = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.content_size = bt_get_unsigned_int(field);
                        } else {
                                /* Use file size for packet size */
                                packet_index.content_size = filestats.st_size * CHAR_BIT;
                        }
 
                        /* read packet size from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.packet_size = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.packet_size = bt_get_unsigned_int(field);
                        } else {
                                /* Use content size if non-zero, else file size */
                                packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
                        }
 
                        /* read timestamp begin from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.timestamp_begin = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.timestamp_begin = bt_get_unsigned_int(field);
                                if (file_stream->parent.stream_class->trace->collection) {
                                        packet_index.timestamp_begin =
                                                ctf_get_real_timestamp(
@@ -1430,12 +1438,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* read timestamp end from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.timestamp_end = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.timestamp_end = bt_get_unsigned_int(field);
                                if (file_stream->parent.stream_class->trace->collection) {
                                        packet_index.timestamp_end =
                                                ctf_get_real_timestamp(
@@ -1445,13 +1453,13 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* read events discarded from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.events_discarded = get_unsigned_int(field);
-                               packet_index.events_discarded_len = get_int_len(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.events_discarded = bt_get_unsigned_int(field);
+                               packet_index.events_discarded_len = bt_get_int_len(field);
                        }
                } else {
                        /* Use file size for packet size */
@@ -1515,7 +1523,7 @@ error:
  */
 static
 int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence))
 {
        int ret, fd, closeret;
@@ -1572,7 +1580,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 
 error_index:
        if (file_stream->parent.trace_packet_header)
-               definition_unref(&file_stream->parent.trace_packet_header->p);
+               bt_definition_unref(&file_stream->parent.trace_packet_header->p);
 error_def:
        closeret = ctf_fini_pos(&file_stream->pos);
        if (closeret) {
@@ -1592,7 +1600,7 @@ error:
 static
 int ctf_open_trace_read(struct ctf_trace *td,
                const char *path, int flags,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        int ret, closeret;
@@ -1687,8 +1695,8 @@ error:
  * since the index creation read it entirely.
  */
 static
-struct trace_descriptor *ctf_open_trace(const char *path, int flags,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_trace *td;
@@ -1778,7 +1786,7 @@ end:
 static
 int ctf_open_mmap_stream_read(struct ctf_trace *td,
                struct mmap_stream *mmap_info,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence))
 {
        int ret;
@@ -1811,7 +1819,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
 
 error_index:
        if (file_stream->parent.trace_packet_header)
-               definition_unref(&file_stream->parent.trace_packet_header->p);
+               bt_definition_unref(&file_stream->parent.trace_packet_header->p);
 error_def:
        g_free(file_stream);
        return ret;
@@ -1820,7 +1828,7 @@ error_def:
 static
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
                struct mmap_stream_list *mmap_list,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
 {
@@ -1851,9 +1859,9 @@ error:
 }
 
 static
-struct trace_descriptor *ctf_open_mmap_trace(
+struct bt_trace_descriptor *ctf_open_mmap_trace(
                struct mmap_stream_list *mmap_list,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence),
                FILE *metadata_fp)
 {
@@ -1883,7 +1891,7 @@ error:
 }
 
 static
-int ctf_convert_index_timestamp(struct trace_descriptor *tdp)
+int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp)
 {
        int i, j, k;
        struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent);
@@ -1951,7 +1959,7 @@ int ctf_close_file_stream(struct ctf_file_stream *file_stream)
 }
 
 static
-int ctf_close_trace(struct trace_descriptor *tdp)
+int ctf_close_trace(struct bt_trace_descriptor *tdp)
 {
        struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent);
        int ret;
@@ -1992,7 +2000,7 @@ int ctf_close_trace(struct trace_descriptor *tdp)
 }
 
 static
-void ctf_set_context(struct trace_descriptor *descriptor,
+void ctf_set_context(struct bt_trace_descriptor *descriptor,
                struct bt_context *ctx)
 {
        struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
@@ -2002,7 +2010,7 @@ void ctf_set_context(struct trace_descriptor *descriptor,
 }
 
 static
-void ctf_set_handle(struct trace_descriptor *descriptor,
+void ctf_set_handle(struct bt_trace_descriptor *descriptor,
                struct bt_trace_handle *handle)
 {
        struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
BabelTrace - Trace Format Babel Tower
This page took 0.031108 seconds and 4 git commands to generate.