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)
-{
- /* 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 ctf_fs_ds_index_entry& left,
const ctf_fs_ds_index_entry& right)
{
* The entry is inserted only if there isn't an identical entry already.
*/
-static void ds_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index,
+static void ds_index_insert_ds_index_entry_sorted(ctf_fs_ds_index& index,
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) {
+ 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 (otherEntry == index->entries.end() || !ds_index_entries_equal(entry, *otherEntry)) {
- index->entries.emplace(otherEntry, 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, const ctf_fs_ds_index& src)
+static void merge_ctf_fs_ds_indexes(ctf_fs_ds_index& dest, const ctf_fs_ds_index& src)
{
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_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);
if (!msg_iter) {
- BT_CPPLOGE_STR_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator.");
+ BT_CPPLOGE_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator.");
return -1;
}
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;
}
* 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));
-
- 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));
- ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
+ ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ ctf_fs_trace, sc, UINT64_C(-1), std::move(*index)));
+ ctf_fs_trace->ds_file_groups.back()->insert_ds_file_info_sorted(std::move(ds_file_info));
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();
}
if (!ds_file_group) {
- new_ds_file_group =
- 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));
+ ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ ctf_fs_trace, sc, static_cast<std::uint64_t>(stream_instance_id), std::move(*index)));
+ ds_file_group = ctf_fs_trace->ds_file_groups.back().get();
} else {
- merge_ctf_fs_ds_indexes(&ds_file_group->index, *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,
return 0;
}
-static int set_trace_name(bt_trace *trace, const char *name_suffix)
+static void set_trace_name(const bt2::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");
- if (val && bt_value_is_string(val)) {
- name += bt_value_string_get(val);
+ const auto val = trace.environmentEntry("hostname");
+ if (val && val->isString()) {
+ name += val->asString().value();
if (name_suffix) {
name += G_DIR_SEPARATOR;
name += name_suffix;
}
- return bt_trace_set_name(trace, name.c_str());
+ trace.name(name);
}
static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name,
}
if (ctf_fs_trace->trace) {
- ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc,
- ctf_fs_trace->trace->libObjPtr());
- if (ret) {
- return nullptr;
- }
+ ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, *ctf_fs_trace->trace);
- ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name);
- if (ret) {
- return nullptr;
- }
+ set_trace_name(*ctf_fs_trace->trace, name);
}
ret = create_ds_file_groups(ctf_fs_trace.get());
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, 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, {});
-
- if (!new_dest_group) {
- return -1;
- }
-
- dest_group = new_dest_group.get();
- dest_trace->ds_file_groups.emplace_back(std::move(new_dest_group));
+ dest_trace->ds_file_groups.emplace_back(bt2s::make_unique<ctf_fs_ds_file_group>(
+ dest_trace, sc, src_group->stream_id, ctf_fs_ds_index {}));
+ dest_group = dest_trace->ds_file_groups.back().get();
}
BT_ASSERT(dest_group);
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;
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.path);
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;
*
* To fix up this erroneous data we do the following:
* 1. If it's not the stream file's last packet: set the packet index entry's
- * end time to the next packet's beginning time.
+ * end time to the next packet's beginning time.
* 2. If it's the stream file's last packet, set the packet index entry's end
- * time to the packet's last event's time, if any, or to the packet's
- * beginning time otherwise.
+ * time to the packet's last event's time, if any, or to the packet's
+ * beginning time otherwise.
*
* Known buggy tracer versions:
* - before lttng-ust 2.11.0
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);
auto& index = ds_file_group->index;
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
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;
auto& index = ds_file_group->index;
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
*/
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;
}
* are needed. Failing to extract these entries is not
* an error.
*/
- BT_CPPLOGI_STR_SPEC(
+ BT_CPPLOGI_SPEC(
trace->logger,
"Cannot extract tracer information necessary to compare with buggy versions.");
return 0;
/* Check if the trace may be affected by old tracer bugs. */
if (is_tracer_affected_by_lttng_event_after_packet_bug(¤t_tracer_info)) {
- BT_CPPLOGI_STR_SPEC(
- trace->logger,
- "Trace may be affected by LTTng tracer packet timestamp bug. Fixing up.");
+ BT_CPPLOGI_SPEC(trace->logger,
+ "Trace may be affected by LTTng tracer packet timestamp bug. Fixing up.");
ret = fix_index_lttng_event_after_packet_bug(trace);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
}
if (is_tracer_affected_by_barectf_event_before_packet_bug(¤t_tracer_info)) {
- BT_CPPLOGI_STR_SPEC(
- trace->logger,
- "Trace may be affected by barectf tracer packet timestamp bug. Fixing up.");
+ BT_CPPLOGI_SPEC(trace->logger,
+ "Trace may be affected by barectf tracer packet timestamp bug. Fixing up.");
ret = fix_index_barectf_event_before_packet_bug(trace);
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(trace->logger,
}
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)
+ const bt2::ConstArrayValue pathsValue,
+ const char *traceName, 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;
+ BT_ASSERT(!pathsValue.isEmpty());
/*
* Create a sorted array of the paths, to make the execution of this
* component deterministic.
*/
- 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);
- paths.emplace_back(input);
+ for (const auto pathValue : pathsValue) {
+ BT_ASSERT(pathValue.isString());
+ paths.emplace_back(pathValue.asString().value().str());
}
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,
+ int ret = ctf_fs_component_create_ctf_fs_trace_one_path(ctf_fs, path.c_str(), traceName,
traces, selfComp);
if (ret) {
return ret;
BT_ASSERT(ds_file_group->sc->ir_sc);
BT_ASSERT(ctf_fs_trace->trace);
- bt_stream *stream;
+ const bt2::StreamClass sc {ds_file_group->sc->ir_sc};
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->libObjPtr(),
- ctf_fs_trace->next_stream_id);
+ ds_file_group->stream =
+ sc.instantiate(*ctf_fs_trace->trace, 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->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);
- return -1;
+ ds_file_group->stream = sc.instantiate(*ctf_fs_trace->trace, ds_file_group->stream_id);
}
- ds_file_group->stream = bt2::Stream::Shared::createWithoutRef(stream);
-
int ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name.c_str());
if (ret) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger,
bt_param_validation_value_descr::makeBool()},
BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END};
-bool read_src_fs_parameters(const bt_value *params, const bt_value **inputs,
- const bt_value **trace_name, struct ctf_fs_component *ctf_fs)
+ctf::src::fs::Parameters read_src_fs_parameters(const bt2::ConstMapValue params,
+ const bt2c::Logger& logger)
{
- const bt_value *value;
- enum bt_param_validation_status validate_value_status;
gchar *error = NULL;
+ bt_param_validation_status validate_value_status =
+ bt_param_validation_validate(params.libObjPtr(), fs_params_entries_descr, &error);
- 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);
- return false;
+ bt2c::GCharUP errorFreer {error};
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2c::Error, "{}", error);
}
- /* inputs parameter */
- *inputs = bt_value_map_borrow_entry_value_const(params, "inputs");
+ ctf::src::fs::Parameters parameters {params["inputs"]->asArray()};
/* clock-class-offset-s parameter */
- 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);
+ if (const auto clockClassOffsetS = params["clock-class-offset-s"]) {
+ parameters.clkClsCfg.offsetSec = clockClassOffsetS->asSignedInteger().value();
}
/* clock-class-offset-ns parameter */
- value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-ns");
- if (value) {
- ctf_fs->clkClsCfg.offsetNanoSec = bt_value_integer_signed_get(value);
+ if (const auto clockClassOffsetNs = params["clock-class-offset-ns"]) {
+ parameters.clkClsCfg.offsetNanoSec = clockClassOffsetNs->asSignedInteger().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->clkClsCfg.forceOriginIsUnixEpoch = bt_value_bool_get(value);
+ if (const auto forceClockClassOriginUnixEpoch = params["force-clock-class-origin-unix-epoch"]) {
+ parameters.clkClsCfg.forceOriginIsUnixEpoch =
+ forceClockClassOriginUnixEpoch->asBool().value();
}
/* trace-name parameter */
- *trace_name = bt_value_map_borrow_entry_value_const(params, "trace-name");
+ if (const auto traceName = params["trace-name"]) {
+ parameters.traceName = traceName->asString().value().str();
+ }
- return true;
+ return parameters;
}
-static ctf_fs_component::UP ctf_fs_create(const bt_value *params,
+static ctf_fs_component::UP ctf_fs_create(const bt2::ConstMapValue params,
bt_self_component_source *self_comp_src)
{
- const bt_value *inputs_value;
- const bt_value *trace_name_value;
bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
+ const bt2c::Logger logger {bt2::SelfSourceComponent {self_comp_src}, "PLUGIN/SRC.CTF.FS/COMP"};
+ const auto parameters = read_src_fs_parameters(params, logger);
+ auto ctf_fs = bt2s::make_unique<ctf_fs_component>(parameters.clkClsCfg, logger);
- 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 (!read_src_fs_parameters(params, &inputs_value, &trace_name_value, ctf_fs.get())) {
- return nullptr;
- }
-
- if (ctf_fs_component_create_ctf_fs_trace(ctf_fs.get(), inputs_value, trace_name_value,
- self_comp)) {
+ if (ctf_fs_component_create_ctf_fs_trace(
+ ctf_fs.get(), parameters.inputs,
+ parameters.traceName ? parameters.traceName->c_str() : nullptr, self_comp)) {
return nullptr;
}
bt_component_class_initialize_method_status ret =
BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
- ctf_fs_component::UP ctf_fs = ctf_fs_create(params, self_comp_src);
+ ctf_fs_component::UP ctf_fs = ctf_fs_create(bt2::ConstMapValue {params}, self_comp_src);
if (!ctf_fs) {
ret = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
}