X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-session.cpp;h=03a87e2868f98d4f36848e0f2f45d9f3a88e41c4;hb=0267b5278de7bf4ee1ec11f2270dec4b44e80f36;hp=255a5ec8176ce96dc17c4e6e5a446549735aea8d;hpb=97f630d42cd12a475293af66e75a71ab7b490633;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp index 255a5ec81..03a87e286 100644 --- a/src/bin/lttng-sessiond/ust-registry-session.cpp +++ b/src/bin/lttng-sessiond/ust-registry-session.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -88,7 +89,7 @@ void destroy_channel_rcu(struct rcu_head *head) DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF lsu::registry_channel *chan = - caa_container_of(head, lsu::registry_channel, _rcu_head); + lttng::utils::container_of(head, &lsu::registry_channel::_rcu_head); DIAGNOSTIC_POP delete chan; @@ -98,8 +99,10 @@ void destroy_channel_rcu(struct rcu_head *head) * Destroy every element of the registry and free the memory. This does NOT * free the registry pointer since it might not have been allocated before so * it's the caller responsability. + * + * Called from ~registry_session(), must not throw. */ -void destroy_channel(lsu::registry_channel *chan, bool notify) +void destroy_channel(lsu::registry_channel *chan, bool notify) noexcept { struct lttng_ht_iter iter; lttng::sessiond::ust::registry_event *event; @@ -123,7 +126,7 @@ void destroy_channel(lsu::registry_channel *chan, bool notify) DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF cds_lfht_for_each_entry( - chan->_events->ht, &iter.iter, event, _node.node) { + chan->_events->ht, &iter.iter, event, _node) { /* Delete the node from the ht and free it. */ ust_registry_channel_destroy_event(chan, event); } @@ -147,7 +150,7 @@ void destroy_enum_rcu(struct rcu_head *head) DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF lsu::registry_enum *reg_enum = - caa_container_of(head, lsu::registry_enum, rcu_head); + lttng::utils::container_of(head, &lsu::registry_enum::rcu_head); DIAGNOSTIC_POP destroy_enum(reg_enum); @@ -238,16 +241,18 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi, lst::trace_class(in_abi, generate_uuid_or_throw()), _root_shm_path{root_shm_path ? root_shm_path : ""}, _shm_path{shm_path ? shm_path : ""}, - _metadata_path{_shm_path.size() > 0 ? - fmt::format("{}/metadata", _shm_path) : std::string("")}, + _metadata_path{_shm_path.size() > 0 ? fmt::format("{}/metadata", _shm_path) : + std::string("")}, _uid{euid}, _gid{egid}, _app_tracer_version{.major = major, .minor = minor}, _tracing_id{tracing_id}, - _metadata_generating_visitor{lttng::make_unique(abi, - [this](const std::string& fragment) { + _clock{lttng::make_unique()}, + _metadata_generating_visitor{lttng::make_unique( + abi, [this](const std::string& fragment) { _append_metadata_fragment(fragment); - })} + })}, + _packet_header{_create_packet_header()} { pthread_mutex_init(&_lock, NULL); if (_shm_path.size() > 0) { @@ -283,11 +288,51 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi, } } +lst::type::cuptr lsu::registry_session::_create_packet_header() const +{ + lst::structure_type::fields packet_header_fields; + + /* uint32_t magic */ + packet_header_fields.emplace_back(lttng::make_unique("magic", + lttng::make_unique(abi.uint32_t_alignment, + abi.byte_order, 32, lst::integer_type::signedness::UNSIGNED, + lst::integer_type::base::HEXADECIMAL, + std::initializer_list({lst::integer_type::role::PACKET_MAGIC_NUMBER})))); + + /* uuid */ + packet_header_fields.emplace_back(lttng::make_unique("uuid", + lttng::make_unique(0, 16, + std::initializer_list({lst::static_length_blob_type::role::TRACE_CLASS_UUID})))); + + /* uint32_t stream_id */ + packet_header_fields.emplace_back(lttng::make_unique("stream_id", + lttng::make_unique(abi.uint32_t_alignment, + abi.byte_order, 32, lst::integer_type::signedness::UNSIGNED, + lst::integer_type::base::DECIMAL, + std::initializer_list({lst::integer_type::role::DATA_STREAM_CLASS_ID})))); + + /* uint64_t stream_instance_id */ + packet_header_fields.emplace_back(lttng::make_unique("stream_instance_id", + lttng::make_unique(abi.uint64_t_alignment, + abi.byte_order, 64, lst::integer_type::signedness::UNSIGNED, + lst::integer_type::base::DECIMAL, + std::initializer_list({lst::integer_type::role::DATA_STREAM_ID})))); + + return lttng::make_unique(0, std::move(packet_header_fields)); +} + +const lst::type *lsu::registry_session::get_packet_header() const noexcept +{ + return _packet_header.get(); +} + /* * For a given enumeration in a registry, delete the entry and destroy * the enumeration. + * + * Note that this is used by ~registry_session() and must not throw. */ -void lsu::registry_session::_destroy_enum(lsu::registry_enum *reg_enum) +void lsu::registry_session::_destroy_enum(lsu::registry_enum *reg_enum) noexcept { int ret; lttng::urcu::read_lock_guard read_lock_guard; @@ -385,7 +430,7 @@ void lsu::registry_session::add_channel(uint64_t key) } auto chan = new lsu::registry_channel( - _get_next_channel_id(), + _get_next_channel_id(), abi, _clock->name, /* Registered channel listener. */ [this](const lsu::registry_channel& registered_channel) { /* @@ -430,7 +475,7 @@ lttng::sessiond::ust::registry_channel& lsu::registry_session::get_channel( DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF - auto chan = caa_container_of(node, lsu::registry_channel, _node); + auto chan = lttng::utils::container_of(node, &lsu::registry_channel::_node); DIAGNOSTIC_POP return *chan; } @@ -483,7 +528,7 @@ void lsu::registry_session::_visit_environment( void lsu::registry_session::_accept_on_clock_classes(lst::trace_class_visitor& visitor) const { ASSERT_LOCKED(_lock); - _clock.accept(visitor); + _clock->accept(visitor); } void lsu::registry_session::_accept_on_stream_classes(lst::trace_class_visitor& visitor) const @@ -609,6 +654,9 @@ void lsu::registry_session::regenerate_metadata() { lttng::pthread::lock_guard registry_lock(_lock); + /* Resample the clock */ + _clock = lttng::make_unique(); + _metadata_version++; _reset_metadata(); _generate_metadata(); @@ -650,7 +698,7 @@ lsu::registry_session::get_enumeration(const char *enum_name, uint64_t enum_id) DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF - reg_enum = caa_container_of(node, lsu::registry_enum, node); + reg_enum = lttng::utils::container_of(node, &lsu::registry_enum::node); DIAGNOSTIC_POP return lsu::registry_enum::const_rcu_protected_reference{*reg_enum, std::move(rcu_lock)}; @@ -678,7 +726,7 @@ lsu::registry_enum *lsu::registry_session::_lookup_enum( DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF - reg_enum = caa_container_of(node, lsu::registry_enum, node); + reg_enum = lttng::utils::container_of(node, &lsu::registry_enum::node); DIAGNOSTIC_POP end: @@ -758,4 +806,4 @@ void lsu::registry_session::create_or_find_enum( DBG("UST registry reply with enum %s with id %" PRIu64 " in sess_objd: %u", enum_name, reg_enum->id, session_objd); *enum_id = reg_enum->id; -} \ No newline at end of file +}