static bt_message_iterator_class_next_method_status
ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
{
- bt_message_iterator_class_next_method_status status;
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;
switch (msg_iter_status) {
case CTF_MSG_ITER_STATUS_OK:
try {
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;
if (G_UNLIKELY(msg_iter_data->next_saved_error)) {
/*
}
bt_message_iterator_class_next_method_status status;
+ uint64_t i = 0;
do {
status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]);
bt_self_component_port_output *self_port)
{
try {
- struct ctf_fs_port_data *port_data;
- enum ctf_msg_iter_medium_status medium_status;
-
- port_data = (struct ctf_fs_port_data *) bt_self_component_port_get_data(
+ 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;
- 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);
+ 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);
return 0;
}
-/*
- * 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,
- ctf_fs_ds_file_info::UP ds_file_info)
+static bool ds_index_entries_equal(const ctf_fs_ds_index_entry& left,
+ const ctf_fs_ds_index_entry& right)
{
- /* Find the spot where to insert this ds_file_info. */
- auto it = ds_file_group->ds_file_infos.begin();
-
- for (; it != ds_file_group->ds_file_infos.end(); ++it) {
- const ctf_fs_ds_file_info& other_ds_file_info = **it;
-
- if (ds_file_info->begin_ns < other_ds_file_info.begin_ns) {
- break;
- }
- }
-
- ds_file_group->ds_file_infos.insert(it, std::move(ds_file_info));
-}
-
-static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left,
- const struct ctf_fs_ds_index_entry *right)
-{
- if (left->packetSize != right->packetSize) {
+ if (left.packetSize != right.packetSize) {
return false;
}
- if (left->timestamp_begin != right->timestamp_begin) {
+ if (left.timestamp_begin != right.timestamp_begin) {
return false;
}
- if (left->timestamp_end != right->timestamp_end) {
+ if (left.timestamp_end != right.timestamp_end) {
return false;
}
- if (left->packet_seq_num != right->packet_seq_num) {
+ if (left.packet_seq_num != right.packet_seq_num) {
return false;
}
* Insert `entry` into `index`, without duplication.
*
* The entry is inserted only if there isn't an identical entry already.
- *
- * In any case, the ownership of `entry` is transferred to this function. So if
- * the entry is not inserted, it is freed.
*/
static void ds_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index,
- ctf_fs_ds_index_entry::UP entry)
+ const ctf_fs_ds_index_entry& entry)
{
/* Find the spot where to insert this index entry. */
auto otherEntry = index->entries.begin();
for (; otherEntry != index->entries.end(); ++otherEntry) {
- if (entry->timestamp_begin_ns <= (*otherEntry)->timestamp_begin_ns) {
+ 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 (otherEntry == index->entries.end() ||
- !ds_index_entries_equal(entry.get(), otherEntry->get())) {
- index->entries.insert(otherEntry, std::move(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, ctf_fs_ds_index::UP src)
+static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, const ctf_fs_ds_index& src)
{
- for (auto& entry : src->entries) {
- ds_index_insert_ds_index_entry_sorted(dest, std::move(entry));
+ 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;
- ctf_fs_ds_file_group::UP new_ds_file_group;
- ctf_fs_ds_file_info::UP ds_file_info;
- ctf_fs_ds_index::UP index;
- ctf_msg_iter_up msg_iter;
- struct ctf_stream_class *sc = NULL;
- struct ctf_msg_iter_packet_properties props;
-
/*
* Create a temporary ds_file to read some properties about the data
* stream file.
}
/* Create a temporary iterator to read the ds_file. */
- msg_iter = ctf_msg_iter_create(
+ 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);
ctf_msg_iter_set_dry_run(msg_iter.get(), true);
+ ctf_msg_iter_packet_properties props;
int ret = ctf_msg_iter_get_packet_properties(msg_iter.get(), &props);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
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);
}
}
- 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) {
return -1;
}
- index = ctf_fs_ds_file_build_index(ds_file.get(), ds_file_info.get(), msg_iter.get());
+ auto index = ctf_fs_ds_file_build_index(ds_file.get(), ds_file_info.get(), msg_iter.get());
if (!index) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
ds_file->file->path);
* there's no timestamp to order the file within its
* group.
*/
- new_ds_file_group =
- ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(index));
+ auto new_ds_file_group =
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(*index));
if (!new_ds_file_group) {
return -1;
}
- ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(), std::move(ds_file_info));
+ new_ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info));
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
return 0;
}
BT_ASSERT(begin_ns != -1);
/* Find an existing stream file group with this 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();
}
}
+ ctf_fs_ds_file_group::UP new_ds_file_group;
+
if (!ds_file_group) {
new_ds_file_group =
- ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, std::move(index));
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, std::move(*index));
if (!new_ds_file_group) {
return -1;
}
ds_file_group = new_ds_file_group.get();
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
} else {
- merge_ctf_fs_ds_indexes(ds_file_group->index.get(), std::move(index));
+ merge_ctf_fs_ds_indexes(&ds_file_group->index, *index);
}
- ds_file_group_insert_ds_file_info_sorted(ds_file_group, std::move(ds_file_info));
+ ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info));
return 0;
}
static int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
{
- const char *basename;
- GError *error = NULL;
-
/* Check each file in the path directory, except specific ones */
+ GError *error = NULL;
const bt2c::GDirUP dir {g_dir_open(ctf_fs_trace->path.c_str(), 0, &error)};
if (!dir) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
return -1;
}
- while ((basename = g_dir_read_name(dir.get()))) {
+ while (const char *basename = g_dir_read_name(dir.get())) {
if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) {
/* Ignore the metadata stream. */
BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
static int set_trace_name(bt_trace *trace, const char *name_suffix)
{
- const bt_value *val;
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");
+ const bt_value *val = bt_trace_borrow_environment_entry_value_by_name_const(trace, "hostname");
if (val && bt_value_is_string(val)) {
name += bt_value_string_get(val);
std::vector<ctf_fs_trace::UP>& traces,
bt_self_component *selfComp)
{
- ctf_fs_trace::UP ctf_fs_trace;
- int ret;
-
bt2c::GStringUP norm_path {bt_common_normalize_path(path_param, NULL)};
if (!norm_path) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to normalize path: `{}`.", path_param);
return -1;
}
- ret = path_is_ctf_trace(norm_path->str);
+ int ret = path_is_ctf_trace(norm_path->str);
if (ret < 0) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs->logger, "Failed to check if path is a CTF trace: path={}", norm_path->str);
return -1;
}
- ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, ctf_fs->clkClsCfg, selfComp,
- ctf_fs->logger);
+ 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_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create trace for `{}`.",
norm_path->str);
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;
ctf_fs_ds_file_group::UP src)
{
for (auto& ds_file_info : src->ds_file_infos) {
- ds_file_group_insert_ds_file_info_sorted(dest, std::move(ds_file_info));
+ dest->insert_ds_file_info_sorted(std::move(ds_file_info));
}
/* Merge both indexes. */
- merge_ctf_fs_ds_indexes(dest->index.get(), std::move(src->index));
+ merge_ctf_fs_ds_indexes(&dest->index, src->index);
}
/* Merge src_trace's data stream file groups into dest_trace's. */
* trace chunk.
*/
if (!dest_group) {
- struct ctf_stream_class *sc;
-
- 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);
- auto new_dest_group = ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id,
- bt2s::make_unique<ctf_fs_ds_index>());
+ auto new_dest_group =
+ ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, {});
if (!new_dest_group) {
return -1;
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;
-
BT_ASSERT(traces.size() >= 2);
- winner_count = metadata_count_stream_and_event_classes(traces[0].get());
- winner = traces[0].get();
- 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 < traces.size(); i++) {
+ for (guint i = 1; i < traces.size(); i++) {
ctf_fs_trace *candidate = traces[i].get();
unsigned int candidate_count;
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;
- ctf_msg_iter_up msg_iter;
-
BT_ASSERT(ctf_fs_trace);
- BT_ASSERT(index_entry);
- BT_ASSERT(index_entry->path);
+ BT_ASSERT(index_entry.path);
const auto ds_file = ctf_fs_ds_file_create(ctf_fs_trace, bt2::Stream::Shared {},
- index_entry->path, ctf_fs_trace->logger);
+ index_entry.path, ctf_fs_trace->logger);
if (!ds_file) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to create a ctf_fs_ds_file");
return -1;
BT_ASSERT(ctf_fs_trace->metadata);
BT_ASSERT(ctf_fs_trace->metadata->tc);
- msg_iter = ctf_msg_iter_create(
+ 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. */
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.get(), index_entry->offset.bytes());
+ 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. */
return -1;
static int decode_packet_first_event_timestamp(struct ctf_fs_trace *ctf_fs_trace,
struct ctf_clock_class *default_cc,
- struct ctf_fs_ds_index_entry *index_entry,
+ const ctf_fs_ds_index_entry& index_entry,
uint64_t *cs, int64_t *ts_ns)
{
return decode_clock_snapshot_after_event(ctf_fs_trace, default_cc, index_entry, FIRST_EVENT, cs,
static int decode_packet_last_event_timestamp(struct ctf_fs_trace *ctf_fs_trace,
struct ctf_clock_class *default_cc,
- struct ctf_fs_ds_index_entry *index_entry,
+ const ctf_fs_ds_index_entry& index_entry,
uint64_t *cs, int64_t *ts_ns)
{
return decode_clock_snapshot_after_event(ctf_fs_trace, default_cc, index_entry, LAST_EVENT, cs,
static int fix_index_lttng_event_after_packet_bug(struct ctf_fs_trace *trace)
{
for (const auto& ds_file_group : trace->ds_file_groups) {
- struct ctf_clock_class *default_cc;
-
BT_ASSERT(ds_file_group);
- const auto index = ds_file_group->index.get();
+ auto& index = ds_file_group->index;
- BT_ASSERT(index);
- BT_ASSERT(!index->entries.empty());
+ BT_ASSERT(!index.entries.empty());
/*
* Iterate over all entries but the last one. The last one is
* fixed differently after.
*/
- for (size_t entry_i = 0; entry_i < index->entries.size() - 1; ++entry_i) {
- ctf_fs_ds_index_entry *curr_entry = index->entries[entry_i].get();
- ctf_fs_ds_index_entry *next_entry = index->entries[entry_i + 1].get();
+ 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.
*/
- const auto last_entry = index->entries.back().get();
- 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.
*/
- int ret = decode_packet_last_event_timestamp(trace, default_cc, last_entry,
- &last_entry->timestamp_end,
- &last_entry->timestamp_end_ns);
+ int ret = decode_packet_last_event_timestamp(
+ trace, default_cc, last_entry, &last_entry.timestamp_end, &last_entry.timestamp_end_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(
trace->logger,
static int fix_index_barectf_event_before_packet_bug(struct ctf_fs_trace *trace)
{
for (const auto& ds_file_group : trace->ds_file_groups) {
- struct ctf_clock_class *default_cc;
- const auto index = ds_file_group->index.get();
+ auto& index = ds_file_group->index;
- BT_ASSERT(index);
- BT_ASSERT(!index->entries.empty());
+ 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 (size_t entry_i = 1; entry_i < index->entries.size(); ++entry_i) {
- ctf_fs_ds_index_entry *prev_entry = index->entries[entry_i - 1].get();
- ctf_fs_ds_index_entry *curr_entry = index->entries[entry_i].get();
+ 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.
*/
int ret = decode_packet_first_event_timestamp(trace, default_cc, curr_entry,
- &curr_entry->timestamp_begin,
- &curr_entry->timestamp_begin_ns);
+ &curr_entry.timestamp_begin,
+ &curr_entry.timestamp_begin_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to decode first event's clock snapshot");
* 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;
}
}
struct ctf_clock_class *default_cc;
BT_ASSERT(ds_file_group);
- const auto index = ds_file_group->index.get();
+ 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.empty());
+ BT_ASSERT(!index.entries.empty());
- const auto last_entry = index->entries.back().get();
- 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.
*/
int ret = decode_packet_last_event_timestamp(trace, default_cc, last_entry,
- &last_entry->timestamp_end,
- &last_entry->timestamp_end_ns);
+ &last_entry.timestamp_end,
+ &last_entry.timestamp_end_ns);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
"Failed to decode last event's clock snapshot");
}
/* Iterate over all entries but the last one. */
- for (size_t entry_idx = 0; entry_idx < index->entries.size() - 1; ++entry_idx) {
- ctf_fs_ds_index_entry *curr_entry = index->entries[entry_idx].get();
- ctf_fs_ds_index_entry *next_entry = index->entries[entry_idx + 1].get();
+ 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;
}
}
}
*/
static int extract_tracer_info(struct ctf_fs_trace *trace, struct tracer_info *current_tracer_info)
{
- 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) {
return -1;
}
bt_self_component *selfComp)
{
std::vector<std::string> paths;
- std::vector<ctf_fs_trace::UP> traces;
- const char *trace_name;
BT_ASSERT(bt_value_get_type(paths_value) == BT_VALUE_TYPE_ARRAY);
BT_ASSERT(!bt_value_array_is_empty(paths_value));
- trace_name = trace_name_value ? bt_value_string_get(trace_name_value) : NULL;
+ const char *trace_name = trace_name_value ? bt_value_string_get(trace_name_value) : NULL;
/*
* Create a sorted array of the paths, to make the execution of this
std::sort(paths.begin(), paths.end());
/* Create a separate ctf_fs_trace object for each path. */
+ 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(), trace_name,
traces, selfComp);
bool read_src_fs_parameters(const bt_value *params, const bt_value **inputs,
const bt_value **trace_name, struct ctf_fs_component *ctf_fs)
{
- const bt_value *value;
- enum bt_param_validation_status validate_value_status;
gchar *error = NULL;
-
- validate_value_status = bt_param_validation_validate(params, fs_params_entries_descr, &error);
+ bt_param_validation_status validate_value_status =
+ bt_param_validation_validate(params, fs_params_entries_descr, &error);
if (validate_value_status != BT_PARAM_VALIDATION_STATUS_OK) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "{}", error);
g_free(error);
*inputs = bt_value_map_borrow_entry_value_const(params, "inputs");
/* clock-class-offset-s parameter */
- value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-s");
+ const bt_value *value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-s");
if (value) {
ctf_fs->clkClsCfg.offsetSec = bt_value_integer_signed_get(value);
}
projects / babeltrace.git / blobdiff