X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents-private.h;h=a3caf7aed9092796e2e79e95b999a678c5d45baf;hp=4ea19be583d55fb9b02849b4e3a00cb504045eae;hb=50052405724a3b901b258c00beb424751c579217;hpb=9e88d150c4119a0c6d6288cad6d6db87df7bac4b

diff --git a/formats/ctf/events-private.h b/formats/ctf/events-private.h
index 4ea19be5..a3caf7ae 100644
--- a/formats/ctf/events-private.h
+++ b/formats/ctf/events-private.h
@@ -24,32 +24,23 @@
 
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/ctf-ir/metadata.h>
+#include <babeltrace/clock-internal.h>
 
 static inline
-uint64_t ctf_get_timestamp_raw(struct ctf_stream_definition *stream,
-			uint64_t timestamp)
-{
-	uint64_t ts_nsec;
-
-	if (stream->current_clock->freq == 1000000000ULL) {
-		ts_nsec = timestamp;
-	} else {
-		ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0
-				/ (double) stream->current_clock->freq);
-	}
-	return ts_nsec;
-}
-
-static inline
-uint64_t ctf_get_timestamp(struct ctf_stream_definition *stream,
+uint64_t ctf_get_real_timestamp(struct ctf_stream_definition *stream,
 			uint64_t timestamp)
 {
 	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 = ctf_get_timestamp_raw(stream, timestamp);
+	ts_nsec = clock_cycles_to_ns(stream->current_clock, timestamp);
 	ts_nsec += tc_offset;	/* Add offset */
 	return ts_nsec;
 }