#include "common/assert.h"
#include "common/common.h"
#include "common/uuid.h"
+#include "cpp-common/bt2s/make-unique.hpp"
#include "plugins/common/param-validation/param-validation.h"
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) {
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;
}
- ctf_fs_trace_destroy(ctf_fs->trace);
-
- if (ctf_fs->port_data) {
- g_ptr_array_free(ctf_fs->port_data, TRUE);
- }
-
delete ctf_fs;
}
ctf_fs_destroy(comp);
}
-static void port_data_destroy(struct ctf_fs_port_data *port_data)
-{
- if (!port_data) {
- return;
- }
-
- delete 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);
-}
-
ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
{
- ctf_fs_component::UP ctf_fs {new ctf_fs_component {parentLogger}};
-
- ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy_notifier);
- if (!ctf_fs->port_data) {
- goto error;
- }
-
- goto end;
-
-error:
- ctf_fs.reset();
-
-end:
- return ctf_fs;
+ return ctf_fs_component::UP {new ctf_fs_component {parentLogger}};
}
void ctf_fs_finalize(bt_self_component_source *component)
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);
+ g_string_append_printf(name, " | %s", ds_file_info->path.c_str());
}
return bt2c::GCharUP {g_string_free(name, FALSE)};
bt_self_component_source *self_comp_src)
{
int ret = 0;
- struct ctf_fs_port_data *port_data = NULL;
+ ctf_fs_port_data::UP port_data;
bt2c::GCharUP port_name = ctf_fs_make_port_name(ds_file_group);
if (!port_name) {
BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name.get());
/* Create output port for this file */
- port_data = new ctf_fs_port_data;
+ 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, NULL);
+ ret = bt_self_component_source_add_output_port(self_comp_src, port_name.get(), port_data.get(),
+ NULL);
if (ret) {
goto error;
}
- g_ptr_array_add(ctf_fs->port_data, port_data);
- port_data = NULL;
+ ctf_fs->port_data.emplace_back(std::move(port_data));
goto end;
error:
ret = -1;
end:
- port_data_destroy(port_data);
return ret;
}
bt_self_component_source *self_comp_src)
{
int ret = 0;
- size_t i;
/* 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, ds_file_group, self_comp_src);
+ 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);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create output port.");
goto 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);
- }
-
- delete ds_file_info;
-}
-
-static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
-{
- ctf_fs_ds_file_info *ds_file_info = new ctf_fs_ds_file_info;
- 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);
- delete 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)
-{
- ctf_fs_ds_file_group *ds_file_group = new ctf_fs_ds_file_group;
- 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)
{
static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left,
const struct ctf_fs_ds_index_entry *right)
{
- if (left->packet_size != right->packet_size) {
+ if (left->packetSize != right->packetSize) {
return false;
}
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;
+ ctf_fs_ds_file_group::UP new_ds_file_group;
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;
* 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);
+ 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;
- if (!ds_file_group) {
+ if (!new_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;
+ ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(),
+ BT_MOVE_REF(ds_file_info));
+ ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
goto end;
}
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) {
+ 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);
+ 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;
- if (!ds_file_group) {
+ if (!new_ds_file_group) {
goto error;
}
- add_group = true;
+ 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);
}
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);
return ret;
}
-static struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
- struct ctf_fs_metadata_config *metadata_config,
- bt_self_component *selfComp,
- const bt2c::Logger& parentLogger)
+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)
{
int ret;
- ctf_fs_trace *ctf_fs_trace = new struct ctf_fs_trace(parentLogger);
+ 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);
- 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;
- }
- ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace, metadata_config);
+ ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
if (ret) {
goto error;
}
}
}
- ret = create_ds_file_groups(ctf_fs_trace);
+ ret = create_ds_file_groups(ctf_fs_trace.get());
if (ret) {
goto error;
}
goto end;
error:
- ctf_fs_trace_destroy(ctf_fs_trace);
- ctf_fs_trace = NULL;
+ ctf_fs_trace.reset();
end:
return ctf_fs_trace;
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,
+ const char *trace_name,
+ std::vector<ctf_fs_trace::UP>& traces,
bt_self_component *selfComp)
{
- struct ctf_fs_trace *ctf_fs_trace;
+ ctf_fs_trace::UP ctf_fs_trace;
int ret;
GString *norm_path;
goto end;
}
- ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, &ctf_fs->metadata_config,
- selfComp, ctf_fs->logger);
+ ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, ctf_fs->clkClsCfg, selfComp,
+ ctf_fs->logger);
if (!ctf_fs_trace) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create trace for `{}`.",
norm_path->str);
goto error;
}
- g_ptr_array_add(traces, ctf_fs_trace);
- ctf_fs_trace = NULL;
+ traces.emplace_back(std::move(ctf_fs_trace));
ret = 0;
goto end;
*/
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;
/* 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;
+ 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
* 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) {
goto end;
}
- dest_group = ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, index);
+ auto new_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) {
+ if (!new_dest_group) {
ret = -1;
goto end;
}
- g_ptr_array_add(dest_trace->ds_file_groups, dest_group);
+ dest_group = new_dest_group.get();
+ dest_trace->ds_file_groups.emplace_back(std::move(new_dest_group));
}
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:
* 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_count = metadata_count_stream_and_event_classes(traces[0].get());
+ winner = traces[0].get();
winner_i = 0;
/* Find the trace with the largest metadata. */
- for (i = 1; i < num_traces; i++) {
- struct ctf_fs_trace *candidate;
+ for (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);
+ ret = merge_matching_ctf_fs_ds_file_groups(winner, std::move(trace));
if (ret) {
goto end;
}
/*
* 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;
ctf_msg_iter_set_dry_run(msg_iter, true);
/* Seek to the beginning of the target packet. */
- iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset);
+ iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset.bytes());
if (iter_status) {
/* ctf_msg_iter_seek() logs errors. */
ret = -1;
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;
- for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len; ds_file_group_i++) {
+ 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;
- 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);
-
BT_ASSERT(ds_file_group);
index = ds_file_group->index;
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;
- for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len; ds_file_group_i++) {
+ for (const auto& ds_file_group : trace->ds_file_groups) {
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);
-
struct ctf_fs_ds_index *index = ds_file_group->index;
BT_ASSERT(index);
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;
- for (ds_file_group_idx = 0; ds_file_group_idx < ds_file_groups->len; ds_file_group_idx++) {
+ 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;
- 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;
return ret;
}
-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->len > 0);
- BT_ASSERT((*ds_file_group_b)->ds_file_infos->len > 0);
+ BT_ASSERT(ds_file_group_a->ds_file_infos->len > 0);
+ BT_ASSERT(ds_file_group_b->ds_file_infos->len > 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 *) 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 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);
+ return first_ds_file_info_a->path < first_ds_file_info_b->path;
}
static gint compare_strings(gconstpointer p_a, gconstpointer p_b)
int ret = 0;
uint64_t i;
GPtrArray *paths = NULL;
- GPtrArray *traces;
+ 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));
- traces = g_ptr_array_new_with_free_func(ctf_fs_trace_destroy_notifier);
- if (!traces) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to allocate a GPtrArray.");
- goto error;
- }
-
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.");
}
}
- 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 (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) {
}
}
- ret = merge_ctf_fs_traces((struct ctf_fs_trace **) traces->pdata, traces->len, &trace);
+ 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;
}
-
- 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->trace);
+ 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.");
}
* 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);
+ 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 (traces) {
- g_ptr_array_free(traces, TRUE);
- }
-
if (paths) {
g_ptr_array_free(paths, TRUE);
}
*/
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);
+ g_string_assign(name, ds_file_info->path.c_str());
end:
return name;
{
int ret;
GString *name = NULL;
- guint i;
- 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);
+ 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;
}
- 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);
- }
+ BT_ASSERT(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 {
- ds_file_group->stream = NULL;
+ /* 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);
}
if (!ds_file_group->stream) {
/* 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);
+ ctf_fs->clkClsCfg.offsetSec = bt_value_integer_signed_get(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);
+ ctf_fs->clkClsCfg.offsetNanoSec = bt_value_integer_signed_get(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);
+ ctf_fs->clkClsCfg.forceOriginIsUnixEpoch = bt_value_bool_get(value);
}
/* trace-name parameter */
return nullptr;
}
- if (create_streams_for_trace(ctf_fs->trace)) {
+ if (create_streams_for_trace(ctf_fs->trace.get())) {
return nullptr;
}
- if (create_ports_for_trace(ctf_fs.get(), ctf_fs->trace, self_comp_src)) {
+ if (create_ports_for_trace(ctf_fs.get(), ctf_fs->trace.get(), self_comp_src)) {
return nullptr;
}
const bt_value **result)
{
try {
- bt_component_class_query_method_status status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
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) {
- status = metadata_info_query(params, logger, result);
+ resultObj = metadata_info_query(paramsObj, logger);
} else if (strcmp(object, "babeltrace.trace-infos") == 0) {
- status = trace_infos_query(params, logger, result);
+ resultObj = trace_infos_query(paramsObj, logger);
} else if (!strcmp(object, "babeltrace.support-info")) {
- status = support_info_query(params, logger, result);
+ resultObj = support_info_query(paramsObj, logger);
} else {
BT_CPPLOGE_SPEC(logger, "Unknown query object `{}`", object);
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_UNKNOWN_OBJECT;
- goto end;
+ return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_UNKNOWN_OBJECT;
}
-end:
- return status;
+
+ *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&) {
projects / babeltrace.git / blobdiff