From 6d31b87d46a9301fe86d273616ab3d7214d24e65 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 5 Jul 2022 18:31:15 -0400 Subject: [PATCH] Clean-up: sessiond: remove left-over code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ust_metadata_channel_statedump no longer exists and _metadata_dumped is unused. Signed-off-by: Jérémie Galarneau Change-Id: I2fa3f3bcb8d1c5a779ab1cfa0375174b479ed21f --- src/bin/lttng-sessiond/ust-app.cpp | 9 --------- src/bin/lttng-sessiond/ust-registry-channel.cpp | 1 - src/bin/lttng-sessiond/ust-registry-channel.hpp | 6 ------ 3 files changed, 16 deletions(-) diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp index c80658cbb..88db75f8f 100644 --- a/src/bin/lttng-sessiond/ust-app.cpp +++ b/src/bin/lttng-sessiond/ust-app.cpp @@ -6445,15 +6445,6 @@ static int handle_app_register_channel_notification(int sock, } } - /* Append to metadata */ - if (!ust_reg_chan._metadata_dumped) { - /*ret_code = ust_metadata_channel_statedump(registry, ust_reg_chan);*/ - if (ret_code) { - ERR("Error appending channel metadata (errno = %d)", ret_code); - goto reply; - } - } - reply: DBG3("UST app replying to register channel key %" PRIu64 " with id %u, ret = %d", chan_reg_key, chan_id, diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp index e7fe73971..85448b703 100644 --- a/src/bin/lttng-sessiond/ust-registry-channel.cpp +++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp @@ -85,7 +85,6 @@ lsu::registry_channel::registry_channel(unsigned int channel_id, lst::stream_class(channel_id, lst::stream_class::header_type::LARGE), _key{-1ULL}, _consumer_key{-1ULL}, - _metadata_dumped{false}, _next_event_id{0}, _is_registered_listener{channel_registered_listener}, _event_added_listener{event_added_listener}, diff --git a/src/bin/lttng-sessiond/ust-registry-channel.hpp b/src/bin/lttng-sessiond/ust-registry-channel.hpp index e8819812e..1e5745aed 100644 --- a/src/bin/lttng-sessiond/ust-registry-channel.hpp +++ b/src/bin/lttng-sessiond/ust-registry-channel.hpp @@ -55,12 +55,6 @@ public: uint64_t _key; uint64_t _consumer_key; - /* - * Flag for this channel if the metadata was dumped once during - * registration. 0 means no, 1 yes. - */ - unsigned int _metadata_dumped; - /* * Hash table containing events sent by the UST tracer. MUST be accessed * with a RCU read side lock acquired. -- 2.34.1