sessiond: generate packet header, packet context and event header dynamically

[lttng-tools.git] / src / bin / lttng-sessiond / ust-field-convert.cpp

diff --git a/src/bin/lttng-sessiond/ust-field-convert.cpp b/src/bin/lttng-sessiond/ust-field-convert.cpp
index 06ade1e4028d591f517b7adb1c8eea76471b28dc..9a07b38c46d3b054482e40f9044ec148ed2f7a9d 100644 (file)
--- a/src/bin/lttng-sessiond/ust-field-convert.cpp
+++ b/src/bin/lttng-sessiond/ust-field-convert.cpp
@@ -194,14 +194,14 @@ lst::type::cuptr create_enumeration_type_from_ust_ctl_fields(const lttng_ust_ctl
                        lst::integer_type::signedness::SIGNED :
                              lst::integer_type::signedness::UNSIGNED;
 
-       if (enum_container_uctl_type->signedness) {
+       if (signedness == lst::integer_type::signedness::SIGNED) {
                const auto& enum_registry = static_cast<const lsu::registry_signed_enum&>(
                                *session_attributes.get_registry_enum(
                                                enumeration_name, enumeration_id));
 
                return lttng::make_unique<const lst::signed_enumeration_type>(
                                enum_container_uctl_type->alignment, byte_order,
-                               enum_container_uctl_type->size, signedness, base,
+                               enum_container_uctl_type->size, base,
                                enum_registry._mappings);
        } else {
                const auto& enum_registry = static_cast<const lsu::registry_unsigned_enum&>(
@@ -210,7 +210,7 @@ lst::type::cuptr create_enumeration_type_from_ust_ctl_fields(const lttng_ust_ctl
 
                return lttng::make_unique<const lst::unsigned_enumeration_type>(
                                enum_container_uctl_type->alignment, byte_order,
-                               enum_container_uctl_type->size, signedness, base,
+                               enum_container_uctl_type->size, base,
                                enum_registry._mappings);
        }
 }
@@ -642,7 +642,7 @@ void create_field_from_ust_ctl_fields(const lttng_ust_ctl_field *current,
  * Always returns a new field, throws on error.
  */
 std::vector<lst::field::cuptr> create_fields_from_ust_ctl_fields(
-               const ust_registry_session& session,
+               const lsu::registry_session& session,
                const lttng_ust_ctl_field *current,
                const lttng_ust_ctl_field *end)
 {
@@ -650,7 +650,7 @@ std::vector<lst::field::cuptr> create_fields_from_ust_ctl_fields(
        const auto trace_native_byte_order = session.abi.byte_order;
        const session_attributes session_attributes{
                        [&session](const char *enum_name, uint64_t enum_id) {
-                               return ust_registry_lookup_enum_by_id(&session, enum_name, enum_id);
+                               return session.get_enumeration(enum_name, enum_id);
                        },
                        trace_native_byte_order};
 
@@ -679,7 +679,7 @@ std::vector<lst::field::cuptr> create_fields_from_ust_ctl_fields(
 } /* namespace */
 
 std::vector<lst::field::cuptr> lsu::create_trace_fields_from_ust_ctl_fields(
-               const ust_registry_session& session,
+               const lsu::registry_session& session,
                const lttng_ust_ctl_field *fields,
                std::size_t field_count)
 {