X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents-private.h;h=6208e563d2315f94994f88c183041bacc8d3d65c;hp=6b3d5a177f3756d9b7436316117de82e11daecd2;hb=75d9ab4b8164f7b2012da916c5b36f1445e9ee09;hpb=03798a93f959f6c694fe98f5647481947607c604 diff --git a/formats/ctf/events-private.h b/formats/ctf/events-private.h index 6b3d5a17..6208e563 100644 --- a/formats/ctf/events-private.h +++ b/formats/ctf/events-private.h @@ -24,21 +24,7 @@ #include #include - -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; -} +#include static inline uint64_t ctf_get_real_timestamp(struct ctf_stream_definition *stream, @@ -49,7 +35,7 @@ uint64_t ctf_get_real_timestamp(struct ctf_stream_definition *stream, struct trace_collection *tc = trace->collection; uint64_t tc_offset = tc->single_clock_offset_avg; - 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; }