Move clock to bt_trace_descriptor

[babeltrace.git] / lib / trace-collection.c

diff --git a/lib/trace-collection.c b/lib/trace-collection.c
index fc06dcd961c36aa3af3d723dae8fd85d20dfbfda..b854c97440422b009ce12111d54f136f94431515 100644 (file)
--- a/lib/trace-collection.c
+++ b/lib/trace-collection.c
@@ -156,17 +156,11 @@ static void clock_add(gpointer key, gpointer value, gpointer user_data)
  * convert the index from cycles to real time.
  */
 int bt_trace_collection_add(struct trace_collection *tc,
-                               struct trace_descriptor *td)
+                       struct bt_trace_descriptor *trace)
 {
-       struct ctf_trace *trace;
-
-       if (!tc || !td)
+       if (!tc || !trace)
                return -EINVAL;
 
-       trace = container_of(td, struct ctf_trace, parent);
-       g_ptr_array_add(tc->array, td);
-       trace->collection = tc;
-
        if (tc->array->len > 1) {
                struct clock_match clock_match = {
                        .clocks = tc->clocks,
@@ -187,6 +181,9 @@ int bt_trace_collection_add(struct trace_collection *tc,
                }
        }
 
+       g_ptr_array_add(tc->array, trace);
+       trace->collection = tc;
+
        {
                struct clock_match clock_match = {
                        .clocks = tc->clocks,
@@ -209,7 +206,7 @@ error:
 }
 
 int bt_trace_collection_remove(struct trace_collection *tc,
-                           struct trace_descriptor *td)
+                           struct bt_trace_descriptor *td)
 {
        if (!tc || !td)
                return -EINVAL;