Fix: --clock-force-correlate to handle trace collections gathered from various nodes

[babeltrace.git] / formats / ctf / events-private.h

diff --git a/formats/ctf/events-private.h b/formats/ctf/events-private.h
index 6208e563d2315f94994f88c183041bacc8d3d65c..a3caf7aed9092796e2e79e95b999a678c5d45baf 100644 (file)
--- a/formats/ctf/events-private.h
+++ b/formats/ctf/events-private.h
@@ -33,7 +33,12 @@ uint64_t ctf_get_real_timestamp(struct ctf_stream_definition *stream,
        uint64_t ts_nsec;
        struct ctf_trace *trace = stream->stream_class->trace;
        struct trace_collection *tc = trace->collection;
-       uint64_t tc_offset = tc->single_clock_offset_avg;
+       uint64_t tc_offset;
+
+       if (tc->clock_use_offset_avg)
+               tc_offset = tc->single_clock_offset_avg;
+       else
+               tc_offset = trace->single_clock->offset;
 
        ts_nsec = clock_cycles_to_ns(stream->current_clock, timestamp);
        ts_nsec += tc_offset;   /* Add offset */