* Babeltrace CTF file system Reader Component
*/
+#include <sstream>
+
#include <glib.h>
-#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/assert.h"
#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"
}
}
-ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
-{
- return bt2s::make_unique<ctf_fs_component>(parentLogger);
-}
-
void ctf_fs_finalize(bt_self_component_source *component)
{
ctf_fs_component::UP {static_cast<ctf_fs_component *>(
bt_self_component_get_data(bt_self_component_source_as_self_component(component)))};
}
-bt2c::GCharUP 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.c_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.size() == 1);
const auto& ds_file_info = *ds_file_group->ds_file_infos[0];
- g_string_append_printf(name, " | %s", ds_file_info.path.c_str());
+ name << " | " << ds_file_info.path;
}
- return bt2c::GCharUP {g_string_free(name, FALSE)};
+ return name.str();
}
static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
int ret = 0;
ctf_fs_port_data::UP port_data;
- bt2c::GCharUP port_name = ctf_fs_make_port_name(ds_file_group);
- if (!port_name) {
- goto error;
- }
-
- BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name.get());
+ const auto port_name = ctf_fs_make_port_name(ds_file_group);
+ BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name);
/* Create output port for this file */
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.get(),
- NULL);
+ ret = bt_self_component_source_add_output_port(self_comp_src, port_name.c_str(),
+ port_data.get(), NULL);
if (ret) {
goto error;
}
int ret = 0;
const char *basename;
GError *error = NULL;
- GDir *dir = NULL;
/* Check each file in the path directory, except specific ones */
- dir = g_dir_open(ctf_fs_trace->path.c_str(), 0, &error);
+ 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,
"Cannot open directory `{}`: {} (code {})", ctf_fs_trace->path,
goto error;
}
- while ((basename = g_dir_read_name(dir))) {
+ while ((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,
}
/* Create the file. */
- const auto file = ctf_fs_file_create(ctf_fs_trace->logger);
- if (!file) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(
- ctf_fs_trace->logger,
- "Cannot create stream file object for file `{}" G_DIR_SEPARATOR_S "{}`",
- ctf_fs_trace->path, basename);
- goto error;
- }
+ ctf_fs_file file {ctf_fs_trace->logger};
/* Create full path string. */
- file->path = fmt::format("{}" G_DIR_SEPARATOR_S "{}", ctf_fs_trace->path, 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);
+ 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.get(), "rb");
+ ret = ctf_fs_file_open(&file, "rb");
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot open stream file `{}`",
- file->path);
+ file.path);
goto error;
}
- if (file->size == 0) {
+ if (file.size == 0) {
/* Skip empty stream. */
- BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring empty file `{}`", file->path);
+ 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.c_str());
+ ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file.path.c_str());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
"Cannot add stream file `{}` to stream file group",
- file->path);
+ file.path);
goto error;
}
}
ret = -1;
end:
- if (dir) {
- g_dir_close(dir);
- dir = NULL;
- }
-
if (error) {
g_error_free(error);
}
return ret;
}
-static int set_trace_name(bt_trace *trace, const char *name_suffix, const bt2c::Logger& logger)
+static int set_trace_name(bt_trace *trace, const char *name_suffix)
{
int ret = 0;
const bt_value *val;
- GString *name;
-
- name = g_string_new(NULL);
- if (!name) {
- BT_CPPLOGE_STR_SPEC(logger, "Failed to allocate a GString.");
- ret = -1;
- goto end;
- }
+ std::string name;
/*
* Check if we have a trace environment string value named `hostname`.
*/
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));
+ name += bt_value_string_get(val);
if (name_suffix) {
- g_string_append_c(name, G_DIR_SEPARATOR);
+ name += G_DIR_SEPARATOR;
}
}
if (name_suffix) {
- g_string_append(name, name_suffix);
+ name += name_suffix;
}
- ret = bt_trace_set_name(trace, name->str);
+ ret = bt_trace_set_name(trace, name.c_str());
if (ret) {
goto end;
}
goto end;
end:
- if (name) {
- g_string_free(name, TRUE);
- }
-
return ret;
}
goto error;
}
- ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name, ctf_fs_trace->logger);
+ ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name);
if (ret) {
goto error;
}
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. */
return first_ds_file_info_a.path < first_ds_file_info_b.path;
}
-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);
-}
-
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 *selfComp)
{
int ret = 0;
- uint64_t i;
- GPtrArray *paths = NULL;
+ 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));
- 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.");
- goto error;
- }
-
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
* component deterministic.
*/
- for (i = 0; i < bt_value_array_get_length(paths_value); i++) {
+ for (std::uint64_t 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_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to copy a string.");
- goto error;
- }
-
- g_ptr_array_add(paths, input_copy);
+ paths.emplace_back(input);
}
- 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,
- selfComp);
+ for (const auto& path : paths) {
+ ret = ctf_fs_component_create_ctf_fs_trace_one_path(ctf_fs, path.c_str(), trace_name,
+ traces, selfComp);
if (ret) {
goto end;
}
* We have more than one trace, they must all share the same
* UUID, verify that.
*/
- for (i = 0; i < traces.size(); 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;
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 (paths) {
- g_ptr_array_free(paths, TRUE);
- }
-
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);
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;
}
const bt_value *trace_name_value;
bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
- ctf_fs_component::UP ctf_fs = ctf_fs_component_create(
+ ctf_fs_component::UP ctf_fs = bt2s::make_unique<ctf_fs_component>(
bt2c::Logger {bt2::SelfSourceComponent {self_comp_src}, "PLUGIN/SRC.CTF.FS/COMP"});
- if (!ctf_fs) {
- return nullptr;
- }
if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value, ctf_fs.get())) {
return nullptr;
projects / babeltrace.git / blobdiff