ctf_msg_iter_destroy(msg_iter_data->msg_iter);
}
- if (msg_iter_data->msg_iter_medops_data) {
- ctf_fs_ds_group_medops_data_destroy(msg_iter_data->msg_iter_medops_data);
- }
-
delete msg_iter_data;
}
try {
ctf_msg_iter_reset(msg_iter_data->msg_iter);
- ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data);
+ ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data.get());
return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK;
} catch (const std::bad_alloc&) {
medium_status =
ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group, self_msg_iter, logCfg,
- &msg_iter_data->msg_iter_medops_data);
+ msg_iter_data->msg_iter_medops_data);
BT_ASSERT(medium_status == CTF_MSG_ITER_MEDIUM_STATUS_OK ||
medium_status == CTF_MSG_ITER_MEDIUM_STATUS_ERROR ||
medium_status == CTF_MSG_ITER_MEDIUM_STATUS_MEMORY_ERROR);
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(logCfg.logLevel()) * 8, ctf_fs_ds_group_medops,
- msg_iter_data->msg_iter_medops_data, self_msg_iter, logCfg);
+ msg_iter_data->msg_iter_medops_data.get(), self_msg_iter, logCfg);
if (!msg_iter_data->msg_iter) {
BT_CLOGE_APPEND_CAUSE("Cannot create a CTF message iterator.");
status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
return ret;
}
-/* Replace by g_ptr_array_insert when we depend on glib >= 2.40. */
-static void array_insert(GPtrArray *array, gpointer element, size_t pos)
-{
- size_t original_array_len = array->len;
-
- /* Allocate an unused element at the end of the array. */
- g_ptr_array_add(array, NULL);
-
- /* If we are not inserting at the end, move the elements by one. */
- if (pos < original_array_len) {
- memmove(&(array->pdata[pos + 1]), &(array->pdata[pos]),
- (original_array_len - pos) * sizeof(gpointer));
- }
-
- /* Insert the value. */
- array->pdata[pos] = element;
-}
-
/*
* 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_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index,
- struct ctf_fs_ds_index_entry *entry)
+ ctf_fs_ds_index_entry::UP entry)
{
- guint i;
- struct ctf_fs_ds_index_entry *other_entry = NULL;
-
/* Find the spot where to insert this index entry. */
- for (i = 0; i < index->entries->len; i++) {
- other_entry = (struct ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, i);
-
- if (entry->timestamp_begin_ns <= other_entry->timestamp_begin_ns) {
+ auto otherEntry = index->entries.begin();
+ for (; otherEntry != index->entries.end(); ++otherEntry) {
+ if (entry->timestamp_begin_ns <= (*otherEntry)->timestamp_begin_ns) {
break;
}
}
* snapshots of the same trace. We then want the index to contain
* a reference to only one copy of that packet.
*/
- if (i == index->entries->len || !ds_index_entries_equal(entry, other_entry)) {
- array_insert(index->entries, entry, i);
- } else {
- delete entry;
+ if (otherEntry == index->entries.end() ||
+ !ds_index_entries_equal(entry.get(), otherEntry->get())) {
+ index->entries.insert(otherEntry, std::move(entry));
}
}
-static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, struct ctf_fs_ds_index *src)
+static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, ctf_fs_ds_index::UP 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;
- ds_index_insert_ds_index_entry_sorted(dest, entry);
+ for (ctf_fs_ds_index_entry::UP& entry : src->entries) {
+ ds_index_insert_ds_index_entry_sorted(dest, std::move(entry));
}
}
struct ctf_fs_ds_file_group *ds_file_group = NULL;
ctf_fs_ds_file_group::UP new_ds_file_group;
int ret;
- struct ctf_fs_ds_file *ds_file = NULL;
ctf_fs_ds_file_info::UP ds_file_info;
- struct ctf_fs_ds_index *index = NULL;
+ ctf_fs_ds_index::UP index;
struct ctf_msg_iter *msg_iter = NULL;
struct ctf_stream_class *sc = NULL;
struct ctf_msg_iter_packet_properties props;
* Create a temporary ds_file to read some properties about the data
* stream file.
*/
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path, logCfg);
+ ctf_fs_ds_file::UP ds_file = ctf_fs_ds_file_create(ctf_fs_trace, nonstd::nullopt, path, logCfg);
if (!ds_file) {
goto error;
}
/* 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(logCfg.logLevel()) * 8,
- ctf_fs_ds_file_medops, ds_file, nullptr, logCfg);
+ ctf_fs_ds_file_medops, ds_file.get(), nullptr, logCfg);
if (!msg_iter) {
BT_CLOGE_STR("Cannot create a CTF message iterator.");
goto error;
goto error;
}
- index = ctf_fs_ds_file_build_index(ds_file, ds_file_info.get(), msg_iter).release();
+ index = ctf_fs_ds_file_build_index(ds_file.get(), ds_file_info.get(), msg_iter);
if (!index) {
- BT_CLOGE_APPEND_CAUSE("Failed to index CTF stream file \'%s\'", ds_file->file->path->str);
+ BT_CLOGE_APPEND_CAUSE("Failed to index CTF stream file \'%s\'",
+ ds_file->file->path.c_str());
goto error;
}
* there's no timestamp to order the file within its
* group.
*/
- new_ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), index);
- /* Ownership of index is transferred. */
- index = NULL;
+ new_ds_file_group =
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(index));
if (!new_ds_file_group) {
goto error;
if (!ds_file_group) {
new_ds_file_group =
- ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, index);
- /* Ownership of index is transferred. */
- index = NULL;
+ ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, std::move(index));
if (!new_ds_file_group) {
goto error;
}
ds_file_group = new_ds_file_group.get();
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
} else {
- merge_ctf_fs_ds_indexes(ds_file_group->index, index);
+ merge_ctf_fs_ds_indexes(ds_file_group->index.get(), std::move(index));
}
ds_file_group_insert_ds_file_info_sorted(ds_file_group, std::move(ds_file_info));
ret = -1;
end:
- ctf_fs_ds_file_destroy(ds_file);
-
if (msg_iter) {
ctf_msg_iter_destroy(msg_iter);
}
- ctf_fs_ds_index_destroy(index);
return ret;
}
}
while ((basename = g_dir_read_name(dir))) {
- struct ctf_fs_file *file;
-
if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) {
/* Ignore the metadata stream. */
BT_CLOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str,
}
/* Create the file. */
- file = ctf_fs_file_create(logCfg);
+ ctf_fs_file::UP file = ctf_fs_file_create(logCfg);
if (!file) {
BT_CLOGE_APPEND_CAUSE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S
"%s`",
}
/* 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_CLOGI("Ignoring non-regular file `%s`", file->path->str);
- ctf_fs_file_destroy(file);
- file = NULL;
+ file->path = ctf_fs_trace->path->str;
+ file->path += G_DIR_SEPARATOR;
+ file->path += basename;
+
+ if (!g_file_test(file->path.c_str(), G_FILE_TEST_IS_REGULAR)) {
+ BT_CLOGI("Ignoring non-regular file `%s`", file->path.c_str());
continue;
}
- ret = ctf_fs_file_open(file, "rb");
+ ret = ctf_fs_file_open(file.get(), "rb");
if (ret) {
- BT_CLOGE_APPEND_CAUSE("Cannot open stream file `%s`", file->path->str);
+ BT_CLOGE_APPEND_CAUSE("Cannot open stream file `%s`", file->path.c_str());
goto error;
}
if (file->size == 0) {
/* Skip empty stream. */
- BT_CLOGI("Ignoring empty file `%s`", file->path->str);
- ctf_fs_file_destroy(file);
+ BT_CLOGI("Ignoring empty file `%s`", file->path.c_str());
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_CLOGE_APPEND_CAUSE("Cannot add stream file `%s` to stream file group",
- file->path->str);
- ctf_fs_file_destroy(file);
+ file->path.c_str());
goto error;
}
-
- ctf_fs_file_destroy(file);
}
goto end;
}
/* Merge both indexes. */
- merge_ctf_fs_ds_indexes(dest->index, src->index);
+ merge_ctf_fs_ds_indexes(dest->index.get(), std::move(src->index));
}
/* Merge src_trace's data stream file groups into dest_trace's. */
*/
if (!dest_group) {
struct ctf_stream_class *sc;
- struct ctf_fs_ds_index *index;
sc = ctf_trace_class_borrow_stream_class_by_id(dest_trace->metadata->tc,
src_group->sc->id);
BT_ASSERT(sc);
- index = ctf_fs_ds_index_create(dest_trace->logCfg).release();
+ ctf_fs_ds_index::UP index = ctf_fs_ds_index_create(dest_trace->logCfg);
if (!index) {
ret = -1;
goto end;
}
ctf_fs_ds_file_group::UP new_dest_group =
- ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, index);
+ ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, std::move(index));
/* Ownership of index is transferred. */
index = NULL;
if (!new_dest_group) {
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;
const bt2_common::LogCfg& logCfg = ctf_fs_trace->logCfg;
int ret = 0;
BT_ASSERT(index_entry);
BT_ASSERT(index_entry->path);
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, index_entry->path, logCfg);
+ ctf_fs_ds_file::UP ds_file =
+ ctf_fs_ds_file_create(ctf_fs_trace, nonstd::nullopt, index_entry->path, logCfg);
if (!ds_file) {
BT_CLOGE_APPEND_CAUSE("Failed to create a ctf_fs_ds_file");
ret = -1;
msg_iter = ctf_msg_iter_create(ctf_fs_trace->metadata->tc,
bt_common_get_page_size(logCfg.logLevel()) * 8,
- ctf_fs_ds_file_medops, ds_file, NULL, logCfg);
+ ctf_fs_ds_file_medops, ds_file.get(), NULL, logCfg);
if (!msg_iter) {
/* ctf_msg_iter_create() logs errors. */
ret = -1;
}
end:
- if (ds_file) {
- ctf_fs_ds_file_destroy(ds_file);
- }
if (msg_iter) {
ctf_msg_iter_destroy(msg_iter);
}
const bt2_common::LogCfg& logCfg = trace->logCfg;
for (ctf_fs_ds_file_group::UP& ds_file_group : trace->ds_file_groups) {
- guint entry_i;
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index_entry *last_entry;
struct ctf_fs_ds_index *index;
BT_ASSERT(ds_file_group);
- index = ds_file_group->index;
+ index = ds_file_group->index.get();
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) {
+ 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();
/*
* 1. Set the current index entry `end` timestamp to
* 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);
+ ctf_fs_ds_index_entry *last_entry = index->entries.back().get();
BT_ASSERT(last_entry);
BT_ASSERT(ds_file_group->sc->default_clock_class);
const bt2_common::LogCfg& logCfg = trace->logCfg;
for (ctf_fs_ds_file_group::UP& ds_file_group : trace->ds_file_groups) {
- guint entry_i;
struct ctf_clock_class *default_cc;
- struct ctf_fs_ds_index *index = ds_file_group->index;
+ struct ctf_fs_ds_index *index = ds_file_group->index.get();
BT_ASSERT(index);
- BT_ASSERT(index->entries);
- BT_ASSERT(index->entries->len > 0);
+ BT_ASSERT(!index->entries.empty());
BT_ASSERT(ds_file_group->sc->default_clock_class);
default_cc = ds_file_group->sc->default_clock_class;
* 1. Iterate over the index, starting from the second entry
* (index = 1).
*/
- for (entry_i = 1; entry_i < index->entries->len; entry_i++) {
- ctf_fs_ds_index_entry *prev_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i - 1);
- ctf_fs_ds_index_entry *curr_entry =
- (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i);
+ for (size_t entry_i = 1; entry_i < index->entries.size(); ++entry_i) {
+ 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();
/*
* 2. Set the current entry `begin` timestamp to the
* timestamp of the first event of the current packet.
const bt2_common::LogCfg& logCfg = trace->logCfg;
for (ctf_fs_ds_file_group::UP& ds_file_group : trace->ds_file_groups) {
- guint entry_idx;
struct ctf_clock_class *default_cc;
struct ctf_fs_ds_index *index;
BT_ASSERT(ds_file_group);
- index = ds_file_group->index;
+ index = ds_file_group->index.get();
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);
+ ctf_fs_ds_index_entry *last_entry = index->entries.back().get();
BT_ASSERT(last_entry);
/* 1. Fix the last entry first. */
}
/* 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) {
+ 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();
if (curr_entry->timestamp_end == 0 && curr_entry->timestamp_begin != 0) {
/*
BT_ASSERT(ds_file_group->sc->ir_sc);
BT_ASSERT(ctf_fs_trace->trace);
+ bt_stream *stream;
+
if (ds_file_group->stream_id == UINT64_C(-1)) {
/* No stream ID: use 0 */
- ds_file_group->stream = bt_stream_create_with_id(
- ds_file_group->sc->ir_sc, ctf_fs_trace->trace, ctf_fs_trace->next_stream_id);
+ stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
+ ctf_fs_trace->next_stream_id);
ctf_fs_trace->next_stream_id++;
} else {
/* Specific stream ID */
- ds_file_group->stream = bt_stream_create_with_id(
- ds_file_group->sc->ir_sc, ctf_fs_trace->trace, (uint64_t) ds_file_group->stream_id);
+ stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
+ (uint64_t) ds_file_group->stream_id);
}
- if (!ds_file_group->stream) {
+ if (!stream) {
BT_CLOGE_APPEND_CAUSE("Cannot create stream for DS file group: "
"addr=%p, stream-name=\"%s\"",
ds_file_group.get(), name->str);
goto error;
}
- ret = bt_stream_set_name(ds_file_group->stream, name->str);
+ ds_file_group->stream = bt2::Stream::Shared::createWithoutRef(stream);
+
+ ret = bt_stream_set_name((*ds_file_group->stream)->libObjPtr(), name->str);
if (ret) {
BT_CLOGE_APPEND_CAUSE("Cannot set stream's name: "
"addr=%p, stream-name=\"%s\"",
- ds_file_group->stream, name->str);
+ (*ds_file_group->stream)->libObjPtr(), name->str);
goto error;
}