#include <babeltrace2/babeltrace.h>
-#include "common/assert.h"
+#include "cpp-common/bt2c/uuid.hpp"
#include "ctf-meta-configure-ir-trace.hpp"
#include "plugins/ctf/common/src/metadata/tsdl/ctf-meta.hpp"
-int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace)
+void ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, const bt2::Trace ir_trace)
{
- int ret = 0;
uint64_t i;
BT_ASSERT(tc);
- BT_ASSERT(ir_trace);
if (tc->is_uuid_set) {
- bt_trace_set_uuid(ir_trace, tc->uuid);
+ ir_trace.uuid(bt2c::Uuid {tc->uuid});
}
for (i = 0; i < tc->env_entries->len; i++) {
switch (env_entry->type) {
case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT:
- ret = bt_trace_set_environment_entry_integer(ir_trace, env_entry->name->str,
- env_entry->value.i);
+ ir_trace.environmentEntry(env_entry->name->str, env_entry->value.i);
break;
case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR:
- ret = bt_trace_set_environment_entry_string(ir_trace, env_entry->name->str,
- env_entry->value.str->str);
+ ir_trace.environmentEntry(env_entry->name->str, env_entry->value.str->str);
break;
default:
bt_common_abort();
}
-
- if (ret) {
- goto end;
- }
}
-
-end:
- return ret;
}
#ifndef _CTF_META_CONFIGURE_IR_TRACE_H
#define _CTF_META_CONFIGURE_IR_TRACE_H
-#include <babeltrace2/babeltrace.h>
+#include "cpp-common/bt2/trace-ir.hpp"
-int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace);
+void ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt2::Trace ir_trace);
#endif /* _CTF_META_CONFIGURE_IR_TRACE_H */
}
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) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger, "Failed to create bt_trace");
goto error;
}
- if (ctf_trace_class_configure_ir_trace(tc, trace->trace->libObjPtr())) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger,
- "Failed to configure ctf trace class");
- goto error;
- }
+
+ ctf_trace_class_configure_ir_trace(tc, *trace->trace);
+
if (!stream_classes_all_have_default_clock_class(trace->trace_class->libObjPtr(),
metadata->logger)) {
/* Error logged in function. */