libctf_la_SOURCES = \
ctf.c \
events.c \
- callbacks.c
+ callbacks.c \
+ events-private.h
libctf_la_LIBADD = \
types/libctf-types.la \
#include "metadata/ctf-scanner.h"
#include "metadata/ctf-parser.h"
#include "metadata/ctf-ast.h"
+#include "events-private.h"
/*
* We currently simply map a page to read the packet header and packet
uint64_t timestamp)
{
uint64_t ts_sec = 0, 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;
- if (stream->current_clock->freq == 1000000000ULL) {
- ts_nsec = timestamp;
+ if (opt_clock_raw) {
+ ts_nsec = ctf_get_timestamp_raw(stream, timestamp);
} else {
- ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0
- / (double) stream->current_clock->freq);
+ ts_nsec = ctf_get_timestamp(stream, timestamp);
}
- /* Add offsets */
- if (!opt_clock_raw) {
- ts_nsec += tc_offset;
- }
+ /* Add command-line offset */
ts_sec += opt_clock_offset;
ts_sec += ts_nsec / NSEC_PER_SEC;
--- /dev/null
+#ifndef _CTF_EVENTS_PRIVATE_H
+#define _CTF_EVENTS_PRIVATE_H
+
+/*
+ * ctf/events-private.h
+ *
+ * Babeltrace Library
+ *
+ * Copyright 2011-2012 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Julien Desfossez <julien.desfossez@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+
+#include <babeltrace/ctf/events.h>
+#include <babeltrace/ctf-ir/metadata.h>
+
+static inline
+uint64_t ctf_get_timestamp_raw(struct ctf_stream *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 *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;
+
+ ts_nsec = ctf_get_timestamp_raw(stream, timestamp);
+ ts_nsec += tc_offset; /* Add offset */
+ return ts_nsec;
+}
+
+#endif /* _CTF_EVENTS_PRIVATE_H */
#include <babeltrace/ctf/metadata.h>
#include <glib.h>
+#include "events-private.h"
+
/*
* thread local storage to store the last error that occured
* while reading a field, this variable must be accessed by
uint64_t bt_ctf_get_timestamp_raw(struct bt_ctf_event *event)
{
if (event && event->stream->has_timestamp)
- return event->stream->timestamp;
+ return ctf_get_timestamp_raw(event->stream,
+ event->stream->timestamp);
else
return -1ULL;
}
uint64_t bt_ctf_get_timestamp(struct bt_ctf_event *event)
{
- uint64_t ts_nsec;
- struct ctf_trace *trace;
- struct trace_collection *tc;
- uint64_t tc_offset;
- uint64_t timestamp;
-
- if (!event->stream->has_timestamp) {
+ if (event && event->stream->has_timestamp)
+ return ctf_get_timestamp(event->stream,
+ event->stream->timestamp);
+ else
return -1ULL;
- }
-
- trace = event->stream->stream_class->trace;
- tc = trace->collection;
- tc_offset = tc->single_clock_offset_avg;
- timestamp = event->stream->timestamp;
- if (event->stream->current_clock->freq == 1000000000ULL) {
- ts_nsec = timestamp;
- } else {
- ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0
- / (double) event->stream->current_clock->freq);
- }
- ts_nsec += tc_offset;
-
- return ts_nsec;
}
static void bt_ctf_field_set_error(int error)