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;
- }
-
- delete msg_iter_data;
-}
-
static bt_message_iterator_class_next_method_status
ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
{
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_component_port_output_as_self_component_port(self_port));
BT_ASSERT(port_data);
- ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter};
+ auto msg_iter_data = bt2s::make_unique<ctf_fs_msg_iter_data>(self_msg_iter);
msg_iter_data->ds_file_group = port_data->ds_file_group;
medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
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;
+ bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
goto end;
bt_self_message_iterator_set_data(self_msg_iter, NULL);
end:
- ctf_fs_msg_iter_data_destroy(msg_iter_data);
return status;
} catch (const std::bad_alloc&) {
return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
}
}
-static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
-{
- if (!ctf_fs_trace) {
- return;
- }
-
- BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace);
-
- if (ctf_fs_trace->path) {
- g_string_free(ctf_fs_trace->path, TRUE);
- }
-
- if (ctf_fs_trace->metadata) {
- ctf_fs_metadata_fini(ctf_fs_trace->metadata);
- delete ctf_fs_trace->metadata;
- }
-
- delete ctf_fs_trace;
-}
-
-void ctf_fs_trace_deleter::operator()(ctf_fs_trace * const trace) noexcept
-{
- ctf_fs_trace_destroy(trace);
-}
-
ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
{
return bt2s::make_unique<ctf_fs_component>(parentLogger);
bt_uuid_to_str(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
g_string_assign(name, uuid_str);
} else {
- g_string_assign(name, ds_file_group->ctf_fs_trace->path->str);
+ g_string_assign(name, ds_file_group->ctf_fs_trace->path.c_str());
}
/*
GDir *dir = NULL;
/* Check each file in the path directory, except specific ones */
- dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
+ dir = g_dir_open(ctf_fs_trace->path.c_str(), 0, &error);
if (!dir) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
- "Cannot open directory `{}`: {} (code {})",
- ctf_fs_trace->path->str, error->message, error->code);
+ "Cannot open directory `{}`: {} (code {})", ctf_fs_trace->path,
+ error->message, error->code);
goto error;
}
/* Ignore the metadata stream. */
BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
"Ignoring metadata file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
+ ctf_fs_trace->path, basename);
continue;
}
if (basename[0] == '.') {
BT_CPPLOGI_SPEC(ctf_fs_trace->logger,
- "Ignoring hidden file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
+ "Ignoring hidden file `{}" G_DIR_SEPARATOR_S "{}`", ctf_fs_trace->path,
+ basename);
continue;
}
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs_trace->logger,
"Cannot create stream file object for file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path->str, basename);
+ ctf_fs_trace->path, basename);
goto error;
}
/* Create full path string. */
- file->path = fmt::format("{}" G_DIR_SEPARATOR_S "{}", ctf_fs_trace->path->str, basename);
+ 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);
const bt2c::Logger& parentLogger)
{
int ret;
-
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->path = path;
+ ctf_fs_trace->metadata = bt2s::make_unique<ctf_fs_metadata>();
ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
if (ret) {
}
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) {
+ bt_trace *trace = bt_trace_create(ctf_fs_trace->metadata->trace_class->libObjPtr());
+ if (!trace) {
goto error;
}
+
+ ctf_fs_trace->trace = bt2::Trace::Shared::createWithoutRef(trace);
}
if (ctf_fs_trace->trace) {
- ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, ctf_fs_trace->trace);
+ ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc,
+ ctf_fs_trace->trace->libObjPtr());
if (ret) {
goto error;
}
- ret = set_trace_name(ctf_fs_trace->trace, name, ctf_fs_trace->logger);
+ ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name, ctf_fs_trace->logger);
if (ret) {
goto error;
}
{
ctf_fs_trace::UP ctf_fs_trace;
int ret;
- GString *norm_path;
- norm_path = bt_common_normalize_path(path_param, NULL);
+ bt2c::GStringUP norm_path {bt_common_normalize_path(path_param, NULL)};
if (!norm_path) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to normalize path: `{}`.", path_param);
goto error;
ret = -1;
end:
- if (norm_path) {
- g_string_free(norm_path, TRUE);
- }
-
return ret;
}
BT_CPPLOGE_APPEND_CAUSE_SPEC(
ctf_fs->logger,
"Multiple traces given, but a trace does not have a UUID: path={}",
- this_trace->path->str);
+ this_trace->path);
goto error;
}
"Multiple traces given, but UUIDs don't match: "
"first-trace-uuid={}, first-trace-path={}, "
"trace-uuid={}, trace-path={}",
- first_trace_uuid_str, first_trace->path->str,
- this_trace_uuid_str, this_trace->path->str);
+ first_trace_uuid_str, first_trace->path,
+ this_trace_uuid_str, this_trace->path);
goto error;
}
}
return ret;
}
-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.empty());
- ds_file_info = ds_file_group->ds_file_infos[0].get();
- g_string_assign(name, ds_file_info->path.c_str());
-
-end:
- return name;
+ return ds_file_group->ds_file_infos[0]->path;
}
/* Create the IR stream objects for ctf_fs_trace. */
static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace)
{
int ret;
- GString *name = NULL;
for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) {
- name = get_stream_instance_unique_name(ds_file_group.get());
-
- if (!name) {
- goto error;
- }
+ const std::string& name = get_stream_instance_unique_name(ds_file_group.get());
BT_ASSERT(ds_file_group->sc->ir_sc);
BT_ASSERT(ctf_fs_trace->trace);
if (ds_file_group->stream_id == UINT64_C(-1)) {
/* No stream ID: use 0 */
- stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
- ctf_fs_trace->next_stream_id);
+ stream =
+ bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+ ctf_fs_trace->next_stream_id);
ctf_fs_trace->next_stream_id++;
} else {
/* Specific stream ID */
- stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
- (uint64_t) ds_file_group->stream_id);
+ stream =
+ bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+ (uint64_t) ds_file_group->stream_id);
}
if (!stream) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot create stream for DS file group: "
"addr={}, stream-name=\"{}\"",
- fmt::ptr(ds_file_group), name->str);
+ fmt::ptr(ds_file_group), name);
goto error;
}
ds_file_group->stream = bt2::Stream::Shared::createWithoutRef(stream);
- ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name->str);
+ ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name.c_str());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot set stream's name: "
"addr={}, stream-name=\"{}\"",
- fmt::ptr(ds_file_group->stream->libObjPtr()), name->str);
+ fmt::ptr(ds_file_group->stream->libObjPtr()), name);
goto error;
}
-
- g_string_free(name, TRUE);
- name = NULL;
}
ret = 0;
ret = -1;
end:
-
- if (name) {
- g_string_free(name, TRUE);
- }
return ret;
}
projects / babeltrace.git / blobdiff