Fix: offset_s and CTF clocks with frequency != 1GHz

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

diff --git a/formats/ctf/events-private.h b/formats/ctf/events-private.h
index 6208e563d2315f94994f88c183041bacc8d3d65c..9bea75d4f6bad5a2895204bbb08c4fe17d3a9d9d 100644 (file)
--- a/formats/ctf/events-private.h
+++ b/formats/ctf/events-private.h
@@ -20,6 +20,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf/events.h>
@@ -32,8 +40,13 @@ 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;
+       struct trace_collection *tc = trace->parent.collection;
+       uint64_t tc_offset;
+
+       if (tc->clock_use_offset_avg)
+               tc_offset = tc->single_clock_offset_avg;
+       else
+               tc_offset = clock_offset_ns(trace->parent.single_clock);
 
        ts_nsec = clock_cycles_to_ns(stream->current_clock, timestamp);
        ts_nsec += tc_offset;   /* Add offset */