summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6ab2209)
Currently, traces generated by lttng have the "absolute" flag set to 0,
because they are based on the monotonic clock, which is not perfectly
correlated across nodes.
Fix a couple of minor issue in the handling of --clock-force-correlate
that now allow to use it to force correlation of traces taken with the
monotonic clock source, with "offset" approximation populated using NTP
time.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
if (ret)
goto error_def;
/*
if (ret)
goto error_def;
/*
- * For now, only a single slock is supported.
+ * For now, only a single clock per trace is supported.
*/
file_stream->parent.current_clock = td->single_clock;
ret = create_stream_packet_index(td, file_stream);
*/
file_stream->parent.current_clock = td->single_clock;
ret = create_stream_packet_index(td, file_stream);
- * For now, only a single slock is supported.
+ * For now, only a single clock per trace is supported.
*/
file_stream->parent.current_clock = td->single_clock;
*/
file_stream->parent.current_clock = td->single_clock;
uint64_t ts_nsec;
struct ctf_trace *trace = stream->stream_class->trace;
struct trace_collection *tc = trace->collection;
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 */
ts_nsec = clock_cycles_to_ns(stream->current_clock, timestamp);
ts_nsec += tc_offset; /* Add offset */
}
if (!CTF_CLOCK_FIELD_IS_SET(clock, name)) {
ret = -EPERM;
}
if (!CTF_CLOCK_FIELD_IS_SET(clock, name)) {
ret = -EPERM;
- fprintf(fd, "[error] %s: missing namefield in clock declaration\n", __func__);
+ fprintf(fd, "[error] %s: missing name field in clock declaration\n", __func__);
goto error;
}
if (g_hash_table_size(trace->clocks) > 0) {
goto error;
}
if (g_hash_table_size(trace->clocks) > 0) {
uint64_t offset_first;
int64_t delta_offset_first_sum;
int offset_nr;
uint64_t offset_first;
int64_t delta_offset_first_sum;
int offset_nr;
+ int clock_use_offset_avg;
};
extern int opt_all_field_names,
};
extern int opt_all_field_names,
struct clock_match *match = user_data;
struct ctf_clock *clock_a = value, *clock_b;
struct clock_match *match = user_data;
struct ctf_clock *clock_a = value, *clock_b;
- if (clock_a->uuid != 0) {
+ if (clock_a->absolute) {
- * Lookup the the trace clocks into the collection
- * clocks.
+ * Absolute time references, such as NTP, are looked up
+ * by clock name.
*/
clock_b = g_hash_table_lookup(match->clocks,
*/
clock_b = g_hash_table_lookup(match->clocks,
- (gpointer) (unsigned long) clock_a->uuid);
+ (gpointer) (unsigned long) clock_a->name);
if (clock_b) {
match->clock_match = clock_b;
return;
}
if (clock_b) {
match->clock_match = clock_b;
return;
}
- } else if (clock_a->absolute) {
+ } else if (clock_a->uuid != 0) {
- * Absolute time references, such as NTP, are looked up
- * by clock name.
+ * Lookup the the trace clocks into the collection
+ * clocks.
*/
clock_b = g_hash_table_lookup(match->clocks,
*/
clock_b = g_hash_table_lookup(match->clocks,
- (gpointer) (unsigned long) clock_a->name);
+ (gpointer) (unsigned long) clock_a->uuid);
if (clock_b) {
match->clock_match = clock_b;
return;
if (clock_b) {
match->clock_match = clock_b;
return;
(gpointer) (unsigned long) v);
if (!tc_clock) {
/*
(gpointer) (unsigned long) v);
if (!tc_clock) {
/*
- * For now, we only support CTF that has one
- * single clock uuid or name (absolute ref).
+ * For now we only support CTF that has one
+ * single clock uuid or name (absolute ref) per
+ * trace.
*/
if (g_hash_table_size(tc_clocks) > 0) {
fprintf(stderr, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n");
*/
if (g_hash_table_size(tc_clocks) > 0) {
fprintf(stderr, "[error] Only CTF traces with a single clock description are supported by this babeltrace version.\n");
g_hash_table_insert(tc_clocks,
(gpointer) (unsigned long) v,
value);
g_hash_table_insert(tc_clocks,
(gpointer) (unsigned long) v,
value);
+ } else if (!t_clock->absolute) {
- * Check that the offsets match. If not, warn
- * the user that we do an arbitrary choice.
+ * For non-absolute clocks, check that the
+ * offsets match. If not, warn the user that we
+ * do an arbitrary choice.
*/
diff_ns = clock_offset_ns(tc_clock) - clock_offset_ns(t_clock);
printf_debug("Clock \"%s\" offset between traces has a delta of %" PRIu64 " ns.",
*/
diff_ns = clock_offset_ns(tc_clock) - clock_offset_ns(t_clock);
printf_debug("Clock \"%s\" offset between traces has a delta of %" PRIu64 " ns.",
clock_match->tc->single_clock_offset_avg =
clock_match->tc->offset_first
+ (clock_match->tc->delta_offset_first_sum / clock_match->tc->offset_nr);
clock_match->tc->single_clock_offset_avg =
clock_match->tc->offset_first
+ (clock_match->tc->delta_offset_first_sum / clock_match->tc->offset_nr);
+ /* Time need to use offset average */
+ clock_match->tc->clock_use_offset_avg = 1;