Move bt_handle to bt_trace_descriptor

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index d24f1cb73e69433736cf007a004550621c28d05a..ddde54521115c2796bd695e9253b07eb45ce5ac0 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -2103,7 +2103,7 @@ void ctf_set_handle(struct bt_trace_descriptor *descriptor,
        struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
                        parent);
 
-       td->handle = handle;
+       td->parent.handle = handle;
 }
 
 static

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 1c4813da88147f51a00491913c03c90d47c7488f..3de5131d8433fed590a980384bf2688543750af9 100644 (file)
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -309,8 +309,8 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
        cfs = container_of(event->stream, const struct ctf_file_stream,
                        parent);
        trace = cfs->parent.stream_class->trace;
-       if (trace->handle)
-               ret = trace->handle->id;
+       if (trace->parent.handle)
+               ret = trace->parent.handle->id;
 
        return ret;
 }

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 482a8f0203795918e164b6381a62d3a26627ed09..4fa5c0bee03548e9f453787edceff9d4bdbb1dc5 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -217,8 +217,6 @@ struct ctf_trace {
 
        /* Heap of streams, ordered to always get the lowest timestamp */
        struct ptr_heap *stream_heap;
-
-       struct bt_trace_handle *handle;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \

diff --git a/include/babeltrace/format-internal.h b/include/babeltrace/format-internal.h
index a6509389faf06052de75de767db213a25b571915..589b68a3b5c2e5978540aa31905263709f5b0cdb 100644 (file)
--- a/include/babeltrace/format-internal.h
+++ b/include/babeltrace/format-internal.h
@@ -40,6 +40,7 @@ extern "C" {
 struct bt_trace_descriptor {
        char path[PATH_MAX];            /* trace path */
        struct bt_context *ctx;
+       struct bt_trace_handle *handle;
 };
 
 #ifdef __cplusplus