* Babeltrace CTF file system Reader Component
*/
-#define BT_COMP_LOG_SELF_COMP self_comp
-#define BT_LOG_OUTPUT_LEVEL log_level
-#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
-#include "logging/comp-logging.h"
+#include <sstream>
-#include "common/common.h"
-#include <babeltrace2/babeltrace.h>
-#include "common/uuid.h"
#include <glib.h>
+
+#include <babeltrace2/babeltrace.h>
+
#include "common/assert.h"
-#include <inttypes.h>
-#include <stdbool.h>
-#include "fs.hpp"
-#include "metadata.hpp"
+#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"
+
+#include "../common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp"
+#include "../common/src/msg-iter/msg-iter.hpp"
#include "data-stream-file.hpp"
#include "file.hpp"
-#include "../common/metadata/decoder.hpp"
-#include "../common/metadata/ctf-meta-configure-ir-trace.hpp"
-#include "../common/msg-iter/msg-iter.hpp"
+#include "fs.hpp"
+#include "metadata.hpp"
#include "query.hpp"
-#include "plugins/common/param-validation/param-validation.h"
struct tracer_info
{
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);
- }
-
- g_free(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)
{
+ const auto msg_iter_status =
+ ctf_msg_iter_get_next_message(msg_iter_data->msg_iter.get(), out_msg);
bt_message_iterator_class_next_method_status status;
- enum ctf_msg_iter_status msg_iter_status;
- bt_logging_level log_level = msg_iter_data->log_level;
-
- msg_iter_status = ctf_msg_iter_get_next_message(msg_iter_data->msg_iter, out_msg);
switch (msg_iter_status) {
case CTF_MSG_ITER_STATUS_OK:
bt_common_abort();
case CTF_MSG_ITER_STATUS_ERROR:
- BT_MSG_ITER_LOGE_APPEND_CAUSE(msg_iter_data->self_msg_iter,
- "Failed to get next message from CTF message iterator.");
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger,
+ "Failed to get next message from CTF message iterator.");
status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
break;
case CTF_MSG_ITER_STATUS_MEMORY_ERROR:
- BT_MSG_ITER_LOGE_APPEND_CAUSE(msg_iter_data->self_msg_iter,
- "Failed to get next message from CTF message iterator.");
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger,
+ "Failed to get next message from CTF message iterator.");
status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_MEMORY_ERROR;
break;
ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const msgs,
uint64_t capacity, uint64_t *count)
{
- 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;
+ try {
+ struct ctf_fs_msg_iter_data *msg_iter_data =
+ (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(iterator);
- if (G_UNLIKELY(msg_iter_data->next_saved_error)) {
- /*
+ if (G_UNLIKELY(msg_iter_data->next_saved_error)) {
+ /*
* Last time we were called, we hit an error but had some
* messages to deliver, so we stashed the error here. Return
* it now.
*/
- BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(msg_iter_data->next_saved_error);
- status = msg_iter_data->next_saved_status;
- goto end;
- }
-
- do {
- status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]);
- if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
- i++;
+ BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(msg_iter_data->next_saved_error);
+ return msg_iter_data->next_saved_status;
}
- } while (i < capacity && status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK);
- if (i > 0) {
- /*
+ bt_message_iterator_class_next_method_status status;
+ uint64_t i = 0;
+
+ do {
+ status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]);
+ if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
+ i++;
+ }
+ } while (i < capacity && status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK);
+
+ if (i > 0) {
+ /*
* Even if ctf_fs_iterator_next_one() returned something
* else than BT_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK, we
* accumulated message objects in the output
* message array, so we need to return
* BT_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK so that they are
- * transfered to downstream. This other status occurs
+ * transferred to downstream. This other status occurs
* again the next time muxer_msg_iter_do_next() is
* called, possibly without any accumulated
* message, in which case we'll return it.
*/
- if (status < 0) {
- /*
+ if (status < 0) {
+ /*
* Save this error for the next _next call. Assume that
* this component always appends error causes when
* returning an error status code, which will cause the
* current thread error to be non-NULL.
*/
- msg_iter_data->next_saved_error = bt_current_thread_take_error();
- BT_ASSERT(msg_iter_data->next_saved_error);
- msg_iter_data->next_saved_status = status;
+ msg_iter_data->next_saved_error = bt_current_thread_take_error();
+ BT_ASSERT(msg_iter_data->next_saved_error);
+ msg_iter_data->next_saved_status = status;
+ }
+
+ *count = i;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
}
- *count = i;
- status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
+ return status;
+ return status;
+ } catch (const std::bad_alloc&) {
+ return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_MEMORY_ERROR;
+ } catch (const bt2::Error&) {
+ return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
}
-
-end:
- return status;
}
bt_message_iterator_class_seek_beginning_method_status
ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it)
{
- struct ctf_fs_msg_iter_data *msg_iter_data =
- (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it);
+ try {
+ struct ctf_fs_msg_iter_data *msg_iter_data =
+ (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it);
- BT_ASSERT(msg_iter_data);
+ 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;
+ return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK;
+ } catch (const std::bad_alloc&) {
+ return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_MEMORY_ERROR;
+ } catch (const bt2::Error&) {
+ return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_ERROR;
+ }
}
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
bt_self_message_iterator_configuration *config,
bt_self_component_port_output *self_port)
{
- struct ctf_fs_port_data *port_data;
- struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
- bt_message_iterator_class_initialize_method_status status;
- bt_logging_level log_level;
- enum ctf_msg_iter_medium_status medium_status;
- bt_self_component *self_comp = bt_self_message_iterator_borrow_component(self_msg_iter);
-
- 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);
- log_level = port_data->ctf_fs->log_level;
- msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1);
- if (!msg_iter_data) {
- status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
- goto error;
- }
-
- msg_iter_data->log_level = log_level;
- msg_iter_data->self_comp = self_comp;
- msg_iter_data->self_msg_iter = 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, log_level,
- &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_MSG_ITER_LOGE_APPEND_CAUSE(self_msg_iter, "Failed to create ctf_fs_ds_group_medops");
- status = ctf_msg_iter_medium_status_to_msg_iter_initialize_status(medium_status);
- goto error;
- }
-
- 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(msg_iter_data->log_level) * 8, ctf_fs_ds_group_medops,
- msg_iter_data->msg_iter_medops_data, msg_iter_data->log_level, self_comp, self_msg_iter);
- if (!msg_iter_data->msg_iter) {
- BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create a CTF message iterator.");
- status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
- goto error;
- }
+ try {
+ ctf_fs_port_data *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);
+
+ 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;
+
+ ctf_msg_iter_medium_status 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);
+ 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");
+ 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.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.");
+ return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ }
+
+ /*
* This iterator can seek forward if its stream class has a default
* clock class.
*/
- if (msg_iter_data->ds_file_group->sc->default_clock_class) {
- 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);
-
-end:
- ctf_fs_msg_iter_data_destroy(msg_iter_data);
- return status;
-}
-
-static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
-{
- if (!ctf_fs_trace) {
- return;
- }
-
- if (ctf_fs_trace->ds_file_groups) {
- g_ptr_array_free(ctf_fs_trace->ds_file_groups, TRUE);
- }
-
- 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);
- g_free(ctf_fs_trace->metadata);
- }
-
- g_free(ctf_fs_trace);
-}
-
-void ctf_fs_destroy(struct ctf_fs_component *ctf_fs)
-{
- if (!ctf_fs) {
- return;
- }
-
- ctf_fs_trace_destroy(ctf_fs->trace);
-
- if (ctf_fs->port_data) {
- g_ptr_array_free(ctf_fs->port_data, TRUE);
- }
-
- g_free(ctf_fs);
-}
-
-static void port_data_destroy(struct ctf_fs_port_data *port_data)
-{
- if (!port_data) {
- return;
- }
-
- g_free(port_data);
-}
-
-static void port_data_destroy_notifier(void *data)
-{
- port_data_destroy((struct ctf_fs_port_data *) data);
-}
-
-static void ctf_fs_trace_destroy_notifier(void *data)
-{
- struct ctf_fs_trace *trace = (struct ctf_fs_trace *) data;
- ctf_fs_trace_destroy(trace);
-}
+ if (msg_iter_data->ds_file_group->sc->default_clock_class) {
+ bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
+ }
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
- bt_self_component *self_comp)
-{
- struct ctf_fs_component *ctf_fs;
+ bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
- ctf_fs = g_new0(struct ctf_fs_component, 1);
- if (!ctf_fs) {
- goto error;
- }
-
- ctf_fs->log_level = log_level;
- ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy_notifier);
- if (!ctf_fs->port_data) {
- goto error;
+ 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&) {
+ return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
}
-
- goto end;
-
-error:
- ctf_fs_destroy(ctf_fs);
- ctf_fs = NULL;
-
-end:
- return ctf_fs;
}
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)))};
}
-gchar *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->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 g_string_free(name, FALSE);
+ return name.str();
}
static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
- struct ctf_fs_trace *ctf_fs_trace,
struct ctf_fs_ds_file_group *ds_file_group,
bt_self_component_source *self_comp_src)
{
- int ret = 0;
- struct ctf_fs_port_data *port_data = NULL;
- gchar *port_name;
- bt_logging_level log_level = ctf_fs->log_level;
- bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
+ const auto port_name = ctf_fs_make_port_name(ds_file_group);
+ auto port_data = bt2s::make_unique<ctf_fs_port_data>();
- port_name = ctf_fs_make_port_name(ds_file_group);
- if (!port_name) {
- goto error;
- }
-
- BT_COMP_LOGI("Creating one port named `%s`", port_name);
-
- /* Create output port for this file */
- port_data = g_new0(struct ctf_fs_port_data, 1);
- if (!port_data) {
- goto error;
- }
+ BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name);
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, port_data, 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;
}
- g_ptr_array_add(ctf_fs->port_data, port_data);
- port_data = NULL;
- goto end;
-
-error:
- ret = -1;
-
-end:
- g_free(port_name);
-
- port_data_destroy(port_data);
- return ret;
+ ctf_fs->port_data.emplace_back(std::move(port_data));
+ 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;
- size_t i;
- bt_logging_level log_level = ctf_fs_trace->log_level;
- bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
-
/* Create one output port for each stream file group */
- for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
- struct ctf_fs_ds_file_group *ds_file_group =
- (struct ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
-
- ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace, ds_file_group, self_comp_src);
+ for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) {
+ int ret = create_one_port_for_trace(ctf_fs, ds_file_group.get(), self_comp_src);
if (ret) {
- BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create output port.");
- goto end;
- }
- }
-
-end:
- return ret;
-}
-
-static void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info)
-{
- if (!ds_file_info) {
- return;
- }
-
- if (ds_file_info->path) {
- g_string_free(ds_file_info->path, TRUE);
- }
-
- g_free(ds_file_info);
-}
-
-static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
-{
- struct ctf_fs_ds_file_info *ds_file_info;
-
- ds_file_info = g_new0(struct ctf_fs_ds_file_info, 1);
- if (!ds_file_info) {
- goto end;
- }
-
- ds_file_info->path = g_string_new(path);
- if (!ds_file_info->path) {
- ctf_fs_ds_file_info_destroy(ds_file_info);
- ds_file_info = NULL;
- goto end;
- }
-
- ds_file_info->begin_ns = begin_ns;
-
-end:
- return ds_file_info;
-}
-
-static void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
-{
- if (!ds_file_group) {
- return;
- }
-
- if (ds_file_group->ds_file_infos) {
- g_ptr_array_free(ds_file_group->ds_file_infos, TRUE);
- }
-
- ctf_fs_ds_index_destroy(ds_file_group->index);
-
- bt_stream_put_ref(ds_file_group->stream);
- g_free(ds_file_group);
-}
-
-static struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace,
- struct ctf_stream_class *sc,
- uint64_t stream_instance_id,
- struct ctf_fs_ds_index *index)
-{
- struct ctf_fs_ds_file_group *ds_file_group;
-
- ds_file_group = g_new0(struct ctf_fs_ds_file_group, 1);
- if (!ds_file_group) {
- goto error;
- }
-
- ds_file_group->ds_file_infos =
- g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_file_info_destroy);
- if (!ds_file_group->ds_file_infos) {
- goto error;
- }
-
- ds_file_group->index = index;
-
- ds_file_group->stream_id = stream_instance_id;
- BT_ASSERT(sc);
- ds_file_group->sc = sc;
- ds_file_group->ctf_fs_trace = ctf_fs_trace;
- goto end;
-
-error:
- ctf_fs_ds_file_group_destroy(ds_file_group);
- ctf_fs_ds_index_destroy(index);
- ds_file_group = NULL;
-
-end:
- return ds_file_group;
-}
-
-/* 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;
-}
-
-/*
- * Insert ds_file_info in ds_file_group's list of ds_file_infos at the right
- * place to keep it sorted.
- */
-
-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)
-{
- 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);
-
- if (ds_file_info->begin_ns < other_ds_file_info->begin_ns) {
- break;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create output port.");
+ return ret;
}
}
- array_insert(ds_file_group->ds_file_infos, ds_file_info, i);
+ return 0;
}
-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->packet_size != right->packet_size) {
+ 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)
+static void ds_index_insert_ds_index_entry_sorted(ctf_fs_ds_index& index,
+ 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 {
- g_free(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(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);
}
}
static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const char *path)
{
- int64_t stream_instance_id = -1;
- int64_t begin_ns = -1;
- struct ctf_fs_ds_file_group *ds_file_group = NULL;
- bool add_group = false;
- 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 ctf_msg_iter *msg_iter = NULL;
- struct ctf_stream_class *sc = NULL;
- struct ctf_msg_iter_packet_properties props;
- bt_logging_level log_level = ctf_fs_trace->log_level;
- bt_self_component *self_comp = ctf_fs_trace->self_comp;
- bt_self_component_class *self_comp_class = ctf_fs_trace->self_comp_class;
-
/*
* 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, log_level);
+ 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(log_level) * 8,
- ctf_fs_ds_file_medops, ds_file, log_level, self_comp, NULL);
+ ctf_msg_iter_up 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.get(), nullptr, ctf_fs_trace->logger);
if (!msg_iter) {
- BT_COMP_LOGE_STR("Cannot create a CTF message iterator.");
- goto error;
+ BT_CPPLOGE_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator.");
+ 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);
+ ctf_msg_iter_packet_properties props;
+ int ret = ctf_msg_iter_get_packet_properties(msg_iter.get(), &props);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Cannot get stream file's first packet's header and context fields (`%s`).", path);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(
+ ctf_fs_trace->logger,
+ "Cannot get stream file's first packet's header and context fields (`{}`).", path);
+ return ret;
}
- sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props.stream_class_id);
+ ctf_stream_class *sc =
+ ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props.stream_class_id);
BT_ASSERT(sc);
- stream_instance_id = props.data_stream_id;
+ int64_t stream_instance_id = props.data_stream_id;
+ int64_t begin_ns = -1;
if (props.snapshots.beginning_clock != UINT64_C(-1)) {
BT_ASSERT(sc->default_clock_class);
sc->default_clock_class->offset_seconds, sc->default_clock_class->offset_cycles,
&begin_ns);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Cannot convert clock cycles to nanoseconds from origin (`%s`).", path);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(
+ ctf_fs_trace->logger,
+ "Cannot convert clock cycles to nanoseconds from origin (`{}`).", path);
+ return ret;
}
}
- ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns);
+ ctf_fs_ds_file_info::UP 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_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to index CTF stream file \'%s\'",
- ds_file->file->path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
+ ds_file->file->path);
+ return -1;
}
if (begin_ns == -1) {
* there's no timestamp to order the file within its
* group.
*/
- ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), index);
- /* Ownership of index is transferred. */
- index = NULL;
-
- if (!ds_file_group) {
- goto error;
- }
-
- ds_file_group_insert_ds_file_info_sorted(ds_file_group, BT_MOVE_REF(ds_file_info));
-
- add_group = true;
- goto end;
+ ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ ctf_fs_trace, sc, UINT64_C(-1), std::move(*index)));
+ ctf_fs_trace->ds_file_groups.back()->insert_ds_file_info_sorted(std::move(ds_file_info));
+ return 0;
}
BT_ASSERT(stream_instance_id != -1);
BT_ASSERT(begin_ns != -1);
/* Find an existing stream file group with this ID */
- for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
- ds_file_group =
- (struct ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
-
- if (ds_file_group->sc == sc && ds_file_group->stream_id == stream_instance_id) {
+ ctf_fs_ds_file_group *ds_file_group = NULL;
+ for (const auto& candidate : ctf_fs_trace->ds_file_groups) {
+ if (candidate->sc == sc && candidate->stream_id == stream_instance_id) {
+ ds_file_group = candidate.get();
break;
}
-
- ds_file_group = NULL;
}
if (!ds_file_group) {
- ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, index);
- /* Ownership of index is transferred. */
- index = NULL;
- if (!ds_file_group) {
- goto error;
- }
-
- add_group = true;
+ ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ ctf_fs_trace, sc, static_cast<std::uint64_t>(stream_instance_id), std::move(*index)));
+ ds_file_group = ctf_fs_trace->ds_file_groups.back().get();
} 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));
+ ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info));
- goto end;
-
-error:
- ctf_fs_ds_file_group_destroy(ds_file_group);
- ds_file_group = NULL;
- ret = -1;
-
-end:
- if (add_group && ds_file_group) {
- g_ptr_array_add(ctf_fs_trace->ds_file_groups, ds_file_group);
- }
-
- 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;
- bt_logging_level log_level = ctf_fs_trace->log_level;
- bt_self_component *self_comp = ctf_fs_trace->self_comp;
- bt_self_component_class *self_comp_class = ctf_fs_trace->self_comp_class;
-
/* Check each file in the path directory, except specific ones */
- dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
+ GError *error = NULL;
+ const bt2c::GDirUP dir {g_dir_open(ctf_fs_trace->path.c_str(), 0, &error)};
if (!dir) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class, "Cannot open directory `%s`: %s (code %d)",
- ctf_fs_trace->path->str, error->message, error->code);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
+ "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 (const char *basename = g_dir_read_name(dir.get())) {
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);
+ BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
+ "Ignoring metadata file `{}" G_DIR_SEPARATOR_S "{}`",
+ ctf_fs_trace->path, basename);
continue;
}
if (basename[0] == '.') {
- BT_COMP_LOGI("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`",
- ctf_fs_trace->path->str, basename);
+ BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
+ "Ignoring hidden file `{}" G_DIR_SEPARATOR_S "{}`", ctf_fs_trace->path,
+ basename);
continue;
}
/* Create the file. */
- file = ctf_fs_file_create(log_level, self_comp);
- if (!file) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%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_COMP_LOGI("Ignoring non-regular file `%s`", 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_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class, "Cannot open stream file `%s`", file->path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot open stream file `{}`",
+ file.path);
+ return ret;
}
- if (file->size == 0) {
+ if (file.size == 0) {
/* Skip empty stream. */
- BT_COMP_LOGI("Ignoring empty file `%s`", 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_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class, "Cannot add stream file `%s` to stream file group",
- file->path->str);
- ctf_fs_file_destroy(file);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
+ "Cannot add stream file `{}` to stream file group",
+ 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, bt_logging_level log_level,
- bt_self_component *self_comp)
+static void set_trace_name(const bt2::Trace trace, const char *name_suffix)
{
- int ret = 0;
- const bt_value *val;
- GString *name;
-
- name = g_string_new(NULL);
- if (!name) {
- BT_COMP_LOGE_STR("Failed to allocate a GString.");
- ret = -1;
- goto end;
- }
+ std::string name;
/*
* Check if we have a trace environment string value named `hostname`.
* If so, use it as the trace name's prefix.
*/
- 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));
+ const auto val = trace.environmentEntry("hostname");
+ if (val && val->isString()) {
+ name += val->asString().value();
if (name_suffix) {
- g_string_append_c(name, G_DIR_SEPARATOR);
+ name += G_DIR_SEPARATOR;
}
}
if (name_suffix) {
- g_string_append(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);
+ name += name_suffix;
}
- return ret;
+ trace.name(name);
}
-static struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component *self_comp,
- bt_self_component_class *self_comp_class,
- const char *path, const char *name,
- struct ctf_fs_metadata_config *metadata_config,
- bt_logging_level log_level)
+static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name,
+ const ctf::src::ClkClsCfg& clkClsCfg,
+ bt_self_component *selfComp,
+ const bt2c::Logger& parentLogger)
{
- struct ctf_fs_trace *ctf_fs_trace;
- int ret;
-
- /* Only one of them must be set. */
- BT_ASSERT(!self_comp != !self_comp_class);
-
- ctf_fs_trace = g_new0(struct ctf_fs_trace, 1);
- if (!ctf_fs_trace) {
- goto end;
- }
-
- ctf_fs_trace->log_level = log_level;
- ctf_fs_trace->self_comp = self_comp;
- ctf_fs_trace->self_comp_class = self_comp_class;
- ctf_fs_trace->path = g_string_new(path);
- if (!ctf_fs_trace->path) {
- goto error;
- }
-
- ctf_fs_trace->metadata = g_new0(struct ctf_fs_metadata, 1);
- if (!ctf_fs_trace->metadata) {
- goto error;
- }
-
- ctf_fs_metadata_init(ctf_fs_trace->metadata);
- ctf_fs_trace->ds_file_groups =
- g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_file_group_destroy);
- if (!ctf_fs_trace->ds_file_groups) {
- goto error;
- }
+ 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>();
- ret = ctf_fs_metadata_set_trace_class(self_comp, ctf_fs_trace, metadata_config);
+ 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);
- if (ret) {
- goto error;
- }
+ ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, *ctf_fs_trace->trace);
- ret = set_trace_name(ctf_fs_trace->trace, name, log_level, self_comp);
- if (ret) {
- goto error;
- }
+ set_trace_name(*ctf_fs_trace->trace, name);
}
- ret = create_ds_file_groups(ctf_fs_trace);
+ ret = create_ds_file_groups(ctf_fs_trace.get());
if (ret) {
- goto error;
+ return nullptr;
}
- goto end;
-
-error:
- ctf_fs_trace_destroy(ctf_fs_trace);
- ctf_fs_trace = NULL;
-
-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. */
static int ctf_fs_component_create_ctf_fs_trace_one_path(struct ctf_fs_component *ctf_fs,
const char *path_param,
- const char *trace_name, GPtrArray *traces,
- bt_self_component *self_comp,
- bt_self_component_class *self_comp_class)
+ const char *trace_name,
+ std::vector<ctf_fs_trace::UP>& traces,
+ bt_self_component *selfComp)
{
- struct ctf_fs_trace *ctf_fs_trace;
- int ret;
- GString *norm_path;
- bt_logging_level log_level = ctf_fs->log_level;
-
- norm_path = bt_common_normalize_path(path_param, NULL);
+ bt2c::GStringUP norm_path {bt_common_normalize_path(path_param, NULL)};
if (!norm_path) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to normalize path: `%s`.", path_param);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to normalize path: `{}`.", path_param);
+ return -1;
}
- ret = path_is_ctf_trace(norm_path->str);
+ int ret = path_is_ctf_trace(norm_path->str);
if (ret < 0) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to check if path is a CTF trace: path=%s",
- norm_path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(
+ ctf_fs->logger, "Failed to check if path is a CTF trace: path={}", norm_path->str);
+ return ret;
} else if (ret == 0) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Path is not a CTF trace (does not contain a metadata file): `%s`.", norm_path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(
+ ctf_fs->logger, "Path is not a CTF trace (does not contain a metadata file): `{}`.",
+ norm_path->str);
+ return -1;
}
// FIXME: Remove or ifdef for __MINGW32__
if (strcmp(norm_path->str, "/") == 0) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Opening a trace in `/` is not supported.");
- ret = -1;
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Opening a trace in `/` is not supported.");
+ return -1;
}
- ctf_fs_trace = ctf_fs_trace_create(self_comp, self_comp_class, norm_path->str, trace_name,
- &ctf_fs->metadata_config, log_level);
+ ctf_fs_trace::UP ctf_fs_trace = ctf_fs_trace_create(
+ norm_path->str, trace_name, ctf_fs->clkClsCfg, selfComp, ctf_fs->logger);
if (!ctf_fs_trace) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Cannot create trace for `%s`.", norm_path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create trace for `{}`.",
+ norm_path->str);
+ return -1;
}
- g_ptr_array_add(traces, ctf_fs_trace);
- ctf_fs_trace = NULL;
-
- ret = 0;
- goto end;
+ traces.emplace_back(std::move(ctf_fs_trace));
-error:
- ret = -1;
-
-end:
- if (norm_path) {
- g_string_free(norm_path, TRUE);
- }
-
- return ret;
+ return 0;
}
/*
static unsigned int metadata_count_stream_and_event_classes(struct ctf_fs_trace *trace)
{
unsigned int num = trace->metadata->tc->stream_classes->len;
- guint i;
- for (i = 0; i < trace->metadata->tc->stream_classes->len; i++) {
+ for (guint i = 0; i < trace->metadata->tc->stream_classes->len; i++) {
struct ctf_stream_class *sc =
(struct ctf_stream_class *) trace->metadata->tc->stream_classes->pdata[i];
num += sc->event_classes->len;
*/
static void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest,
- struct ctf_fs_ds_file_group *src)
+ 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) {
+ dest->insert_ds_file_info_sorted(std::move(ds_file_info));
}
/* Merge both indexes. */
merge_ctf_fs_ds_indexes(dest->index, src->index);
}
+
/* Merge src_trace's data stream file groups into dest_trace's. */
static int merge_matching_ctf_fs_ds_file_groups(struct ctf_fs_trace *dest_trace,
- struct ctf_fs_trace *src_trace)
+ ctf_fs_trace::UP src_trace)
{
- GPtrArray *dest = dest_trace->ds_file_groups;
- GPtrArray *src = src_trace->ds_file_groups;
- guint s_i;
- int ret = 0;
+ 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;
/*
* Save the initial length of dest: we only want to check against the
* original elements in the inner loop.
*/
- const guint dest_len = dest->len;
+ size_t dest_len = dest.size();
- for (s_i = 0; s_i < src->len; s_i++) {
- struct ctf_fs_ds_file_group *src_group =
- (struct ctf_fs_ds_file_group *) g_ptr_array_index(src, s_i);
+ for (auto& src_group : src) {
struct ctf_fs_ds_file_group *dest_group = NULL;
/* A stream instance without ID can't match a stream in the other trace. */
if (src_group->stream_id != -1) {
- guint d_i;
-
/* Let's search for a matching ds_file_group in the destination. */
- for (d_i = 0; d_i < dest_len; d_i++) {
- struct ctf_fs_ds_file_group *candidate_dest =
- (struct ctf_fs_ds_file_group *) g_ptr_array_index(dest, d_i);
+ for (size_t d_i = 0; d_i < dest_len; ++d_i) {
+ ctf_fs_ds_file_group *candidate_dest = dest[d_i].get();
/* Can't match a stream instance without ID. */
if (candidate_dest->stream_id == -1) {
* trace chunk.
*/
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);
+ ctf_stream_class *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->log_level, dest_trace->self_comp);
- if (!index) {
- ret = -1;
- goto end;
- }
-
- dest_group = ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, index);
- /* Ownership of index is transferred. */
- index = NULL;
- if (!dest_group) {
- ret = -1;
- goto end;
- }
-
- g_ptr_array_add(dest_trace->ds_file_groups, dest_group);
+ dest_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ dest_trace, sc, src_group->stream_id, ctf_fs_ds_index {}));
+ dest_group = dest_trace->ds_file_groups.back().get();
}
BT_ASSERT(dest_group);
- merge_ctf_fs_ds_file_groups(dest_group, src_group);
+ merge_ctf_fs_ds_file_groups(dest_group, std::move(src_group));
}
-end:
- return ret;
+ return 0;
}
/*
* one.
*
* The trace with the most expansive metadata is chosen and all other traces
- * are merged into that one. The array slots of all the traces that get merged
- * in the chosen one are set to NULL, so only the slot of the chosen trace
- * remains non-NULL.
+ * are merged into that one. On return, the elements of `traces` are nullptr
+ * and the merged trace is placed in `out_trace`.
*/
-static int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces,
- struct ctf_fs_trace **out_trace)
+static int merge_ctf_fs_traces(std::vector<ctf_fs_trace::UP> traces, ctf_fs_trace::UP& out_trace)
{
- unsigned int winner_count;
- struct ctf_fs_trace *winner;
- guint i, winner_i;
- int ret = 0;
-
- BT_ASSERT(num_traces >= 2);
+ BT_ASSERT(traces.size() >= 2);
- winner_count = metadata_count_stream_and_event_classes(traces[0]);
- winner = traces[0];
- winner_i = 0;
+ unsigned int winner_count = metadata_count_stream_and_event_classes(traces[0].get());
+ ctf_fs_trace *winner = traces[0].get();
+ guint winner_i = 0;
/* Find the trace with the largest metadata. */
- for (i = 1; i < num_traces; i++) {
- struct ctf_fs_trace *candidate;
+ for (guint i = 1; i < traces.size(); i++) {
+ ctf_fs_trace *candidate = traces[i].get();
unsigned int candidate_count;
- candidate = traces[i];
-
/* A bit of sanity check. */
BT_ASSERT(bt_uuid_compare(winner->metadata->tc->uuid, candidate->metadata->tc->uuid) == 0);
}
/* Merge all the other traces in the winning trace. */
- for (i = 0; i < num_traces; i++) {
- struct ctf_fs_trace *trace = traces[i];
-
+ for (ctf_fs_trace::UP& trace : traces) {
/* Don't merge the winner into itself. */
- if (trace == winner) {
+ if (trace.get() == winner) {
continue;
}
/* Merge trace's data stream file groups into winner's. */
- ret = merge_matching_ctf_fs_ds_file_groups(winner, trace);
+ int ret = merge_matching_ctf_fs_ds_file_groups(winner, std::move(trace));
if (ret) {
- goto end;
+ return ret;
}
}
/*
* Move the winner out of the array, into `*out_trace`.
*/
- *out_trace = winner;
- traces[winner_i] = NULL;
+ 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;
- 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(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, log_level);
+ 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_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create a ctf_fs_ds_file");
- ret = -1;
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to create a ctf_fs_ds_file");
+ return -1;
}
BT_ASSERT(ctf_fs_trace->metadata);
BT_ASSERT(ctf_fs_trace->metadata->tc);
- msg_iter =
- ctf_msg_iter_create(ctf_fs_trace->metadata->tc, bt_common_get_page_size(log_level) * 8,
- ctf_fs_ds_file_medops, ds_file, log_level, self_comp, NULL);
+ ctf_msg_iter_up 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.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);
+ enum ctf_msg_iter_status 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_COMP_LOGE_APPEND_CAUSE(self_comp, "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);
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
+ "Failed to convert clock snapshot to timestamp");
+ 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,
*
* 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.
+ * 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.
+ * 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
*/
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 =
- (struct ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_i);
-
+ for (const auto& ds_file_group : trace->ds_file_groups) {
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;
+ ctf_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_COMP_LOGE_APPEND_CAUSE(
- trace->self_comp,
+ 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;
- 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;
- ctf_fs_ds_file_group *ds_file_group =
- (ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_i);
+ for (const auto& ds_file_group : trace->ds_file_groups) {
+ auto& index = ds_file_group->index;
- 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(!index.entries.empty());
BT_ASSERT(ds_file_group->sc->default_clock_class);
- default_cc = ds_file_group->sc->default_clock_class;
+ ctf_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_COMP_LOGE_APPEND_CAUSE(trace->self_comp,
- "Failed to decode first event's clock snapshot");
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
+ "Failed to decode first event's clock snapshot");
+ 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;
- 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;
+ for (const auto& ds_file_group : trace->ds_file_groups) {
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index *index;
-
- ctf_fs_ds_file_group *ds_file_group =
- (ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_idx);
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_COMP_LOGE_APPEND_CAUSE(trace->self_comp,
- "Failed to decode last event's clock snapshot");
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
+ "Failed to decode last event's clock snapshot");
+ 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 */
memset(current_tracer_info, 0, sizeof(*current_tracer_info));
* 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");
+ ctf_trace_class_env_entry *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)
* 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,
- bt_self_component *self_comp,
- bt_self_component_class *self_comp_class)
+static int fix_packet_index_tracer_bugs(ctf_fs_trace *trace)
{
- int ret = 0;
struct tracer_info current_tracer_info;
- bt_logging_level log_level = ctf_fs->log_level;
- ret = extract_tracer_info(ctf_fs->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_LOGI_STR("Cannot extract tracer information necessary to compare with buggy versions.");
- goto end;
- ;
+ BT_CPPLOGI_SPEC(
+ trace->logger,
+ "Cannot extract tracer information necessary to compare with buggy versions.");
+ return 0;
}
/* Check if the trace may be affected by old tracer bugs. */
if (is_tracer_affected_by_lttng_event_after_packet_bug(¤t_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(ctf_fs->trace);
+ BT_CPPLOGI_SPEC(trace->logger,
+ "Trace may be affected by LTTng tracer packet timestamp bug. Fixing up.");
+ ret = fix_index_lttng_event_after_packet_bug(trace);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to fix LTTng event-after-packet bug.");
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
+ "Failed to fix LTTng event-after-packet bug.");
+ return ret;
}
- ctf_fs->trace->metadata->tc->quirks.lttng_event_after_packet = true;
+ trace->metadata->tc->quirks.lttng_event_after_packet = true;
}
if (is_tracer_affected_by_barectf_event_before_packet_bug(¤t_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(ctf_fs->trace);
+ BT_CPPLOGI_SPEC(trace->logger,
+ "Trace may be affected by barectf tracer packet timestamp bug. Fixing up.");
+ ret = fix_index_barectf_event_before_packet_bug(trace);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class, "Failed to fix barectf event-before-packet bug.");
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
+ "Failed to fix barectf event-before-packet bug.");
+ return ret;
}
- ctf_fs->trace->metadata->tc->quirks.barectf_event_before_packet = true;
+ trace->metadata->tc->quirks.barectf_event_before_packet = true;
}
if (is_tracer_affected_by_lttng_crash_quirk(¤t_tracer_info)) {
- ret = fix_index_lttng_crash_quirk(ctf_fs->trace);
+ ret = fix_index_lttng_crash_quirk(trace);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to fix lttng-crash timestamp quirks.");
- goto end;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
+ "Failed to fix lttng-crash timestamp quirks.");
+ return ret;
}
- ctf_fs->trace->metadata->tc->quirks.lttng_crash = true;
+ trace->metadata->tc->quirks.lttng_crash = true;
}
-end:
- return ret;
+ return 0;
}
-static gint compare_ds_file_groups_by_first_path(gconstpointer a, gconstpointer b)
+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)
{
- ctf_fs_ds_file_group * const *ds_file_group_a = (ctf_fs_ds_file_group **) a;
- ctf_fs_ds_file_group * const *ds_file_group_b = (ctf_fs_ds_file_group **) b;
+ BT_ASSERT(!ds_file_group_a->ds_file_infos.empty());
+ BT_ASSERT(!ds_file_group_b->ds_file_infos.empty());
- BT_ASSERT((*ds_file_group_a)->ds_file_infos->len > 0);
- BT_ASSERT((*ds_file_group_b)->ds_file_infos->len > 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];
- 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];
-
- return strcmp(first_ds_file_info_a->path->str, first_ds_file_info_b->path->str);
-}
-
-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 *paths_value,
- const bt_value *trace_name_value,
- bt_self_component *self_comp,
- bt_self_component_class *self_comp_class)
+ const bt2::ConstArrayValue pathsValue,
+ const char *traceName, bt_self_component *selfComp)
{
- int ret = 0;
- uint64_t i;
- bt_logging_level log_level = ctf_fs->log_level;
- GPtrArray *paths = NULL;
- GPtrArray *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));
-
- traces = g_ptr_array_new_with_free_func(ctf_fs_trace_destroy_notifier);
- if (!traces) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to allocate a GPtrArray.");
- goto error;
- }
-
- paths = g_ptr_array_new_with_free_func(g_free);
- if (!paths) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to allocate a GPtrArray.");
- goto error;
- }
+ std::vector<std::string> paths;
- trace_name = trace_name_value ? bt_value_string_get(trace_name_value) : NULL;
+ BT_ASSERT(!pathsValue.isEmpty());
/*
* 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++) {
- 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_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to copy a string.");
- goto error;
- }
-
- g_ptr_array_add(paths, input_copy);
+ for (const auto pathValue : pathsValue) {
+ BT_ASSERT(pathValue.isString());
+ paths.emplace_back(pathValue.asString().value().str());
}
- 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,
- self_comp, self_comp_class);
+ std::vector<ctf_fs_trace::UP> traces;
+ for (const auto& path : paths) {
+ int ret = ctf_fs_component_create_ctf_fs_trace_one_path(ctf_fs, path.c_str(), traceName,
+ traces, selfComp);
if (ret) {
- goto end;
+ return ret;
}
}
- if (traces->len > 1) {
- struct ctf_fs_trace *first_trace = (struct ctf_fs_trace *) traces->pdata[0];
+ if (traces.size() > 1) {
+ ctf_fs_trace *first_trace = traces[0].get();
const uint8_t *first_trace_uuid = first_trace->metadata->tc->uuid;
- struct ctf_fs_trace *trace;
/*
* We have more than one trace, they must all share the same
* UUID, verify that.
*/
- for (i = 0; i < traces->len; i++) {
- struct ctf_fs_trace *this_trace = (struct ctf_fs_trace *) traces->pdata[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;
if (!this_trace->metadata->tc->is_uuid_set) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Multiple traces given, but a trace does not have a UUID: path=%s",
- this_trace->path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(
+ ctf_fs->logger,
+ "Multiple traces given, but a trace does not have a UUID: path={}",
+ this_trace->path);
+ return -1;
}
if (bt_uuid_compare(first_trace_uuid, this_trace_uuid) != 0) {
bt_uuid_to_str(first_trace_uuid, first_trace_uuid_str);
bt_uuid_to_str(this_trace_uuid, this_trace_uuid_str);
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(
- self_comp, self_comp_class,
- "Multiple traces given, but UUIDs don't match: "
- "first-trace-uuid=%s, first-trace-path=%s, "
- "trace-uuid=%s, trace-path=%s",
- first_trace_uuid_str, first_trace->path->str, this_trace_uuid_str,
- this_trace->path->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger,
+ "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,
+ this_trace_uuid_str, this_trace->path);
+ return -1;
}
}
- ret = merge_ctf_fs_traces((struct ctf_fs_trace **) traces->pdata, traces->len, &trace);
+ int ret = merge_ctf_fs_traces(std::move(traces), ctf_fs->trace);
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to merge traces with the same UUID.");
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger,
+ "Failed to merge traces with the same UUID.");
+ return ret;
}
-
- ctf_fs->trace = trace;
} else {
/* Just one trace, it may or may not have a UUID, both are fine. */
- ctf_fs->trace = (ctf_fs_trace *) traces->pdata[0];
- traces->pdata[0] = NULL;
+ ctf_fs->trace = std::move(traces[0]);
}
- ret = fix_packet_index_tracer_bugs(ctf_fs, self_comp, self_comp_class);
+ int ret = fix_packet_index_tracer_bugs(ctf_fs->trace.get());
if (ret) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
- "Failed to fix packet index tracer bugs.");
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to fix packet index tracer bugs.");
+ return ret;
}
/*
* Having a deterministic order here can help debugging and
* testing.
*/
- g_ptr_array_sort(ctf_fs->trace->ds_file_groups, compare_ds_file_groups_by_first_path);
- goto end;
-error:
- ret = -1;
-
-end:
- if (traces) {
- g_ptr_array_free(traces, TRUE);
- }
+ std::sort(ctf_fs->trace->ds_file_groups.begin(), ctf_fs->trace->ds_file_groups.end(),
+ compare_ds_file_groups_by_first_path);
- 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->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;
- guint i;
- bt_logging_level log_level = ctf_fs_trace->log_level;
- bt_self_component *self_comp = ctf_fs_trace->self_comp;
-
- for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
- ctf_fs_ds_file_group *ds_file_group =
- (ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
- name = get_stream_instance_unique_name(ds_file_group);
-
- if (!name) {
- goto error;
- }
+ for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) {
+ const std::string& name = get_stream_instance_unique_name(ds_file_group.get());
- if (ds_file_group->sc->ir_sc) {
- BT_ASSERT(ctf_fs_trace->trace);
-
- 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);
- 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);
- }
- } else {
- ds_file_group->stream = NULL;
- }
+ BT_ASSERT(ds_file_group->sc->ir_sc);
+ BT_ASSERT(ctf_fs_trace->trace);
- if (!ds_file_group->stream) {
- BT_COMP_LOGE_APPEND_CAUSE(self_comp,
- "Cannot create stream for DS file group: "
- "addr=%p, stream-name=\"%s\"",
- ds_file_group, name->str);
- goto error;
+ const bt2::StreamClass sc {ds_file_group->sc->ir_sc};
+
+ if (ds_file_group->stream_id == UINT64_C(-1)) {
+ /* No stream ID: use 0 */
+ ds_file_group->stream =
+ sc.instantiate(*ctf_fs_trace->trace, ctf_fs_trace->next_stream_id);
+ ctf_fs_trace->next_stream_id++;
+ } else {
+ /* Specific stream ID */
+ ds_file_group->stream = sc.instantiate(*ctf_fs_trace->trace, ds_file_group->stream_id);
}
- ret = bt_stream_set_name(ds_file_group->stream, name->str);
+ int ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name.c_str());
if (ret) {
- BT_COMP_LOGE_APPEND_CAUSE(self_comp,
- "Cannot set stream's name: "
- "addr=%p, stream-name=\"%s\"",
- ds_file_group->stream, name->str);
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
+ "Cannot set stream's name: "
+ "addr={}, stream-name=\"{}\"",
+ 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 =
bt_param_validation_value_descr::makeBool()},
BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END};
-bool read_src_fs_parameters(const bt_value *params, const bt_value **inputs,
- const bt_value **trace_name, struct ctf_fs_component *ctf_fs,
- bt_self_component *self_comp, bt_self_component_class *self_comp_class)
+ctf::src::fs::Parameters read_src_fs_parameters(const bt2::ConstMapValue params,
+ const bt2c::Logger& logger)
{
- bool ret;
- const bt_value *value;
- bt_logging_level log_level = ctf_fs->log_level;
- enum bt_param_validation_status validate_value_status;
gchar *error = NULL;
+ bt_param_validation_status validate_value_status =
+ bt_param_validation_validate(params.libObjPtr(), fs_params_entries_descr, &error);
- validate_value_status = bt_param_validation_validate(params, fs_params_entries_descr, &error);
if (validate_value_status != BT_PARAM_VALIDATION_STATUS_OK) {
- BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class, "%s", error);
- ret = false;
- goto end;
+ bt2c::GCharUP errorFreer {error};
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2c::Error, "{}", error);
}
- /* inputs parameter */
- *inputs = bt_value_map_borrow_entry_value_const(params, "inputs");
+ ctf::src::fs::Parameters parameters {params["inputs"]->asArray()};
/* clock-class-offset-s parameter */
- value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-s");
- if (value) {
- ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_signed_get(value);
+ if (const auto clockClassOffsetS = params["clock-class-offset-s"]) {
+ parameters.clkClsCfg.offsetSec = clockClassOffsetS->asSignedInteger().value();
}
/* clock-class-offset-ns parameter */
- value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-ns");
- if (value) {
- ctf_fs->metadata_config.clock_class_offset_ns = bt_value_integer_signed_get(value);
+ if (const auto clockClassOffsetNs = params["clock-class-offset-ns"]) {
+ parameters.clkClsCfg.offsetNanoSec = clockClassOffsetNs->asSignedInteger().value();
}
/* force-clock-class-origin-unix-epoch parameter */
- value = bt_value_map_borrow_entry_value_const(params, "force-clock-class-origin-unix-epoch");
- if (value) {
- ctf_fs->metadata_config.force_clock_class_origin_unix_epoch = bt_value_bool_get(value);
+ if (const auto forceClockClassOriginUnixEpoch = params["force-clock-class-origin-unix-epoch"]) {
+ parameters.clkClsCfg.forceOriginIsUnixEpoch =
+ forceClockClassOriginUnixEpoch->asBool().value();
}
/* trace-name parameter */
- *trace_name = bt_value_map_borrow_entry_value_const(params, "trace-name");
-
- ret = true;
+ if (const auto traceName = params["trace-name"]) {
+ parameters.traceName = traceName->asString().value().str();
+ }
-end:
- g_free(error);
- return ret;
+ return parameters;
}
-static struct ctf_fs_component *ctf_fs_create(const bt_value *params,
- bt_self_component_source *self_comp_src)
+static ctf_fs_component::UP ctf_fs_create(const bt2::ConstMapValue params,
+ bt_self_component_source *self_comp_src)
{
- struct ctf_fs_component *ctf_fs = NULL;
- const bt_value *inputs_value;
- const bt_value *trace_name_value;
bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
+ const bt2c::Logger logger {bt2::SelfSourceComponent {self_comp_src}, "PLUGIN/SRC.CTF.FS/COMP"};
+ const auto parameters = read_src_fs_parameters(params, logger);
+ auto ctf_fs = bt2s::make_unique<ctf_fs_component>(parameters.clkClsCfg, logger);
- ctf_fs = ctf_fs_component_create(
- bt_component_get_logging_level(bt_self_component_as_component(self_comp)), self_comp);
- if (!ctf_fs) {
- goto error;
- }
-
- if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value, ctf_fs, self_comp,
- NULL)) {
- goto error;
+ if (ctf_fs_component_create_ctf_fs_trace(
+ ctf_fs.get(), parameters.inputs,
+ parameters.traceName ? parameters.traceName->c_str() : nullptr, self_comp)) {
+ return nullptr;
}
- bt_self_component_set_data(self_comp, ctf_fs);
-
- if (ctf_fs_component_create_ctf_fs_trace(ctf_fs, inputs_value, trace_name_value, self_comp,
- NULL)) {
- goto error;
+ if (create_streams_for_trace(ctf_fs->trace.get())) {
+ return nullptr;
}
- if (create_streams_for_trace(ctf_fs->trace)) {
- goto error;
+ if (create_ports_for_trace(ctf_fs.get(), ctf_fs->trace.get(), self_comp_src)) {
+ return nullptr;
}
- if (create_ports_for_trace(ctf_fs, ctf_fs->trace, self_comp_src)) {
- goto error;
- }
-
- goto end;
-
-error:
- ctf_fs_destroy(ctf_fs);
- ctf_fs = NULL;
- bt_self_component_set_data(self_comp, NULL);
-
-end:
return ctf_fs;
}
-bt_component_class_initialize_method_status
-ctf_fs_init(bt_self_component_source *self_comp_src, bt_self_component_source_configuration *config,
- const bt_value *params, __attribute__((unused)) void *init_method_data)
+bt_component_class_initialize_method_status ctf_fs_init(bt_self_component_source *self_comp_src,
+ bt_self_component_source_configuration *,
+ const bt_value *params, void *)
{
- struct ctf_fs_component *ctf_fs;
- bt_component_class_initialize_method_status ret =
- BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
+ try {
+ bt_component_class_initialize_method_status ret =
+ BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
- ctf_fs = ctf_fs_create(params, self_comp_src);
- if (!ctf_fs) {
- ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
- }
+ ctf_fs_component::UP ctf_fs = ctf_fs_create(bt2::ConstMapValue {params}, self_comp_src);
+ if (!ctf_fs) {
+ ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
+ }
- return ret;
+ bt_self_component_set_data(bt_self_component_source_as_self_component(self_comp_src),
+ ctf_fs.release());
+ return ret;
+ } catch (const std::bad_alloc&) {
+ return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ } catch (const bt2::Error&) {
+ return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
+ }
}
-bt_component_class_query_method_status ctf_fs_query(bt_self_component_class_source *comp_class,
+bt_component_class_query_method_status ctf_fs_query(bt_self_component_class_source *comp_class_src,
bt_private_query_executor *priv_query_exec,
const char *object, const bt_value *params,
__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") == 0) {
- status = metadata_info_query(comp_class, params, log_level, result);
- } else if (strcmp(object, "babeltrace.trace-infos") == 0) {
- status = trace_infos_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_UNKNOWN_OBJECT;
- goto end;
+ try {
+ bt2c::Logger logger {bt2::SelfComponentClass {comp_class_src},
+ bt2::PrivateQueryExecutor {priv_query_exec},
+ "PLUGIN/SRC.CTF.FS/QUERY"};
+ bt2::ConstMapValue paramsObj(params);
+ bt2::Value::Shared resultObj;
+
+ if (strcmp(object, "metadata-info") == 0) {
+ resultObj = metadata_info_query(paramsObj, logger);
+ } else if (strcmp(object, "babeltrace.trace-infos") == 0) {
+ resultObj = trace_infos_query(paramsObj, logger);
+ } else if (!strcmp(object, "babeltrace.support-info")) {
+ resultObj = support_info_query(paramsObj, logger);
+ } else {
+ BT_CPPLOGE_SPEC(logger, "Unknown query object `{}`", object);
+ return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_UNKNOWN_OBJECT;
+ }
+
+ *result = resultObj.release().libObjPtr();
+
+ return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+ } catch (const std::bad_alloc&) {
+ return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_MEMORY_ERROR;
+ } catch (const bt2::Error&) {
+ return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
}
-end:
- return status;
}