* Babeltrace CTF file system Reader Component
*/
+#include <sstream>
+
#include <glib.h>
-#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/assert.h"
#include "common/common.h"
#include "common/uuid.h"
+#include "cpp-common/bt2c/glib-up.hpp"
#include "cpp-common/bt2s/make-unique.hpp"
#include "plugins/common/param-validation/param-validation.h"
int64_t patch;
};
-static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_data)
-{
- if (!msg_iter_data) {
- return;
- }
-
- if (msg_iter_data->msg_iter) {
- ctf_msg_iter_destroy(msg_iter_data->msg_iter);
- }
-
- if (msg_iter_data->msg_iter_medops_data) {
- ctf_fs_ds_group_medops_data_destroy(msg_iter_data->msg_iter_medops_data);
- }
-
- delete msg_iter_data;
-}
-
static bt_message_iterator_class_next_method_status
ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
{
bt_message_iterator_class_next_method_status status;
- enum ctf_msg_iter_status msg_iter_status;
-
- msg_iter_status = ctf_msg_iter_get_next_message(msg_iter_data->msg_iter, out_msg);
+ const auto msg_iter_status =
+ ctf_msg_iter_get_next_message(msg_iter_data->msg_iter.get(), out_msg);
switch (msg_iter_status) {
case CTF_MSG_ITER_STATUS_OK:
uint64_t capacity, uint64_t *count)
{
try {
- bt_message_iterator_class_next_method_status status;
struct ctf_fs_msg_iter_data *msg_iter_data =
(struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(iterator);
uint64_t i = 0;
* it now.
*/
BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(msg_iter_data->next_saved_error);
- status = msg_iter_data->next_saved_status;
- goto end;
+ return msg_iter_data->next_saved_status;
}
+ bt_message_iterator_class_next_method_status status;
+
do {
status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]);
if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
}
-end:
return status;
return status;
} catch (const std::bad_alloc&) {
BT_ASSERT(msg_iter_data);
- ctf_msg_iter_reset(msg_iter_data->msg_iter);
- ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data);
+ ctf_msg_iter_reset(msg_iter_data->msg_iter.get());
+ ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data.get());
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK;
} catch (const std::bad_alloc&) {
void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
{
- ctf_fs_msg_iter_data_destroy(
- (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it));
+ ctf_fs_msg_iter_data::UP {
+ (static_cast<ctf_fs_msg_iter_data *>(bt_self_message_iterator_get_data(it)))};
}
static bt_message_iterator_class_initialize_method_status
{
try {
struct ctf_fs_port_data *port_data;
- bt_message_iterator_class_initialize_method_status status;
enum ctf_msg_iter_medium_status medium_status;
port_data = (struct ctf_fs_port_data *) bt_self_component_port_get_data(
bt_self_component_port_output_as_self_component_port(self_port));
BT_ASSERT(port_data);
- ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter};
+ auto msg_iter_data = bt2s::make_unique<ctf_fs_msg_iter_data>(self_msg_iter);
msg_iter_data->ds_file_group = port_data->ds_file_group;
medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
self_msg_iter, msg_iter_data->logger,
- &msg_iter_data->msg_iter_medops_data);
+ msg_iter_data->msg_iter_medops_data);
BT_ASSERT(medium_status == CTF_MSG_ITER_MEDIUM_STATUS_OK ||
medium_status == CTF_MSG_ITER_MEDIUM_STATUS_ERROR ||
medium_status == CTF_MSG_ITER_MEDIUM_STATUS_MEMORY_ERROR);
if (medium_status != CTF_MSG_ITER_MEDIUM_STATUS_OK) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger,
"Failed to create ctf_fs_ds_group_medops");
- status = ctf_msg_iter_medium_status_to_msg_iter_initialize_status(medium_status);
- goto error;
+ return ctf_msg_iter_medium_status_to_msg_iter_initialize_status(medium_status);
}
msg_iter_data->msg_iter = ctf_msg_iter_create(
msg_iter_data->ds_file_group->ctf_fs_trace->metadata->tc,
bt_common_get_page_size(static_cast<int>(msg_iter_data->logger.level())) * 8,
- ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data, self_msg_iter,
+ ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data.get(), self_msg_iter,
msg_iter_data->logger);
if (!msg_iter_data->msg_iter) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger,
"Cannot create a CTF message iterator.");
- status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
- goto error;
+ return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
}
/*
bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
}
- bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data);
- msg_iter_data = NULL;
-
- status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
- goto end;
-
-error:
- bt_self_message_iterator_set_data(self_msg_iter, NULL);
+ bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
-end:
- ctf_fs_msg_iter_data_destroy(msg_iter_data);
- return status;
+ return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
} catch (const bt2::Error&) {
}
}
-static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
-{
- if (!ctf_fs_trace) {
- return;
- }
-
- BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace);
-
- if (ctf_fs_trace->path) {
- g_string_free(ctf_fs_trace->path, TRUE);
- }
-
- if (ctf_fs_trace->metadata) {
- ctf_fs_metadata_fini(ctf_fs_trace->metadata);
- delete ctf_fs_trace->metadata;
- }
-
- delete ctf_fs_trace;
-}
-
-void ctf_fs_trace_deleter::operator()(ctf_fs_trace * const trace) noexcept
-{
- ctf_fs_trace_destroy(trace);
-}
-
-void ctf_fs_destroy(struct ctf_fs_component *ctf_fs)
-{
- if (!ctf_fs) {
- return;
- }
-
- delete ctf_fs;
-}
-
-void ctf_fs_component_deleter::operator()(ctf_fs_component *comp)
-{
- ctf_fs_destroy(comp);
-}
-
-ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
-{
- return ctf_fs_component::UP {new ctf_fs_component {parentLogger}};
-}
-
void ctf_fs_finalize(bt_self_component_source *component)
{
- ctf_fs_destroy((struct ctf_fs_component *) bt_self_component_get_data(
- bt_self_component_source_as_self_component(component)));
+ ctf_fs_component::UP {static_cast<ctf_fs_component *>(
+ bt_self_component_get_data(bt_self_component_source_as_self_component(component)))};
}
-bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
+std::string ctf_fs_make_port_name(ctf_fs_ds_file_group *ds_file_group)
{
- GString *name = g_string_new(NULL);
+ std::stringstream name;
/*
* The unique port name is generated by concatenating unique identifiers
char uuid_str[BT_UUID_STR_LEN + 1];
bt_uuid_to_str(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
- g_string_assign(name, uuid_str);
+ name << uuid_str;
} else {
- g_string_assign(name, ds_file_group->ctf_fs_trace->path->str);
+ name << ds_file_group->ctf_fs_trace->path;
}
/*
* otherwise, as there will only be a single stream class.
*/
if (ds_file_group->sc->id != UINT64_C(-1)) {
- g_string_append_printf(name, " | %" PRIu64, ds_file_group->sc->id);
+ name << " | " << ds_file_group->sc->id;
}
/* For the stream, use the id if present, else, use the path. */
if (ds_file_group->stream_id != UINT64_C(-1)) {
- g_string_append_printf(name, " | %" PRIu64, ds_file_group->stream_id);
+ name << " | " << ds_file_group->stream_id;
} else {
- BT_ASSERT(ds_file_group->ds_file_infos->len == 1);
- struct ctf_fs_ds_file_info *ds_file_info =
- (struct ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, 0);
- g_string_append_printf(name, " | %s", ds_file_info->path.c_str());
+ BT_ASSERT(ds_file_group->ds_file_infos.size() == 1);
+ const auto& ds_file_info = *ds_file_group->ds_file_infos[0];
+ name << " | " << ds_file_info.path;
}
- return bt2c::GCharUP {g_string_free(name, FALSE)};
+ return name.str();
}
static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
struct ctf_fs_ds_file_group *ds_file_group,
bt_self_component_source *self_comp_src)
{
- int ret = 0;
- ctf_fs_port_data::UP port_data;
-
- bt2c::GCharUP port_name = ctf_fs_make_port_name(ds_file_group);
- if (!port_name) {
- goto error;
- }
+ const auto port_name = ctf_fs_make_port_name(ds_file_group);
+ auto port_data = bt2s::make_unique<ctf_fs_port_data>();
- BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name.get());
+ BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name);
- /* Create output port for this file */
- port_data = bt2s::make_unique<ctf_fs_port_data>();
port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
- ret = bt_self_component_source_add_output_port(self_comp_src, port_name.get(), port_data.get(),
- NULL);
+
+ int ret = bt_self_component_source_add_output_port(self_comp_src, port_name.c_str(),
+ port_data.get(), NULL);
if (ret) {
- goto error;
+ return ret;
}
ctf_fs->port_data.emplace_back(std::move(port_data));
- goto end;
-
-error:
- ret = -1;
-
-end:
- return ret;
+ return 0;
}
static int create_ports_for_trace(struct ctf_fs_component *ctf_fs,
struct ctf_fs_trace *ctf_fs_trace,
bt_self_component_source *self_comp_src)
{
- int ret = 0;
-
/* Create one output port for each stream file group */
for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) {
- ret = create_one_port_for_trace(ctf_fs, ds_file_group.get(), self_comp_src);
+ int ret = create_one_port_for_trace(ctf_fs, ds_file_group.get(), self_comp_src);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create output port.");
- goto end;
+ return ret;
}
}
-end:
- return ret;
-}
-
-/* Replace by g_ptr_array_insert when we depend on glib >= 2.40. */
-static void array_insert(GPtrArray *array, gpointer element, size_t pos)
-{
- size_t original_array_len = array->len;
-
- /* Allocate an unused element at the end of the array. */
- g_ptr_array_add(array, NULL);
-
- /* If we are not inserting at the end, move the elements by one. */
- if (pos < original_array_len) {
- memmove(&(array->pdata[pos + 1]), &(array->pdata[pos]),
- (original_array_len - pos) * sizeof(gpointer));
- }
-
- /* Insert the value. */
- array->pdata[pos] = element;
+ return 0;
}
/*
*/
static void ds_file_group_insert_ds_file_info_sorted(struct ctf_fs_ds_file_group *ds_file_group,
- struct ctf_fs_ds_file_info *ds_file_info)
+ ctf_fs_ds_file_info::UP ds_file_info)
{
- guint i;
-
/* Find the spot where to insert this ds_file_info. */
- for (i = 0; i < ds_file_group->ds_file_infos->len; i++) {
- struct ctf_fs_ds_file_info *other_ds_file_info =
- (struct ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, i);
+ auto it = ds_file_group->ds_file_infos.begin();
+
+ for (; it != ds_file_group->ds_file_infos.end(); ++it) {
+ const ctf_fs_ds_file_info& other_ds_file_info = **it;
- if (ds_file_info->begin_ns < other_ds_file_info->begin_ns) {
+ if (ds_file_info->begin_ns < other_ds_file_info.begin_ns) {
break;
}
}
- array_insert(ds_file_group->ds_file_infos, ds_file_info, i);
+ ds_file_group->ds_file_infos.insert(it, std::move(ds_file_info));
}
-static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left,
- const struct ctf_fs_ds_index_entry *right)
+static bool ds_index_entries_equal(const ctf_fs_ds_index_entry& left,
+ const ctf_fs_ds_index_entry& right)
{
- if (left->packetSize != right->packetSize) {
+ if (left.packetSize != right.packetSize) {
return false;
}
- if (left->timestamp_begin != right->timestamp_begin) {
+ if (left.timestamp_begin != right.timestamp_begin) {
return false;
}
- if (left->timestamp_end != right->timestamp_end) {
+ if (left.timestamp_end != right.timestamp_end) {
return false;
}
- if (left->packet_seq_num != right->packet_seq_num) {
+ if (left.packet_seq_num != right.packet_seq_num) {
return false;
}
* Insert `entry` into `index`, without duplication.
*
* The entry is inserted only if there isn't an identical entry already.
- *
- * In any case, the ownership of `entry` is transferred to this function. So if
- * the entry is not inserted, it is freed.
*/
static void ds_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index,
- struct ctf_fs_ds_index_entry *entry)
+ const ctf_fs_ds_index_entry& entry)
{
- guint i;
- struct ctf_fs_ds_index_entry *other_entry = NULL;
-
/* Find the spot where to insert this index entry. */
- for (i = 0; i < index->entries->len; i++) {
- other_entry = (struct ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, i);
-
- if (entry->timestamp_begin_ns <= other_entry->timestamp_begin_ns) {
+ auto otherEntry = index->entries.begin();
+ for (; otherEntry != index->entries.end(); ++otherEntry) {
+ if (entry.timestamp_begin_ns <= otherEntry->timestamp_begin_ns) {
break;
}
}
* snapshots of the same trace. We then want the index to contain
* a reference to only one copy of that packet.
*/
- if (i == index->entries->len || !ds_index_entries_equal(entry, other_entry)) {
- array_insert(index->entries, entry, i);
- } else {
- delete entry;
+ if (otherEntry == index->entries.end() || !ds_index_entries_equal(entry, *otherEntry)) {
+ index->entries.emplace(otherEntry, entry);
}
}
-static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, struct ctf_fs_ds_index *src)
+static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, const ctf_fs_ds_index& src)
{
- guint i;
-
- for (i = 0; i < src->entries->len; i++) {
- struct ctf_fs_ds_index_entry *entry =
- (struct ctf_fs_ds_index_entry *) g_ptr_array_index(src->entries, i);
-
- /*
- * Ownership of the ctf_fs_ds_index_entry is transferred to
- * ds_index_insert_ds_index_entry_sorted.
- */
- g_ptr_array_index(src->entries, i) = NULL;
+ for (const auto& entry : src.entries) {
ds_index_insert_ds_index_entry_sorted(dest, entry);
}
}
int64_t begin_ns = -1;
struct ctf_fs_ds_file_group *ds_file_group = NULL;
ctf_fs_ds_file_group::UP new_ds_file_group;
- int ret;
- 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 ctf_msg_iter *msg_iter = NULL;
+ ctf_fs_ds_file_info::UP ds_file_info;
+ ctf_msg_iter_up msg_iter;
struct ctf_stream_class *sc = NULL;
struct ctf_msg_iter_packet_properties props;
* Create a temporary ds_file to read some properties about the data
* stream file.
*/
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path, ctf_fs_trace->logger);
+ const auto ds_file =
+ ctf_fs_ds_file_create(ctf_fs_trace, bt2::Stream::Shared {}, path, ctf_fs_trace->logger);
if (!ds_file) {
- goto error;
+ return -1;
}
/* Create a temporary iterator to read the ds_file. */
msg_iter = ctf_msg_iter_create(
ctf_fs_trace->metadata->tc,
bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
- ctf_fs_ds_file_medops, ds_file, nullptr, ctf_fs_trace->logger);
+ ctf_fs_ds_file_medops, ds_file.get(), nullptr, ctf_fs_trace->logger);
if (!msg_iter) {
BT_CPPLOGE_STR_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator.");
- goto error;
+ return -1;
}
- ctf_msg_iter_set_dry_run(msg_iter, true);
+ ctf_msg_iter_set_dry_run(msg_iter.get(), true);
- ret = ctf_msg_iter_get_packet_properties(msg_iter, &props);
+ int ret = ctf_msg_iter_get_packet_properties(msg_iter.get(), &props);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs_trace->logger,
"Cannot get stream file's first packet's header and context fields (`{}`).", path);
- goto error;
+ return ret;
}
sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props.stream_class_id);
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs_trace->logger,
"Cannot convert clock cycles to nanoseconds from origin (`{}`).", path);
- goto error;
+ return ret;
}
}
ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns);
if (!ds_file_info) {
- goto error;
+ return -1;
}
- index = ctf_fs_ds_file_build_index(ds_file, ds_file_info, msg_iter);
+ auto index = ctf_fs_ds_file_build_index(ds_file.get(), ds_file_info.get(), msg_iter.get());
if (!index) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
- ds_file->file->path->str);
- goto error;
+ ds_file->file->path);
+ return -1;
}
if (begin_ns == -1) {
* there's no timestamp to order the file within its
* group.
*/
- new_ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), index);
-
- /* Ownership of index is transferred. */
- index = NULL;
+ new_ds_file_group =
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(*index));
if (!new_ds_file_group) {
- goto error;
+ return -1;
}
- ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(),
- BT_MOVE_REF(ds_file_info));
+ ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(), std::move(ds_file_info));
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
- goto end;
+ return 0;
}
BT_ASSERT(stream_instance_id != -1);
if (!ds_file_group) {
new_ds_file_group =
- ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, index);
- /* Ownership of index is transferred. */
- index = NULL;
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, std::move(*index));
if (!new_ds_file_group) {
- goto error;
+ return -1;
}
ds_file_group = new_ds_file_group.get();
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
} else {
- merge_ctf_fs_ds_indexes(ds_file_group->index, index);
+ merge_ctf_fs_ds_indexes(&ds_file_group->index, *index);
}
- ds_file_group_insert_ds_file_info_sorted(ds_file_group, BT_MOVE_REF(ds_file_info));
-
- goto end;
+ ds_file_group_insert_ds_file_info_sorted(ds_file_group, std::move(ds_file_info));
-error:
- ret = -1;
-
-end:
- ctf_fs_ds_file_destroy(ds_file);
- ctf_fs_ds_file_info_destroy(ds_file_info);
-
- if (msg_iter) {
- ctf_msg_iter_destroy(msg_iter);
- }
-
- ctf_fs_ds_index_destroy(index);
- return ret;
+ return 0;
}
static int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
{
- int ret = 0;
const char *basename;
GError *error = NULL;
- GDir *dir = NULL;
/* Check each file in the path directory, except specific ones */
- dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
+ const bt2c::GDirUP dir {g_dir_open(ctf_fs_trace->path.c_str(), 0, &error)};
if (!dir) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
- "Cannot open directory `{}`: {} (code {})",
- ctf_fs_trace->path->str, error->message, error->code);
- goto error;
+ "Cannot open directory `{}`: {} (code {})", ctf_fs_trace->path,
+ error->message, error->code);
+ if (error) {
+ g_error_free(error);
+ }
+ return -1;
}
- while ((basename = g_dir_read_name(dir))) {
- struct ctf_fs_file *file;
-
+ while ((basename = g_dir_read_name(dir.get()))) {
if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) {
/* Ignore the metadata stream. */
BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
"Ignoring metadata file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
+ ctf_fs_trace->path, basename);
continue;
}
if (basename[0] == '.') {
BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
- "Ignoring hidden file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
+ "Ignoring hidden file `{}" G_DIR_SEPARATOR_S "{}`", ctf_fs_trace->path,
+ basename);
continue;
}
/* Create the file. */
- file = ctf_fs_file_create(ctf_fs_trace->logger);
- if (!file) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(
- ctf_fs_trace->logger,
- "Cannot create stream file object for file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
- goto error;
- }
+ ctf_fs_file file {ctf_fs_trace->logger};
/* Create full path string. */
- g_string_append_printf(file->path, "%s" G_DIR_SEPARATOR_S "%s", ctf_fs_trace->path->str,
- basename);
- if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) {
- BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring non-regular file `{}`",
- file->path->str);
- ctf_fs_file_destroy(file);
- file = NULL;
+ file.path = fmt::format("{}" G_DIR_SEPARATOR_S "{}", ctf_fs_trace->path, basename);
+
+ if (!g_file_test(file.path.c_str(), G_FILE_TEST_IS_REGULAR)) {
+ BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring non-regular file `{}`", file.path);
continue;
}
- ret = ctf_fs_file_open(file, "rb");
+ int ret = ctf_fs_file_open(&file, "rb");
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot open stream file `{}`",
- file->path->str);
- goto error;
+ file.path);
+ return ret;
}
- if (file->size == 0) {
+ if (file.size == 0) {
/* Skip empty stream. */
- BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring empty file `{}`", file->path->str);
- ctf_fs_file_destroy(file);
+ BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring empty file `{}`", file.path);
continue;
}
- ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file->path->str);
+ ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file.path.c_str());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot add stream file `{}` to stream file group",
- file->path->str);
- ctf_fs_file_destroy(file);
- goto error;
+ file.path);
+ return ret;
}
-
- ctf_fs_file_destroy(file);
- }
-
- goto end;
-
-error:
- ret = -1;
-
-end:
- if (dir) {
- g_dir_close(dir);
- dir = NULL;
}
- if (error) {
- g_error_free(error);
- }
-
- return ret;
+ return 0;
}
-static int set_trace_name(bt_trace *trace, const char *name_suffix, const bt2c::Logger& logger)
+static int set_trace_name(bt_trace *trace, const char *name_suffix)
{
- int ret = 0;
const bt_value *val;
- GString *name;
-
- name = g_string_new(NULL);
- if (!name) {
- BT_CPPLOGE_STR_SPEC(logger, "Failed to allocate a GString.");
- ret = -1;
- goto end;
- }
+ std::string name;
/*
* Check if we have a trace environment string value named `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));
+ name += bt_value_string_get(val);
if (name_suffix) {
- g_string_append_c(name, G_DIR_SEPARATOR);
+ name += G_DIR_SEPARATOR;
}
}
if (name_suffix) {
- g_string_append(name, name_suffix);
+ name += name_suffix;
}
- ret = bt_trace_set_name(trace, name->str);
- if (ret) {
- goto end;
- }
-
- goto end;
-
-end:
- if (name) {
- g_string_free(name, TRUE);
- }
-
- return ret;
+ return bt_trace_set_name(trace, name.c_str());
}
static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name,
bt_self_component *selfComp,
const bt2c::Logger& parentLogger)
{
- int ret;
+ ctf_fs_trace::UP ctf_fs_trace = bt2s::make_unique<struct ctf_fs_trace>(parentLogger);
+ ctf_fs_trace->path = path;
+ ctf_fs_trace->metadata = bt2s::make_unique<ctf_fs_metadata>();
- ctf_fs_trace::UP ctf_fs_trace {new struct ctf_fs_trace(parentLogger)};
- ctf_fs_trace->path = g_string_new(path);
- if (!ctf_fs_trace->path) {
- goto error;
- }
-
- ctf_fs_trace->metadata = new ctf_fs_metadata;
- ctf_fs_metadata_init(ctf_fs_trace->metadata);
-
- ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
+ int ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
if (ret) {
- goto error;
+ return nullptr;
}
if (ctf_fs_trace->metadata->trace_class) {
- ctf_fs_trace->trace = bt_trace_create(ctf_fs_trace->metadata->trace_class);
- if (!ctf_fs_trace->trace) {
- goto error;
+ bt_trace *trace = bt_trace_create(ctf_fs_trace->metadata->trace_class->libObjPtr());
+ if (!trace) {
+ return nullptr;
}
+
+ ctf_fs_trace->trace = bt2::Trace::Shared::createWithoutRef(trace);
}
if (ctf_fs_trace->trace) {
- ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, ctf_fs_trace->trace);
+ ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc,
+ ctf_fs_trace->trace->libObjPtr());
if (ret) {
- goto error;
+ return nullptr;
}
- ret = set_trace_name(ctf_fs_trace->trace, name, ctf_fs_trace->logger);
+ ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name);
if (ret) {
- goto error;
+ return nullptr;
}
}
ret = create_ds_file_groups(ctf_fs_trace.get());
if (ret) {
- goto error;
+ return nullptr;
}
- goto end;
-
-error:
- ctf_fs_trace.reset();
-
-end:
return ctf_fs_trace;
}
static int path_is_ctf_trace(const char *path)
{
- GString *metadata_path = g_string_new(NULL);
- int ret = 0;
-
- if (!metadata_path) {
- ret = -1;
- goto end;
- }
-
- g_string_printf(metadata_path, "%s" G_DIR_SEPARATOR_S "%s", path, CTF_FS_METADATA_FILENAME);
-
- if (g_file_test(metadata_path->str, G_FILE_TEST_IS_REGULAR)) {
- ret = 1;
- goto end;
- }
-
-end:
- g_string_free(metadata_path, TRUE);
- return ret;
+ return g_file_test(fmt::format("{}" G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME, path).c_str(),
+ G_FILE_TEST_IS_REGULAR);
}
/* Helper for ctf_fs_component_create_ctf_fs_trace, to handle a single path. */
{
ctf_fs_trace::UP ctf_fs_trace;
int ret;
- GString *norm_path;
- norm_path = bt_common_normalize_path(path_param, NULL);
+ bt2c::GStringUP norm_path {bt_common_normalize_path(path_param, NULL)};
if (!norm_path) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to normalize path: `{}`.", path_param);
- goto error;
+ return -1;
}
ret = path_is_ctf_trace(norm_path->str);
if (ret < 0) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs->logger, "Failed to check if path is a CTF trace: path={}", norm_path->str);
- goto error;
+ return ret;
} else if (ret == 0) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs->logger, "Path is not a CTF trace (does not contain a metadata file): `{}`.",
norm_path->str);
- goto error;
+ return -1;
}
// FIXME: Remove or ifdef for __MINGW32__
if (strcmp(norm_path->str, "/") == 0) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Opening a trace in `/` is not supported.");
- ret = -1;
- goto end;
+ return -1;
}
ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, ctf_fs->clkClsCfg, selfComp,
if (!ctf_fs_trace) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create trace for `{}`.",
norm_path->str);
- goto error;
+ return -1;
}
traces.emplace_back(std::move(ctf_fs_trace));
- ret = 0;
- goto end;
-
-error:
- ret = -1;
-
-end:
- if (norm_path) {
- g_string_free(norm_path, TRUE);
- }
-
- return ret;
+ return 0;
}
/*
static void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest,
ctf_fs_ds_file_group::UP src)
{
- guint i;
-
- for (i = 0; i < src->ds_file_infos->len; i++) {
- struct ctf_fs_ds_file_info *ds_file_info =
- (struct ctf_fs_ds_file_info *) g_ptr_array_index(src->ds_file_infos, i);
-
- /* Ownership of the ds_file_info is transferred to dest. */
- g_ptr_array_index(src->ds_file_infos, i) = NULL;
-
- ds_file_group_insert_ds_file_info_sorted(dest, ds_file_info);
+ for (auto& ds_file_info : src->ds_file_infos) {
+ ds_file_group_insert_ds_file_info_sorted(dest, std::move(ds_file_info));
}
/* Merge both indexes. */
- merge_ctf_fs_ds_indexes(dest->index, src->index);
+ merge_ctf_fs_ds_indexes(&dest->index, src->index);
}
/* Merge src_trace's data stream file groups into dest_trace's. */
{
std::vector<ctf_fs_ds_file_group::UP>& dest = dest_trace->ds_file_groups;
std::vector<ctf_fs_ds_file_group::UP>& src = src_trace->ds_file_groups;
- int ret = 0;
/*
* Save the initial length of dest: we only want to check against the
*/
if (!dest_group) {
struct ctf_stream_class *sc;
- struct ctf_fs_ds_index *index;
sc = ctf_trace_class_borrow_stream_class_by_id(dest_trace->metadata->tc,
src_group->sc->id);
BT_ASSERT(sc);
- index = ctf_fs_ds_index_create(dest_trace->logger);
- if (!index) {
- ret = -1;
- goto end;
- }
-
auto new_dest_group =
- ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, index);
+ ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, {});
- /* Ownership of index is transferred. */
- index = NULL;
if (!new_dest_group) {
- ret = -1;
- goto end;
+ return -1;
}
dest_group = new_dest_group.get();
merge_ctf_fs_ds_file_groups(dest_group, std::move(src_group));
}
-end:
- return ret;
+ return 0;
}
/*
unsigned int winner_count;
struct ctf_fs_trace *winner;
guint i, winner_i;
- int ret = 0;
BT_ASSERT(traces.size() >= 2);
}
/* Merge trace's data stream file groups into winner's. */
- ret = merge_matching_ctf_fs_ds_file_groups(winner, std::move(trace));
+ int ret = merge_matching_ctf_fs_ds_file_groups(winner, std::move(trace));
if (ret) {
- goto end;
+ return ret;
}
}
*/
out_trace = std::move(traces[winner_i]);
-end:
- return ret;
+ return 0;
}
enum target_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,
+ const ctf_fs_ds_index_entry& index_entry,
enum target_event target_event, uint64_t *cs,
int64_t *ts_ns)
{
enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
- struct ctf_fs_ds_file *ds_file = NULL;
- struct ctf_msg_iter *msg_iter = NULL;
- int ret = 0;
+ ctf_msg_iter_up msg_iter;
BT_ASSERT(ctf_fs_trace);
- BT_ASSERT(index_entry);
- BT_ASSERT(index_entry->path);
+ BT_ASSERT(index_entry.path);
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, index_entry->path, ctf_fs_trace->logger);
+ const auto ds_file = ctf_fs_ds_file_create(ctf_fs_trace, bt2::Stream::Shared {},
+ index_entry.path, ctf_fs_trace->logger);
if (!ds_file) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to create a ctf_fs_ds_file");
- ret = -1;
- goto end;
+ return -1;
}
BT_ASSERT(ctf_fs_trace->metadata);
msg_iter = ctf_msg_iter_create(
ctf_fs_trace->metadata->tc,
bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
- ctf_fs_ds_file_medops, ds_file, NULL, ctf_fs_trace->logger);
+ ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger);
if (!msg_iter) {
/* ctf_msg_iter_create() logs errors. */
- ret = -1;
- goto end;
+ return -1;
}
/*
* Turn on dry run mode to prevent the creation and usage of Babeltrace
* library objects (bt_field, bt_message_*, etc.).
*/
- ctf_msg_iter_set_dry_run(msg_iter, true);
+ ctf_msg_iter_set_dry_run(msg_iter.get(), true);
/* Seek to the beginning of the target packet. */
- iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset.bytes());
+ iter_status = ctf_msg_iter_seek(msg_iter.get(), index_entry.offset.bytes());
if (iter_status) {
/* ctf_msg_iter_seek() logs errors. */
- ret = -1;
- goto end;
+ return -1;
}
switch (target_event) {
* the first event. To extract the first event's clock
* snapshot.
*/
- iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter, cs);
+ iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter.get(), cs);
break;
case LAST_EVENT:
/* Decode the packet to extract the last event's clock snapshot. */
- iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter, cs);
+ iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter.get(), cs);
break;
default:
bt_common_abort();
}
if (iter_status) {
- ret = -1;
- goto end;
+ return -1;
}
/* Convert clock snapshot to timestamp. */
- ret = bt_util_clock_cycles_to_ns_from_origin(
+ int 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_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Failed to convert clock snapshot to timestamp");
- goto end;
- }
-
-end:
- if (ds_file) {
- ctf_fs_ds_file_destroy(ds_file);
- }
- if (msg_iter) {
- ctf_msg_iter_destroy(msg_iter);
+ return ret;
}
- return ret;
+ return 0;
}
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,
+ const 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,
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,
+ const 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,
*/
static int fix_index_lttng_event_after_packet_bug(struct ctf_fs_trace *trace)
{
- int ret = 0;
-
for (const auto& ds_file_group : trace->ds_file_groups) {
- guint entry_i;
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index_entry *last_entry;
- struct ctf_fs_ds_index *index;
BT_ASSERT(ds_file_group);
- index = ds_file_group->index;
+ auto& index = ds_file_group->index;
- BT_ASSERT(index);
- BT_ASSERT(index->entries);
- BT_ASSERT(index->entries->len > 0);
+ BT_ASSERT(!index.entries.empty());
/*
* 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 = (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i);
- next_entry = (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i + 1);
+ for (size_t entry_i = 0; entry_i < index.entries.size() - 1; ++entry_i) {
+ auto& curr_entry = index.entries[entry_i];
+ const auto& next_entry = 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;
+ 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 =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, index->entries->len - 1);
- BT_ASSERT(last_entry);
+ auto& last_entry = index.entries.back();
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);
+ int ret = decode_packet_last_event_timestamp(
+ trace, default_cc, last_entry, &last_entry.timestamp_end, &last_entry.timestamp_end_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
trace->logger,
"Failed to decode stream's last packet to get its last event's clock snapshot.");
- goto end;
+ return ret;
}
}
-end:
- return ret;
+ return 0;
}
/*
*/
static int fix_index_barectf_event_before_packet_bug(struct ctf_fs_trace *trace)
{
- int ret = 0;
-
for (const auto& ds_file_group : trace->ds_file_groups) {
- guint entry_i;
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index *index = ds_file_group->index;
+ auto& index = ds_file_group->index;
- BT_ASSERT(index);
- BT_ASSERT(index->entries);
- BT_ASSERT(index->entries->len > 0);
+ BT_ASSERT(!index.entries.empty());
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++) {
- ctf_fs_ds_index_entry *prev_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i - 1);
- ctf_fs_ds_index_entry *curr_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i);
+ for (size_t entry_i = 1; entry_i < index.entries.size(); ++entry_i) {
+ auto& prev_entry = index.entries[entry_i - 1];
+ auto& curr_entry = 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);
+ int ret = decode_packet_first_event_timestamp(trace, default_cc, curr_entry,
+ &curr_entry.timestamp_begin,
+ &curr_entry.timestamp_begin_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to decode first event's clock snapshot");
- goto end;
+ return ret;
}
/*
* 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;
+ prev_entry.timestamp_end = curr_entry.timestamp_begin;
+ prev_entry.timestamp_end_ns = curr_entry.timestamp_begin_ns;
}
}
-end:
- return ret;
+
+ return 0;
}
/*
*/
static int fix_index_lttng_crash_quirk(struct ctf_fs_trace *trace)
{
- int ret = 0;
-
for (const auto& ds_file_group : trace->ds_file_groups) {
- guint entry_idx;
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index *index;
BT_ASSERT(ds_file_group);
- index = ds_file_group->index;
+ auto& 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);
+ BT_ASSERT(!index.entries.empty());
- ctf_fs_ds_index_entry *last_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, index->entries->len - 1);
- BT_ASSERT(last_entry);
+ auto& last_entry = index.entries.back();
/* 1. Fix the last entry first. */
- if (last_entry->timestamp_end == 0 && last_entry->timestamp_begin != 0) {
+ 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);
+ int ret = decode_packet_last_event_timestamp(trace, default_cc, last_entry,
+ &last_entry.timestamp_end,
+ &last_entry.timestamp_end_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to decode last event's clock snapshot");
- goto end;
+ return ret;
}
}
/* Iterate over all entries but the last one. */
- for (entry_idx = 0; entry_idx < index->entries->len - 1; entry_idx++) {
- ctf_fs_ds_index_entry *curr_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_idx);
- ctf_fs_ds_index_entry *next_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_idx + 1);
+ for (size_t entry_idx = 0; entry_idx < index.entries.size() - 1; ++entry_idx) {
+ auto& curr_entry = index.entries[entry_idx];
+ const auto& next_entry = index.entries[entry_idx + 1];
- if (curr_entry->timestamp_end == 0 && curr_entry->timestamp_begin != 0) {
+ 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;
+ curr_entry.timestamp_end = next_entry.timestamp_begin;
+ curr_entry.timestamp_end_ns = next_entry.timestamp_begin_ns;
}
}
}
-end:
- return ret;
+ return 0;
}
/*
*/
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 */
*/
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;
+ return -1;
}
/* Set tracer name. */
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;
+ return -1;
}
/* Set major version number. */
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;
+ return 0;
}
/* Set minor version number. */
}
if (!entry || entry->type != CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT) {
- goto end;
+ return 0;
}
/* Set patch version number. */
current_tracer_info->patch = entry->value.i;
- goto end;
-
-missing_bare_minimum:
- ret = -1;
-end:
- return ret;
+ return 0;
}
static bool is_tracer_affected_by_lttng_event_after_packet_bug(struct tracer_info *curr_tracer_info)
*/
static int fix_packet_index_tracer_bugs(ctf_fs_trace *trace)
{
- int ret = 0;
struct tracer_info current_tracer_info;
- ret = extract_tracer_info(trace, ¤t_tracer_info);
+ int ret = extract_tracer_info(trace, ¤t_tracer_info);
if (ret) {
/*
* A trace may not have all the necessary environment
* are needed. Failing to extract these entries is not
* an error.
*/
- ret = 0;
BT_CPPLOGI_STR_SPEC(
trace->logger,
"Cannot extract tracer information necessary to compare with buggy versions.");
- goto end;
+ return 0;
}
/* Check if the trace may be affected by old tracer bugs. */
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to fix LTTng event-after-packet bug.");
- goto end;
+ return ret;
}
trace->metadata->tc->quirks.lttng_event_after_packet = true;
}
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to fix barectf event-before-packet bug.");
- goto end;
+ return ret;
}
trace->metadata->tc->quirks.barectf_event_before_packet = true;
}
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to fix lttng-crash timestamp quirks.");
- goto end;
+ return ret;
}
trace->metadata->tc->quirks.lttng_crash = true;
}
-end:
- return ret;
+ return 0;
}
static bool compare_ds_file_groups_by_first_path(const ctf_fs_ds_file_group::UP& ds_file_group_a,
const ctf_fs_ds_file_group::UP& ds_file_group_b)
{
- BT_ASSERT(ds_file_group_a->ds_file_infos->len > 0);
- BT_ASSERT(ds_file_group_b->ds_file_infos->len > 0);
+ BT_ASSERT(!ds_file_group_a->ds_file_infos.empty());
+ BT_ASSERT(!ds_file_group_b->ds_file_infos.empty());
- const ctf_fs_ds_file_info *first_ds_file_info_a =
- (const ctf_fs_ds_file_info *) ds_file_group_a->ds_file_infos->pdata[0];
- const ctf_fs_ds_file_info *first_ds_file_info_b =
- (const ctf_fs_ds_file_info *) ds_file_group_b->ds_file_infos->pdata[0];
+ const auto& first_ds_file_info_a = *ds_file_group_a->ds_file_infos[0];
+ const auto& first_ds_file_info_b = *ds_file_group_b->ds_file_infos[0];
- return first_ds_file_info_a->path < first_ds_file_info_b->path;
-}
-
-static gint compare_strings(gconstpointer p_a, gconstpointer p_b)
-{
- const char *a = *((const char **) p_a);
- const char *b = *((const char **) p_b);
-
- return strcmp(a, b);
+ return first_ds_file_info_a.path < first_ds_file_info_b.path;
}
int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs,
const bt_value *trace_name_value,
bt_self_component *selfComp)
{
- int ret = 0;
- uint64_t i;
- GPtrArray *paths = NULL;
+ std::vector<std::string> paths;
std::vector<ctf_fs_trace::UP> traces;
const char *trace_name;
BT_ASSERT(bt_value_get_type(paths_value) == BT_VALUE_TYPE_ARRAY);
BT_ASSERT(!bt_value_array_is_empty(paths_value));
- paths = g_ptr_array_new_with_free_func(g_free);
- if (!paths) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to allocate a GPtrArray.");
- goto error;
- }
-
trace_name = trace_name_value ? bt_value_string_get(trace_name_value) : NULL;
/*
* Create a sorted array of the paths, to make the execution of this
* component deterministic.
*/
- for (i = 0; i < bt_value_array_get_length(paths_value); i++) {
+ for (std::uint64_t 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 *input = bt_value_string_get(path_value);
- gchar *input_copy;
-
- input_copy = g_strdup(input);
- if (!input_copy) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to copy a string.");
- goto error;
- }
-
- g_ptr_array_add(paths, input_copy);
+ paths.emplace_back(input);
}
- g_ptr_array_sort(paths, compare_strings);
+ std::sort(paths.begin(), paths.end());
/* Create a separate ctf_fs_trace object for each path. */
- for (i = 0; i < paths->len; i++) {
- const char *path = (const char *) g_ptr_array_index(paths, i);
-
- ret = ctf_fs_component_create_ctf_fs_trace_one_path(ctf_fs, path, trace_name, traces,
- selfComp);
+ for (const auto& path : paths) {
+ int ret = ctf_fs_component_create_ctf_fs_trace_one_path(ctf_fs, path.c_str(), trace_name,
+ traces, selfComp);
if (ret) {
- goto end;
+ return ret;
}
}
* We have more than one trace, they must all share the same
* UUID, verify that.
*/
- for (i = 0; i < traces.size(); i++) {
+ for (size_t i = 0; i < traces.size(); i++) {
ctf_fs_trace *this_trace = traces[i].get();
const uint8_t *this_trace_uuid = this_trace->metadata->tc->uuid;
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs->logger,
"Multiple traces given, but a trace does not have a UUID: path={}",
- this_trace->path->str);
- goto error;
+ this_trace->path);
+ return -1;
}
if (bt_uuid_compare(first_trace_uuid, this_trace_uuid) != 0) {
"Multiple traces given, but UUIDs don't match: "
"first-trace-uuid={}, first-trace-path={}, "
"trace-uuid={}, trace-path={}",
- first_trace_uuid_str, first_trace->path->str,
- this_trace_uuid_str, this_trace->path->str);
- goto error;
+ first_trace_uuid_str, first_trace->path,
+ this_trace_uuid_str, this_trace->path);
+ return -1;
}
}
- ret = merge_ctf_fs_traces(std::move(traces), ctf_fs->trace);
+ int ret = merge_ctf_fs_traces(std::move(traces), ctf_fs->trace);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger,
"Failed to merge traces with the same UUID.");
- goto error;
+ return ret;
}
} else {
/* Just one trace, it may or may not have a UUID, both are fine. */
ctf_fs->trace = std::move(traces[0]);
}
- ret = fix_packet_index_tracer_bugs(ctf_fs->trace.get());
+ int ret = fix_packet_index_tracer_bugs(ctf_fs->trace.get());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to fix packet index tracer bugs.");
+ return ret;
}
/*
*/
std::sort(ctf_fs->trace->ds_file_groups.begin(), ctf_fs->trace->ds_file_groups.end(),
compare_ds_file_groups_by_first_path);
- goto end;
-error:
- ret = -1;
-
-end:
- if (paths) {
- g_ptr_array_free(paths, TRUE);
- }
- return ret;
+ return 0;
}
-static GString *get_stream_instance_unique_name(struct ctf_fs_ds_file_group *ds_file_group)
+static const std::string&
+get_stream_instance_unique_name(struct ctf_fs_ds_file_group *ds_file_group)
{
- GString *name;
- struct ctf_fs_ds_file_info *ds_file_info;
-
- name = g_string_new(NULL);
- if (!name) {
- goto end;
- }
-
/*
- * If there's more than one stream file in the stream file
- * group, the first (earliest) stream file's path is used as
- * the stream's unique name.
+ * The first (earliest) stream file's path is used as the stream's unique
+ * name.
*/
- BT_ASSERT(ds_file_group->ds_file_infos->len > 0);
- ds_file_info = (ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, 0);
- g_string_assign(name, ds_file_info->path.c_str());
-
-end:
- return name;
+ BT_ASSERT(!ds_file_group->ds_file_infos.empty());
+ return ds_file_group->ds_file_infos[0]->path;
}
/* Create the IR stream objects for ctf_fs_trace. */
static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace)
{
- int ret;
- GString *name = NULL;
-
for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) {
- name = get_stream_instance_unique_name(ds_file_group.get());
-
- if (!name) {
- goto error;
- }
+ const std::string& name = get_stream_instance_unique_name(ds_file_group.get());
BT_ASSERT(ds_file_group->sc->ir_sc);
BT_ASSERT(ctf_fs_trace->trace);
+ bt_stream *stream;
+
if (ds_file_group->stream_id == UINT64_C(-1)) {
/* No stream ID: use 0 */
- ds_file_group->stream = bt_stream_create_with_id(
- ds_file_group->sc->ir_sc, ctf_fs_trace->trace, ctf_fs_trace->next_stream_id);
+ stream =
+ bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+ ctf_fs_trace->next_stream_id);
ctf_fs_trace->next_stream_id++;
} else {
/* Specific stream ID */
- ds_file_group->stream = bt_stream_create_with_id(
- ds_file_group->sc->ir_sc, ctf_fs_trace->trace, (uint64_t) ds_file_group->stream_id);
+ stream =
+ bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+ (uint64_t) ds_file_group->stream_id);
}
- if (!ds_file_group->stream) {
+ if (!stream) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot create stream for DS file group: "
"addr={}, stream-name=\"{}\"",
- fmt::ptr(ds_file_group), name->str);
- goto error;
+ fmt::ptr(ds_file_group), name);
+ return -1;
}
- ret = bt_stream_set_name(ds_file_group->stream, name->str);
+ ds_file_group->stream = bt2::Stream::Shared::createWithoutRef(stream);
+
+ int ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name.c_str());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot set stream's name: "
"addr={}, stream-name=\"{}\"",
- fmt::ptr(ds_file_group->stream), name->str);
- goto error;
+ fmt::ptr(ds_file_group->stream->libObjPtr()), name);
+ return ret;
}
-
- g_string_free(name, TRUE);
- name = NULL;
}
- ret = 0;
- goto end;
-
-error:
- ret = -1;
-
-end:
-
- if (name) {
- g_string_free(name, TRUE);
- }
- return ret;
+ return 0;
}
static const bt_param_validation_value_descr inputs_elem_descr =
bool read_src_fs_parameters(const bt_value *params, const bt_value **inputs,
const bt_value **trace_name, struct ctf_fs_component *ctf_fs)
{
- bool ret;
const bt_value *value;
enum bt_param_validation_status validate_value_status;
gchar *error = NULL;
validate_value_status = bt_param_validation_validate(params, fs_params_entries_descr, &error);
if (validate_value_status != BT_PARAM_VALIDATION_STATUS_OK) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "{}", error);
- ret = false;
- goto end;
+ g_free(error);
+ return false;
}
/* inputs parameter */
/* trace-name parameter */
*trace_name = bt_value_map_borrow_entry_value_const(params, "trace-name");
- ret = true;
-
-end:
- g_free(error);
- return ret;
+ return true;
}
static ctf_fs_component::UP ctf_fs_create(const bt_value *params,
const bt_value *trace_name_value;
bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
- ctf_fs_component::UP ctf_fs = ctf_fs_component_create(
+ ctf_fs_component::UP ctf_fs = bt2s::make_unique<ctf_fs_component>(
bt2c::Logger {bt2::SelfSourceComponent {self_comp_src}, "PLUGIN/SRC.CTF.FS/COMP"});
- if (!ctf_fs) {
- return nullptr;
- }
if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value, ctf_fs.get())) {
return nullptr;