ctf: make ctf_trace_class_configure_ir_trace use bt2::Trace

Use the bt2::Trace wrapper instead of a raw `bt_trace *`.  Change the
return type to void, since failures are now reported using exceptions.

Change-Id: I2e30b0aa9a6f33e765ac32d274032ef4ab3aa9f8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8417
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12353
Tested-by: jenkins <jenkins@lttng.org>
CI-Build: Simon Marchi <simon.marchi@efficios.com>

diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
index eb252def3d76f85febb9649231242c57bfeb044e..dbcbbbd8b160f56915dc8b9f988bc8bc5735800a 100644 (file)
--- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
+++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp
@@ -6,21 +6,19 @@
 
 #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++) {
@@ -29,22 +27,13 @@ int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_
 
         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;
 }

diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp
index f94f19e66beb475f3eab33d839e2335e4379d1d3..2adffb5394aad2cb208fa5625796e51beb5d15c8 100644 (file)
--- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp
+++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp
@@ -7,8 +7,8 @@
 #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 */

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 6123487d971d18808ef4da935db7e6d0a395f47e..df6a0e28c13f9c37e1c13343ec631b897e817f87 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -629,11 +629,7 @@ 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) {

diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp
index 7f4bc76813970cd2447f80aa876dc2da3b05d56a..b0a3c5e746a6e93582b085eda11d4a164b6c1cab 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.cpp
+++ b/src/plugins/ctf/lttng-live/metadata.cpp
@@ -214,11 +214,9 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra
                 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. */