X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-channel.cpp;h=f8295df4513806d60fb66a7b0903b47a49626894;hb=4bcf2294f0701b731d620c38216e1922e919e1b9;hp=b6092d197217c433f6bd04fbeb5ed3458495568c;hpb=45110cdd99bd9ecc13a12d29afde3fffa48b4641;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp index b6092d197..f8295df45 100644 --- a/src/bin/lttng-sessiond/ust-registry-channel.cpp +++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp @@ -87,7 +87,7 @@ lst::type::cuptr create_event_header(const lst::abi& trace_abi, lst::stream_clas auto enum_mappings = std::make_shared(); lst::unsigned_enumeration_type::mapping compact_mapping{ "compact", lst::unsigned_enumeration_type::mapping::range_t(0, 30)}; - lst::unsigned_enumeration_type::mapping extended_mapping{"extended"}; + lst::unsigned_enumeration_type::mapping extended_mapping{"extended", 31}; enum_mappings->emplace_back(compact_mapping); enum_mappings->emplace_back(extended_mapping); @@ -149,7 +149,7 @@ lst::type::cuptr create_event_header(const lst::abi& trace_abi, lst::stream_clas auto enum_mappings = std::make_shared(); lst::unsigned_enumeration_type::mapping compact_mapping{"compact", lst::unsigned_enumeration_type::mapping::range_t(0, 65534)}; - lst::unsigned_enumeration_type::mapping extended_mapping{"extended"}; + lst::unsigned_enumeration_type::mapping extended_mapping{"extended", 65535}; enum_mappings->emplace_back(compact_mapping); enum_mappings->emplace_back(extended_mapping); @@ -404,13 +404,13 @@ lsu::registry_channel::~registry_channel() lttng_ht_destroy(_events); } -const lttng::sessiond::trace::type* lsu::registry_channel::get_event_context() const +const lttng::sessiond::trace::type* lsu::registry_channel::event_context() const { LTTNG_ASSERT(_is_registered); - return lst::stream_class::get_event_context(); + return lst::stream_class::event_context(); } -void lsu::registry_channel::set_event_context(lttng::sessiond::trace::type::cuptr context) +void lsu::registry_channel::event_context(lttng::sessiond::trace::type::cuptr context) { /* Must only be set once, on the first channel registration provided by an application. */ LTTNG_ASSERT(!_event_context);