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);
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;
}
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, *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;
}
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)
{
std::string name;
* Check if we have a trace environment string value named `hostname`.
* If so, use it as the trace name's prefix.
*/
- 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);
+ 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());
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. */
}
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;
- BT_ASSERT(bt_value_get_type(paths_value) == BT_VALUE_TYPE_ARRAY);
- BT_ASSERT(!bt_value_array_is_empty(paths_value));
-
- const char *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_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)
{
gchar *error = NULL;
bt_param_validation_status validate_value_status =
- bt_param_validation_validate(params, fs_params_entries_descr, &error);
+ bt_param_validation_validate(params.libObjPtr(), 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 */
- 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);
+ 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;
}
projects / babeltrace.git / blobdiff