X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-field-convert.cpp;h=10736611cfff317ef6d365a10386975425901fcd;hb=dc88217e78259cb6b35fbaf6b85ad5aed6a37023;hp=0c713c21ba56c85a51c00d17f44ad40cec651bea;hpb=28ab034a2c3582d07d3423d2d746731f87d3969f;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-field-convert.cpp b/src/bin/lttng-sessiond/ust-field-convert.cpp index 0c713c21b..10736611c 100644 --- a/src/bin/lttng-sessiond/ust-field-convert.cpp +++ b/src/bin/lttng-sessiond/ust-field-convert.cpp @@ -11,11 +11,21 @@ #include #include +#include namespace lst = lttng::sessiond::trace; namespace lsu = lttng::sessiond::ust; -namespace { +/* + * fmtlib helper that must be under the same namespace as lttng_ust_ctl_abstract_types + * (global). + */ +static int format_as(lttng_ust_ctl_abstract_types type) +{ + return fmt::underlying(type); +} + +namespace { /* * Type enclosing the session information that may be required during the decoding * of the lttng_ust_ctl_field array provided by applications on registration of @@ -29,7 +39,7 @@ public: session_attributes(registry_enum_getter_fn reg_enum_getter, lst::byte_order native_trace_byte_order) : - get_registry_enum{ reg_enum_getter }, + get_registry_enum{ std::move(reg_enum_getter) }, _native_trace_byte_order{ native_trace_byte_order } { } @@ -49,8 +59,8 @@ create_type_from_ust_ctl_fields(const lttng_ust_ctl_field *current, const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks); @@ -59,8 +69,8 @@ void create_field_from_ust_ctl_fields(const lttng_ust_ctl_field *current, const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks); @@ -346,8 +356,8 @@ lst::type::cuptr create_array_nestable_type_from_ust_ctl_fields( const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks) @@ -413,7 +423,7 @@ lst::type::cuptr create_sequence_type_from_ust_ctl_fields( const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, + const publish_field_fn& publish_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks __attribute__((unused))) @@ -450,7 +460,7 @@ lst::type::cuptr create_sequence_type_from_ust_ctl_fields( element_uctl_type.u.basic.integer.encoding); } - const auto length_field_name = fmt::format("_{}_length", sequence_uctl_field.name); + auto length_field_name = fmt::format("_{}_length", sequence_uctl_field.name); auto element_type = create_integer_type_from_ust_ctl_basic_type(element_uctl_type, session_attributes); auto length_type = @@ -460,9 +470,8 @@ lst::type::cuptr create_sequence_type_from_ust_ctl_fields( current_field_location_elements; length_field_location_elements.emplace_back(length_field_name); - const lst::field_location length_field_location{ - lookup_root, std::move(length_field_location_elements) - }; + lst::field_location length_field_location{ lookup_root, + std::move(length_field_location_elements) }; /* Publish an implicit length field _before_ the sequence field. */ publish_field(lttng::make_unique(std::move(length_field_name), @@ -494,8 +503,8 @@ lst::type::cuptr create_sequence_nestable_type_from_ust_ctl_fields( const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks) @@ -539,11 +548,10 @@ lst::type::cuptr create_sequence_nestable_type_from_ust_ctl_fields( lst::field_location::elements length_field_location_elements = current_field_location_elements; - length_field_location_elements.emplace_back(std::move(length_field_name)); + length_field_location_elements.emplace_back(length_field_name); - const lst::field_location length_field_location{ - lookup_root, std::move(length_field_location_elements) - }; + lst::field_location length_field_location{ lookup_root, + std::move(length_field_location_elements) }; /* Validate existence of length field (throws if not found). */ const auto& length_field = lookup_field(length_field_location); @@ -632,7 +640,7 @@ create_typed_variant_choices(const lttng_ust_ctl_field *current, end, session_attributes, next_ust_ctl_field, - [&choices, typed_enumeration, &selector_field, quirks]( + [&choices, &typed_enumeration, &selector_field, quirks]( lst::field::uptr field) { /* * Find the enumeration mapping that matches the @@ -689,7 +697,7 @@ lst::type::cuptr create_variant_field_from_ust_ctl_fields( const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - lookup_field_fn lookup_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks) @@ -720,9 +728,8 @@ lst::type::cuptr create_variant_field_from_ust_ctl_fields( current_field_location_elements; selector_field_location_elements.emplace_back(tag_name); - const lst::field_location selector_field_location{ - lookup_root, std::move(selector_field_location_elements) - }; + lst::field_location selector_field_location{ lookup_root, + std::move(selector_field_location_elements) }; /* Validate existence of selector field (throws if not found). */ const auto& selector_field = lookup_field(selector_field_location); @@ -778,8 +785,8 @@ create_type_from_ust_ctl_fields(const lttng_ust_ctl_field *current, const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks) @@ -860,8 +867,8 @@ void create_field_from_ust_ctl_fields(const lttng_ust_ctl_field *current, const lttng_ust_ctl_field *end, const session_attributes& session_attributes, const lttng_ust_ctl_field **next_ust_ctl_field, - publish_field_fn publish_field, - lookup_field_fn lookup_field, + const publish_field_fn& publish_field, + const lookup_field_fn& lookup_field, lst::field_location::root lookup_root, lst::field_location::elements& current_field_location_elements, lsu::ctl_field_quirks quirks)