X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.c;h=d6ea57d9f6a879d541068bd579630123f5c57b67;hb=7d1ac606018744f051104fc184e581411c52bd3d;hp=da5a1eb6d9bdd1e54895ab6fbc734a7e48fa03f2;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index da5a1eb6..d6ea57d9 100644
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -28,11 +28,11 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "common/common.h"
 #include <babeltrace2/babeltrace.h>
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include <glib.h>
 #include "common/assert.h"
 #include <inttypes.h>
@@ -42,9 +42,17 @@
 #include "data-stream-file.h"
 #include "file.h"
 #include "../common/metadata/decoder.h"
+#include "../common/metadata/ctf-meta-configure-ir-trace.h"
 #include "../common/msg-iter/msg-iter.h"
 #include "query.h"
 
+struct tracer_info {
+	const char *name;
+	int64_t major;
+	int64_t minor;
+	int64_t patch;
+};
+
 static
 int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data)
 {
@@ -260,7 +268,7 @@ bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
 	self_comp = port_data->ctf_fs->self_comp;
 	msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1);
 	if (!msg_iter_data) {
-		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR;
+		ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
 		goto error;
 	}
 
@@ -426,9 +434,9 @@ gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
 
 	/* For the trace, use the uuid if present, else the path. */
 	if (ds_file_group->ctf_fs_trace->metadata->tc->is_uuid_set) {
-		char uuid_str[BABELTRACE_UUID_STR_LEN];
+		char uuid_str[BT_UUID_STR_LEN + 1];
 
-		bt_uuid_unparse(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
+		bt_uuid_to_str(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
 		g_string_assign(name, uuid_str);
 	} else {
 		g_string_assign(name, ds_file_group->ctf_fs_trace->path->str);
@@ -495,9 +503,7 @@ error:
 	ret = -1;
 
 end:
-	if (port_name) {
-		g_free(port_name);
-	}
+	g_free(port_name);
 
 	port_data_destroy(port_data);
 	return ret;
@@ -691,36 +697,6 @@ void ds_file_group_insert_ds_index_entry_sorted(
 	array_insert(ds_file_group->index->entries, entry, i);
 }
 
-/*
- * Create a new ds_file_info using the provided path, begin_ns and index, then
- * add it to ds_file_group's list of ds_file_infos.
- */
-
-static
-int ctf_fs_ds_file_group_add_ds_file_info(
-		struct ctf_fs_ds_file_group *ds_file_group,
-		const char *path, int64_t begin_ns)
-{
-	struct ctf_fs_ds_file_info *ds_file_info;
-	int ret = 0;
-
-	ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns);
-	if (!ds_file_info) {
-		goto error;
-	}
-
-	ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
-
-	ds_file_info = NULL;
-	goto end;
-
-error:
-	ctf_fs_ds_file_info_destroy(ds_file_info);
-	ret = -1;
-end:
-	return ret;
-}
-
 static
 int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		const char *path)
@@ -732,6 +708,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 	int ret;
 	size_t i;
 	struct ctf_fs_ds_file *ds_file = NULL;
+	struct ctf_fs_ds_file_info *ds_file_info = NULL;
 	struct ctf_fs_ds_index *index = NULL;
 	struct bt_msg_iter *msg_iter = NULL;
 	struct ctf_stream_class *sc = NULL;
@@ -779,7 +756,12 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		}
 	}
 
-	index = ctf_fs_ds_file_build_index(ds_file);
+	ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns);
+	if (!ds_file_info) {
+		goto error;
+	}
+
+	index = ctf_fs_ds_file_build_index(ds_file, ds_file_info);
 	if (!index) {
 		BT_COMP_LOGW("Failed to index CTF stream file \'%s\'",
 			ds_file->file->path->str);
@@ -811,11 +793,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 			goto error;
 		}
 
-		ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group,
-			path, begin_ns);
-		if (ret) {
-			goto error;
-		}
+		ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
 
 		add_group = true;
 		goto end;
@@ -850,11 +828,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		add_group = true;
 	}
 
-	ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group, path,
-		begin_ns);
-	if (ret) {
-		goto error;
-	}
+	ds_file_group_insert_ds_file_info_sorted(ds_file_group, ds_file_info);
 
 	goto end;
 
@@ -900,7 +874,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
 	while ((basename = g_dir_read_name(dir))) {
 		struct ctf_fs_file *file;
 
-		if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) {
+		if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) {
 			/* Ignore the metadata stream. */
 			BT_COMP_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`",
 				ctf_fs_trace->path->str, basename);
@@ -980,7 +954,6 @@ int set_trace_name(bt_trace *trace, const char *name_suffix,
 		bt_logging_level log_level, bt_self_component *self_comp)
 {
 	int ret = 0;
-	const bt_trace_class *tc = bt_trace_borrow_class_const(trace);
 	const bt_value *val;
 	GString *name;
 
@@ -995,8 +968,8 @@ int set_trace_name(bt_trace *trace, const char *name_suffix,
 	 * Check if we have a trace environment string value named `hostname`.
 	 * If so, use it as the trace name's prefix.
 	 */
-	val = bt_trace_class_borrow_environment_entry_value_by_name_const(
-		tc, "hostname");
+	val = bt_trace_borrow_environment_entry_value_by_name_const(
+		trace, "hostname");
 	if (val && bt_value_is_string(val)) {
 		g_string_append(name, bt_value_string_get(val));
 
@@ -1077,6 +1050,12 @@ struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component *self_comp,
 	}
 
 	if (ctf_fs_trace->trace) {
+		ret = ctf_trace_class_configure_ir_trace(
+			ctf_fs_trace->metadata->tc, ctf_fs_trace->trace);
+		if (ret) {
+			goto error;
+		}
+
 		ret = set_trace_name(ctf_fs_trace->trace, name, log_level,
 			self_comp);
 		if (ret) {
@@ -1315,6 +1294,9 @@ int ctf_fs_component_create_ctf_fs_traces_one_root(
 	if (!trace_paths) {
 		BT_COMP_LOGE("No CTF traces recursively found in `%s`.",
 			path_param);
+		(void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(
+			ctf_fs->self_comp,
+			"No CTF traces recursively found in `%s`.", path_param);
 		goto error;
 	}
 
@@ -1571,7 +1553,7 @@ int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces)
 	struct ctf_fs_trace *winner;
 	guint i;
 	int ret = 0;
-	char uuid_str[BABELTRACE_UUID_STR_LEN];
+	char uuid_str[BT_UUID_STR_LEN + 1];
 
 	BT_ASSERT(num_traces >= 2);
 
@@ -1617,7 +1599,7 @@ int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces)
 	}
 
 	/* Use the string representation of the UUID as the trace name. */
-	bt_uuid_unparse(winner->metadata->tc->uuid, uuid_str);
+	bt_uuid_to_str(winner->metadata->tc->uuid, uuid_str);
 	g_string_printf(winner->name, "%s", uuid_str);
 
 end:
@@ -1676,7 +1658,7 @@ int merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs)
 
 	/* Clear any NULL slot (traces that got merged in another one) in the array.  */
 	for (i = 0; i < traces->len;) {
-		if (g_ptr_array_index(traces, i) == NULL) {
+		if (!g_ptr_array_index(traces, i)) {
 			g_ptr_array_remove_index_fast(traces, i);
 		} else {
 			i++;
@@ -1689,26 +1671,626 @@ end:
 	return ret;
 }
 
+enum target_event {
+	FIRST_EVENT,
+	LAST_EVENT,
+};
+
+static
+int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
+	struct ctf_clock_class *default_cc,
+	struct ctf_fs_ds_index_entry *index_entry,
+	enum target_event target_event, uint64_t *cs, int64_t *ts_ns)
+{
+	enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK;
+	struct ctf_fs_ds_file *ds_file = NULL;
+	struct bt_msg_iter *msg_iter = NULL;
+	bt_logging_level log_level = ctf_fs_trace->log_level;
+	bt_self_component *self_comp = ctf_fs_trace->self_comp;
+	int ret = 0;
+
+	BT_ASSERT(ctf_fs_trace);
+	BT_ASSERT(ctf_fs_trace->metadata);
+	BT_ASSERT(ctf_fs_trace->metadata->tc);
+
+	msg_iter = bt_msg_iter_create(ctf_fs_trace->metadata->tc,
+		bt_common_get_page_size(log_level) * 8, ctf_fs_ds_file_medops,
+		NULL, log_level, self_comp);
+	if (!msg_iter) {
+		/* bt_msg_iter_create() logs errors. */
+		ret = -1;
+		goto end;
+	}
+
+	BT_ASSERT(index_entry);
+	BT_ASSERT(index_entry->path);
+
+	ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter,
+		NULL, index_entry->path, log_level);
+	if (!ds_file) {
+		BT_LOGE_STR("Failed to create a ctf_fs_ds_file");
+		ret = -1;
+		goto end;
+	}
+
+	/*
+	 * Turn on dry run mode to prevent the creation and usage of Babeltrace
+	 * library objects (bt_field, bt_message_*, etc.).
+	 */
+	bt_msg_iter_set_dry_run(msg_iter, true);
+
+	/* Seek to the beginning of the target packet. */
+	iter_status = bt_msg_iter_seek(ds_file->msg_iter, index_entry->offset);
+	if (iter_status) {
+		/* bt_msg_iter_seek() logs errors. */
+		ret = -1;
+		goto end;
+	}
+
+	switch (target_event) {
+	case FIRST_EVENT:
+		/*
+		 * Start to decode the packet until we reach the end of
+		 * the first event. To extract the first event's clock
+		 * snapshot.
+		 */
+		iter_status = bt_msg_iter_curr_packet_first_event_clock_snapshot(
+			ds_file->msg_iter, cs);
+		break;
+	case LAST_EVENT:
+		/* Decode the packet to extract the last event's clock snapshot. */
+		iter_status = bt_msg_iter_curr_packet_last_event_clock_snapshot(
+			ds_file->msg_iter, cs);
+		break;
+	default:
+		abort();
+	}
+	if (iter_status) {
+		ret = -1;
+		goto end;
+	}
+
+	/* Convert clock snapshot to timestamp. */
+	ret = bt_util_clock_cycles_to_ns_from_origin(*cs,
+		default_cc->frequency, default_cc->offset_seconds,
+		default_cc->offset_cycles, ts_ns);
+	if (ret) {
+		BT_LOGE_STR("Failed to convert clock snapshot to timestamp");
+		goto end;
+	}
+
+end:
+	if (ds_file) {
+		ctf_fs_ds_file_destroy(ds_file);
+	}
+	if (msg_iter) {
+		bt_msg_iter_destroy(msg_iter);
+	}
+
+	return ret;
+}
+
+static
+int decode_packet_first_event_timestamp(struct ctf_fs_trace *ctf_fs_trace,
+	struct ctf_clock_class *default_cc,
+	struct ctf_fs_ds_index_entry *index_entry, uint64_t *cs, int64_t *ts_ns)
+{
+	return decode_clock_snapshot_after_event(ctf_fs_trace, default_cc,
+		index_entry, FIRST_EVENT, cs, ts_ns);
+}
+
+static
+int decode_packet_last_event_timestamp(struct ctf_fs_trace *ctf_fs_trace,
+	struct ctf_clock_class *default_cc,
+	struct ctf_fs_ds_index_entry *index_entry, uint64_t *cs, int64_t *ts_ns)
+{
+	return decode_clock_snapshot_after_event(ctf_fs_trace, default_cc,
+		index_entry, LAST_EVENT, cs, ts_ns);
+}
+
+/*
+ * Fix up packet index entries for lttng's "event-after-packet" bug.
+ * Some buggy lttng tracer versions may emit events with a timestamp that is
+ * larger (after) than the timestamp_end of the their packets.
+ *
+ * To fix up this erroneous data we do the following:
+ *  1. If it's not the stream file's last packet: set the packet index entry's
+ *	end time to the next packet's beginning time.
+ *  2. If it's the stream file's last packet, set the packet index entry's end
+ *	time to the packet's last event's time, if any, or to the packet's
+ *  	beginning time otherwise.
+ *
+ * Known buggy tracer versions:
+ *  - before lttng-ust 2.11.0
+ *  - before lttng-module 2.11.0
+ *  - before lttng-module 2.10.10
+ *  - before lttng-module 2.9.13
+ */
+static
+int fix_index_lttng_event_after_packet_bug(struct ctf_fs_trace *trace)
+{
+	int ret = 0;
+	guint ds_file_group_i;
+	GPtrArray *ds_file_groups = trace->ds_file_groups;
+	bt_logging_level log_level = trace->log_level;
+
+	for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len;
+			ds_file_group_i++) {
+		guint entry_i;
+		struct ctf_clock_class *default_cc;
+		struct ctf_fs_ds_index_entry *last_entry;
+		struct ctf_fs_ds_index *index;
+
+		struct ctf_fs_ds_file_group *ds_file_group =
+			g_ptr_array_index(ds_file_groups, ds_file_group_i);
+
+		BT_ASSERT(ds_file_group);
+		index = ds_file_group->index;
+
+		BT_ASSERT(index);
+		BT_ASSERT(index->entries);
+		BT_ASSERT(index->entries->len > 0);
+
+		/*
+		 * Iterate over all entries but the last one. The last one is
+		 * fixed differently after.
+		 */
+		for (entry_i = 0; entry_i < index->entries->len - 1;
+				entry_i++) {
+			struct ctf_fs_ds_index_entry *curr_entry, *next_entry;
+
+			curr_entry = g_ptr_array_index(index->entries, entry_i);
+			next_entry = g_ptr_array_index(index->entries, entry_i + 1);
+
+			/*
+			 * 1. Set the current index entry `end` timestamp to
+			 * the next index entry `begin` timestamp.
+			 */
+			curr_entry->timestamp_end = next_entry->timestamp_begin;
+			curr_entry->timestamp_end_ns = next_entry->timestamp_begin_ns;
+		}
+
+		/*
+		 * 2. Fix the last entry by decoding the last event of the last
+		 * packet.
+		 */
+		last_entry = g_ptr_array_index(index->entries,
+			index->entries->len - 1);
+		BT_ASSERT(last_entry);
+
+		BT_ASSERT(ds_file_group->sc->default_clock_class);
+		default_cc = ds_file_group->sc->default_clock_class;
+
+		/*
+		 * Decode packet to read the timestamp of the last event of the
+		 * entry.
+		 */
+		ret = decode_packet_last_event_timestamp(trace, default_cc,
+			last_entry, &last_entry->timestamp_end,
+			&last_entry->timestamp_end_ns);
+		if (ret) {
+			BT_LOGE_STR("Failed to decode stream's last packet to get its last event's clock snapshot.");
+			goto end;
+		}
+	}
+
+end:
+	return ret;
+}
+
+/*
+ * Fix up packet index entries for barectf's "event-before-packet" bug.
+ * Some buggy barectf tracer versions may emit events with a timestamp that is
+ * less than the timestamp_begin of the their packets.
+ *
+ * To fix up this erroneous data we do the following:
+ *  1. Starting at the second index entry, set the timestamp_begin of the
+ *     current entry to the timestamp of the first event of the packet.
+ *  2. Set the previous entry's timestamp_end to the timestamp_begin of the
+ *     current packet.
+ *
+ * Known buggy tracer versions:
+ *  - before barectf 2.3.1
+ */
+static
+int fix_index_barectf_event_before_packet_bug(struct ctf_fs_trace *trace)
+{
+	int ret = 0;
+	guint ds_file_group_i;
+	GPtrArray *ds_file_groups = trace->ds_file_groups;
+	bt_logging_level log_level = trace->log_level;
+
+	for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len;
+			ds_file_group_i++) {
+		guint entry_i;
+		struct ctf_clock_class *default_cc;
+		struct ctf_fs_ds_file_group *ds_file_group =
+			g_ptr_array_index(ds_file_groups, ds_file_group_i);
+
+		struct ctf_fs_ds_index *index = ds_file_group->index;
+
+		BT_ASSERT(index);
+		BT_ASSERT(index->entries);
+		BT_ASSERT(index->entries->len > 0);
+
+		BT_ASSERT(ds_file_group->sc->default_clock_class);
+		default_cc = ds_file_group->sc->default_clock_class;
+
+		/*
+		 * 1. Iterate over the index, starting from the second entry
+		 * (index = 1).
+		 */
+		for (entry_i = 1; entry_i < index->entries->len;
+				entry_i++) {
+			struct ctf_fs_ds_index_entry *curr_entry, *prev_entry;
+			prev_entry = g_ptr_array_index(index->entries, entry_i - 1);
+			curr_entry = g_ptr_array_index(index->entries, entry_i);
+			/*
+			 * 2. Set the current entry `begin` timestamp to the
+			 * timestamp of the first event of the current packet.
+			 */
+			ret = decode_packet_first_event_timestamp(trace, default_cc,
+				curr_entry, &curr_entry->timestamp_begin,
+				&curr_entry->timestamp_begin_ns);
+			if (ret) {
+				BT_LOGE_STR("Failed to decode first event's clock snapshot");
+				goto end;
+			}
+
+			/*
+			 * 3. Set the previous entry `end` timestamp to the
+			 * timestamp of the first event of the current packet.
+			 */
+			prev_entry->timestamp_end = curr_entry->timestamp_begin;
+			prev_entry->timestamp_end_ns = curr_entry->timestamp_begin_ns;
+		}
+	}
+end:
+	return ret;
+}
+
+/*
+ * When using the lttng-crash feature it's likely that the last packets of each
+ * stream have their timestamp_end set to zero. This is caused by the fact that
+ * the tracer crashed and was not able to properly close the packets.
+ *
+ * To fix up this erroneous data we do the following:
+ * For each index entry, if the entry's timestamp_end is 0 and the
+ * timestamp_begin is not 0:
+ *  - If it's the stream file's last packet: set the packet index entry's end
+ *    time to the packet's last event's time, if any, or to the packet's
+ *    beginning time otherwise.
+ *  - If it's not the stream file's last packet: set the packet index
+ *    entry's end time to the next packet's beginning time.
+ *
+ * Affected versions:
+ * - All current and future lttng-ust and lttng-modules versions.
+ */
+static
+int fix_index_lttng_crash_quirk(struct ctf_fs_trace *trace)
+{
+	int ret = 0;
+	guint ds_file_group_idx;
+	GPtrArray *ds_file_groups = trace->ds_file_groups;
+	bt_logging_level log_level = trace->log_level;
+
+	for (ds_file_group_idx = 0; ds_file_group_idx < ds_file_groups->len;
+			ds_file_group_idx++) {
+		guint entry_idx;
+		struct ctf_clock_class *default_cc;
+		struct ctf_fs_ds_index_entry *last_entry;
+		struct ctf_fs_ds_index *index;
+
+		struct ctf_fs_ds_file_group *ds_file_group =
+			g_ptr_array_index(ds_file_groups, ds_file_group_idx);
+
+		BT_ASSERT(ds_file_group);
+		index = ds_file_group->index;
+
+		BT_ASSERT(ds_file_group->sc->default_clock_class);
+		default_cc = ds_file_group->sc->default_clock_class;
+
+		BT_ASSERT(index);
+		BT_ASSERT(index->entries);
+		BT_ASSERT(index->entries->len > 0);
+
+		last_entry = g_ptr_array_index(index->entries,
+			index->entries->len - 1);
+		BT_ASSERT(last_entry);
+
+
+		/* 1. Fix the last entry first. */
+		if (last_entry->timestamp_end == 0 &&
+				last_entry->timestamp_begin != 0) {
+			/*
+			 * Decode packet to read the timestamp of the
+			 * last event of the stream file.
+			 */
+			ret = decode_packet_last_event_timestamp(trace,
+				default_cc, last_entry,
+				&last_entry->timestamp_end,
+				&last_entry->timestamp_end_ns);
+			if (ret) {
+				BT_LOGE_STR("Failed to decode last event's clock snapshot");
+				goto end;
+			}
+		}
+
+		/* Iterate over all entries but the last one. */
+		for (entry_idx = 0; entry_idx < index->entries->len - 1;
+				entry_idx++) {
+			struct ctf_fs_ds_index_entry *curr_entry, *next_entry;
+			curr_entry = g_ptr_array_index(index->entries, entry_idx);
+			next_entry = g_ptr_array_index(index->entries, entry_idx + 1);
+
+			if (curr_entry->timestamp_end == 0 &&
+					curr_entry->timestamp_begin != 0) {
+				/*
+				 * 2. Set the current index entry `end` timestamp to
+				 * the next index entry `begin` timestamp.
+				 */
+				curr_entry->timestamp_end = next_entry->timestamp_begin;
+				curr_entry->timestamp_end_ns = next_entry->timestamp_begin_ns;
+			}
+		}
+	}
+
+end:
+	return ret;
+}
+
+/*
+ * Extract the tracer information necessary to compare versions.
+ * Returns 0 on success, and -1 if the extraction is not successful because the
+ * necessary fields are absents in the trace metadata.
+ */
+static
+int extract_tracer_info(struct ctf_fs_trace *trace,
+		struct tracer_info *current_tracer_info)
+{
+	int ret = 0;
+	struct ctf_trace_class_env_entry *entry;
+
+	/* Clear the current_tracer_info struct */
+	memset(current_tracer_info, 0, sizeof(*current_tracer_info));
+
+	/*
+	 * To compare 2 tracer versions, at least the tracer name and it's
+	 * major version are needed. If one of these is missing, consider it an
+	 * extraction failure.
+	 */
+	entry = ctf_trace_class_borrow_env_entry_by_name(
+		trace->metadata->tc, "tracer_name");
+	if (!entry || entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR) {
+		goto missing_bare_minimum;
+	}
+
+	/* Set tracer name. */
+	current_tracer_info->name = entry->value.str->str;
+
+	entry = ctf_trace_class_borrow_env_entry_by_name(
+		trace->metadata->tc, "tracer_major");
+	if (!entry || entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT) {
+		goto missing_bare_minimum;
+	}
+
+	/* Set major version number. */
+	current_tracer_info->major = entry->value.i;
+
+	entry = ctf_trace_class_borrow_env_entry_by_name(
+		trace->metadata->tc, "tracer_minor");
+	if (!entry || entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT) {
+		goto end;
+	}
+
+	/* Set minor version number. */
+	current_tracer_info->minor = entry->value.i;
+
+	entry = ctf_trace_class_borrow_env_entry_by_name(
+		trace->metadata->tc, "tracer_patch");
+	if (!entry) {
+		/*
+		 * If `tracer_patch` doesn't exist `tracer_patchlevel` might.
+		 * For example, `lttng-modules` uses entry name
+		 * `tracer_patchlevel`.
+		 */
+		entry = ctf_trace_class_borrow_env_entry_by_name(
+			trace->metadata->tc, "tracer_patchlevel");
+	}
+
+	if (!entry || entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT) {
+		goto end;
+	}
+
+	/* Set patch version number. */
+	current_tracer_info->patch = entry->value.i;
+
+	goto end;
+
+missing_bare_minimum:
+	ret = -1;
+end:
+	return ret;
+}
+
+static
+bool is_tracer_affected_by_lttng_event_after_packet_bug(
+		struct tracer_info *curr_tracer_info)
+{
+	bool is_affected = false;
+
+	if (strcmp(curr_tracer_info->name, "lttng-ust") == 0) {
+		if (curr_tracer_info->major < 2) {
+			is_affected = true;
+		} else if (curr_tracer_info->major == 2) {
+			/* fixed in lttng-ust 2.11.0 */
+			if (curr_tracer_info->minor < 11) {
+				is_affected = true;
+			}
+		}
+	} else if (strcmp(curr_tracer_info->name, "lttng-modules") == 0) {
+		if (curr_tracer_info->major < 2) {
+			is_affected = true;
+		} else if (curr_tracer_info->major == 2) {
+			/* fixed in lttng-modules 2.11.0 */
+			if (curr_tracer_info->minor == 10) {
+				/* fixed in lttng-modules 2.10.10 */
+				if (curr_tracer_info->patch < 10) {
+					is_affected = true;
+				}
+			} else if (curr_tracer_info->minor == 9) {
+				/* fixed in lttng-modules 2.9.13 */
+				if (curr_tracer_info->patch < 13) {
+					is_affected = true;
+				}
+			} else if (curr_tracer_info->minor < 9) {
+				is_affected = true;
+			}
+		}
+	}
+
+	return is_affected;
+}
+
+static
+bool is_tracer_affected_by_barectf_event_before_packet_bug(
+		struct tracer_info *curr_tracer_info)
+{
+	bool is_affected = false;
+
+	if (strcmp(curr_tracer_info->name, "barectf") == 0) {
+		if (curr_tracer_info->major < 2) {
+			is_affected = true;
+		} else if (curr_tracer_info->major == 2) {
+			if (curr_tracer_info->minor < 3) {
+				is_affected = true;
+			} else if (curr_tracer_info->minor == 3) {
+				/* fixed in barectf 2.3.1 */
+				if (curr_tracer_info->patch < 1) {
+					is_affected = true;
+				}
+			}
+		}
+	}
+
+	return is_affected;
+}
+
+static
+bool is_tracer_affected_by_lttng_crash_quirk(
+		struct tracer_info *curr_tracer_info)
+{
+	bool is_affected = false;
+
+	/* All LTTng tracer may be affected by this lttng crash quirk. */
+	if (strcmp(curr_tracer_info->name, "lttng-ust") == 0) {
+		is_affected = true;
+	} else if (strcmp(curr_tracer_info->name, "lttng-modules") == 0) {
+		is_affected = true;
+	}
+
+	return is_affected;
+}
+
+/*
+ * Looks for trace produced by known buggy tracers and fix up the index
+ * produced earlier.
+ */
+static
+int fix_packet_index_tracer_bugs(struct ctf_fs_component *ctf_fs)
+{
+	int ret = 0;
+	guint trace_i;
+	struct tracer_info current_tracer_info;
+	GPtrArray *traces = ctf_fs->traces;
+	bt_logging_level log_level = ctf_fs->log_level;
+
+	/*
+	 * Iterate over all the traces of this component and check for
+	 * possible indexing bugs.
+	 */
+	for (trace_i = 0; trace_i < traces->len; trace_i++) {
+		struct ctf_fs_trace *trace = g_ptr_array_index(traces,
+			trace_i);
+
+		ret = extract_tracer_info(trace, &current_tracer_info);
+		if (ret) {
+			/*
+			 * A trace may not have all the necessary environment
+			 * entries to do the tracer version comparison.
+			 * At least, the tracer name and major version number
+			 * are needed. Failing to extract these entries is not
+			 * an error.
+			 */
+			ret = 0;
+			BT_LOGI_STR("Cannot extract tracer information necessary to compare with buggy versions.");
+			continue;
+		}
+
+		/* Check if the trace may be affected by old tracer bugs. */
+		if (is_tracer_affected_by_lttng_event_after_packet_bug(
+				&current_tracer_info)) {
+			BT_LOGI_STR("Trace may be affected by LTTng tracer packet timestamp bug. Fixing up.");
+			ret = fix_index_lttng_event_after_packet_bug(trace);
+			if (ret) {
+				BT_LOGE_STR("Failed to fix LTTng event-after-packet bug.");
+				goto end;
+			}
+			trace->metadata->tc->quirks.lttng_event_after_packet = true;
+		}
+
+		if (is_tracer_affected_by_barectf_event_before_packet_bug(
+				&current_tracer_info)) {
+			BT_LOGI_STR("Trace may be affected by barectf tracer packet timestamp bug. Fixing up.");
+			ret = fix_index_barectf_event_before_packet_bug(trace);
+			if (ret) {
+				BT_LOGE_STR("Failed to fix barectf event-before-packet bug.");
+				goto end;
+			}
+		}
+
+		if (is_tracer_affected_by_lttng_crash_quirk(
+				&current_tracer_info)) {
+			ret = fix_index_lttng_crash_quirk(trace);
+			if (ret) {
+				BT_LOGE_STR("Failed to fix lttng-crash timestamp quirks.");
+				goto end;
+			}
+			trace->metadata->tc->quirks.lttng_crash = true;
+		}
+	}
+end:
+	return ret;
+}
+
 int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp,
 		struct ctf_fs_component *ctf_fs,
 		const bt_value *paths_value)
 {
 	int ret = 0;
 	uint64_t i;
+	bt_logging_level log_level = ctf_fs->log_level;
 
-	for (i = 0; i < bt_value_array_get_size(paths_value); i++) {
+	for (i = 0; i < bt_value_array_get_length(paths_value); i++) {
 		const bt_value *path_value = bt_value_array_borrow_element_by_index_const(paths_value, i);
-		const char *path = bt_value_string_get(path_value);
+		const char *input = bt_value_string_get(path_value);
 
 		ret = ctf_fs_component_create_ctf_fs_traces_one_root(ctf_fs,
-			path);
+			input);
 		if (ret) {
 			goto end;
 		}
 	}
 
 	ret = merge_traces_with_same_uuid(ctf_fs);
+	if (ret) {
+		BT_LOGE_STR("Failed to merge traces with the same UUID.");
+	}
 
+	ret = fix_packet_index_tracer_bugs(ctf_fs);
+	if (ret) {
+		BT_LOGE_STR("Failed to fix packet index tracer bugs.");
+	}
 end:
 	return ret;
 }
@@ -1819,8 +2401,8 @@ end:
  */
 
 static
-bool validate_paths_parameter(struct ctf_fs_component *ctf_fs,
-		const bt_value *paths)
+bool validate_inputs_parameter(struct ctf_fs_component *ctf_fs,
+		const bt_value *inputs)
 {
 	bool ret;
 	bt_value_type type;
@@ -1828,25 +2410,25 @@ bool validate_paths_parameter(struct ctf_fs_component *ctf_fs,
 	bt_logging_level log_level = ctf_fs->log_level;
 	bt_self_component *self_comp = ctf_fs->self_comp;
 
-	if (!paths) {
-		BT_COMP_LOGE("missing \"paths\" parameter");
+	if (!inputs) {
+		BT_COMP_LOGE("missing \"inputs\" parameter");
 		goto error;
 	}
 
-	type = bt_value_get_type(paths);
+	type = bt_value_get_type(inputs);
 	if (type != BT_VALUE_TYPE_ARRAY) {
-		BT_COMP_LOGE("`paths` parameter: expecting array value: type=%s",
+		BT_COMP_LOGE("`inputs` parameter: expecting array value: type=%s",
 			bt_common_value_type_string(type));
 		goto error;
 	}
 
-	for (i = 0; i < bt_value_array_get_size(paths); i++) {
+	for (i = 0; i < bt_value_array_get_length(inputs); i++) {
 		const bt_value *elem;
 
-		elem = bt_value_array_borrow_element_by_index_const(paths, i);
+		elem = bt_value_array_borrow_element_by_index_const(inputs, i);
 		type = bt_value_get_type(elem);
 		if (type != BT_VALUE_TYPE_STRING) {
-			BT_COMP_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s",
+			BT_COMP_LOGE("`inputs` parameter: expecting string value: index=%" PRIu64 ", type=%s",
 				i, bt_common_value_type_string(type));
 			goto error;
 		}
@@ -1863,15 +2445,15 @@ end:
 }
 
 bool read_src_fs_parameters(const bt_value *params,
-		const bt_value **paths, struct ctf_fs_component *ctf_fs) {
+		const bt_value **inputs, struct ctf_fs_component *ctf_fs) {
 	bool ret;
 	const bt_value *value;
 	bt_logging_level log_level = ctf_fs->log_level;
 	bt_self_component *self_comp = ctf_fs->self_comp;
 
-	/* paths parameter */
-	*paths = bt_value_map_borrow_entry_value_const(params, "paths");
-	if (!validate_paths_parameter(ctf_fs, *paths)) {
+	/* inputs parameter */
+	*inputs = bt_value_map_borrow_entry_value_const(params, "inputs");
+	if (!validate_inputs_parameter(ctf_fs, *inputs)) {
 		goto error;
 	}
 
@@ -1884,7 +2466,7 @@ bool read_src_fs_parameters(const bt_value *params,
 			goto error;
 		}
 		ctf_fs->metadata_config.clock_class_offset_s =
-			bt_value_signed_integer_get(value);
+			bt_value_integer_signed_get(value);
 	}
 
 	/* clock-class-offset-ns parameter */
@@ -1896,7 +2478,7 @@ bool read_src_fs_parameters(const bt_value *params,
 			goto error;
 		}
 		ctf_fs->metadata_config.clock_class_offset_ns =
-			bt_value_signed_integer_get(value);
+			bt_value_integer_signed_get(value);
 	}
 
 
@@ -1917,7 +2499,7 @@ struct ctf_fs_component *ctf_fs_create(
 {
 	struct ctf_fs_component *ctf_fs = NULL;
 	guint i;
-	const bt_value *paths_value;
+	const bt_value *inputs_value;
 	bt_self_component *self_comp =
 		bt_self_component_source_as_self_component(self_comp_src);
 
@@ -1927,7 +2509,7 @@ struct ctf_fs_component *ctf_fs_create(
 		goto error;
 	}
 
-	if (!read_src_fs_parameters(params, &paths_value, ctf_fs)) {
+	if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) {
 		goto error;
 	}
 
@@ -1935,7 +2517,7 @@ struct ctf_fs_component *ctf_fs_create(
 	ctf_fs->self_comp = self_comp;
 	ctf_fs->self_comp_src = self_comp_src;
 
-	if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, paths_value)) {
+	if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, inputs_value)) {
 		goto error;
 	}
 
@@ -1982,23 +2564,28 @@ bt_component_class_init_method_status ctf_fs_init(
 BT_HIDDEN
 bt_component_class_query_method_status ctf_fs_query(
 		bt_self_component_class_source *comp_class,
-		const bt_query_executor *query_exec,
+		bt_private_query_executor *priv_query_exec,
 		const char *object, const bt_value *params,
-		bt_logging_level log_level,
+		__attribute__((unused)) void *method_data,
 		const bt_value **result)
 {
 	bt_component_class_query_method_status status =
 		BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+	bt_logging_level log_level = bt_query_executor_get_logging_level(
+		bt_private_query_executor_as_query_executor_const(
+			priv_query_exec));
 
-	if (!strcmp(object, "metadata-info")) {
+	if (strcmp(object, "metadata-info") == 0) {
 		status = metadata_info_query(comp_class, params, log_level,
 			result);
-	} else if (!strcmp(object, "trace-info")) {
+	} else if (strcmp(object, "babeltrace.trace-info") == 0) {
 		status = trace_info_query(comp_class, params, log_level,
 			result);
+	} else if (!strcmp(object, "babeltrace.support-info")) {
+		status = support_info_query(comp_class, params, log_level, result);
 	} else {
 		BT_LOGE("Unknown query object `%s`", object);
-		status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_OBJECT;
+		status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_UNKNOWN_OBJECT;
 		goto end;
 	}
 end: