ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

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

diff --git a/lib/trace-collection.c b/lib/trace-collection.c
index 6743ce6ba7467ef8c21daeea02d81b8073e9b632..213ece5c07c2f85c40b36e5f7d95baa8cc5da050 100644 (file)
--- a/lib/trace-collection.c
+++ b/lib/trace-collection.c
@@ -53,7 +53,7 @@ static void check_clock_match(gpointer key, gpointer value, gpointer user_data)
                 * by clock name.
                 */
                clock_b = g_hash_table_lookup(match->clocks,
-                       (gpointer) (unsigned long) clock_a->name);
+                       GUINT_TO_POINTER(clock_a->name));
                if (clock_b) {
                        match->clock_match = clock_b;
                        return;
@@ -64,7 +64,7 @@ static void check_clock_match(gpointer key, gpointer value, gpointer user_data)
                 * clocks.
                 */
                clock_b = g_hash_table_lookup(match->clocks,
-                       (gpointer) (unsigned long) clock_a->uuid);
+                       GUINT_TO_POINTER(clock_a->uuid));
                if (clock_b) {
                        match->clock_match = clock_b;
                        return;
@@ -72,19 +72,6 @@ static void check_clock_match(gpointer key, gpointer value, gpointer user_data)
        }
 }
 
-/*
- * Note: if using a frequency different from 1GHz for clock->offset, it
- * is recommended to express the seconds in offset_s, otherwise there
- * will be a loss of precision caused by the limited size of the double
- * mantissa.
- */
-static
-uint64_t clock_offset_ns(struct ctf_clock *clock)
-{
-       return clock->offset_s * 1000000000ULL
-                       + clock_cycles_to_ns(clock, clock->offset);
-}
-
 static void clock_add(gpointer key, gpointer value, gpointer user_data)
 {
        struct clock_match *clock_match = user_data;
@@ -100,7 +87,7 @@ static void clock_add(gpointer key, gpointer value, gpointer user_data)
                struct ctf_clock *tc_clock;
 
                tc_clock = g_hash_table_lookup(tc_clocks,
-                               (gpointer) (unsigned long) v);
+                               GUINT_TO_POINTER(v));
                if (!tc_clock) {
                        /*
                         * For now we only support CTF that has one
@@ -118,7 +105,7 @@ static void clock_add(gpointer key, gpointer value, gpointer user_data)
                                        clock_match->tc->offset_first;
                        }
                        g_hash_table_insert(tc_clocks,
-                               (gpointer) (unsigned long) v,
+                               GUINT_TO_POINTER(v),
                                value);
                } else if (!t_clock->absolute) {
                        int64_t diff_ns;
@@ -156,14 +143,13 @@ 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 bt_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);
+       if (!trace->clocks)
+               return 0;
 
        if (tc->array->len > 1) {
                struct clock_match clock_match = {
@@ -185,8 +171,8 @@ int bt_trace_collection_add(struct trace_collection *tc,
                }
        }
 
-       g_ptr_array_add(tc->array, td);
-       trace->parent.collection = tc;
+       g_ptr_array_add(tc->array, trace);
+       trace->collection = tc;
 
        {
                struct clock_match clock_match = {