Skip to content

Commit 6da8363

Browse files
authored
subscriber_statistics_collectors_ should be protected by mutex. (#2592)
* subscriber_statistics_collectors_ should be protected by mutex. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> * reduce mutex lock scope. Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> --------- Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
1 parent ab7cf87 commit 6da8363

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

rclcpp/include/rclcpp/topic_statistics/subscription_topic_statistics.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,11 @@ class SubscriptionTopicStatistics
172172
{
173173
auto received_message_age = std::make_unique<ReceivedMessageAge>();
174174
received_message_age->Start();
175-
subscriber_statistics_collectors_.emplace_back(std::move(received_message_age));
176-
177175
auto received_message_period = std::make_unique<ReceivedMessagePeriod>();
178176
received_message_period->Start();
179177
{
180178
std::lock_guard<std::mutex> lock(mutex_);
179+
subscriber_statistics_collectors_.emplace_back(std::move(received_message_age));
181180
subscriber_statistics_collectors_.emplace_back(std::move(received_message_period));
182181
}
183182

rclcpp/test/rclcpp/topic_statistics/test_subscription_topic_statistics.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ TEST_F(TestSubscriptionTopicStatisticsFixture, test_receive_stats_for_message_no
343343
uint64_t message_age_count{0};
344344
uint64_t message_period_count{0};
345345

346-
std::set<std::string> received_metrics;
347346
for (const auto & msg : received_messages) {
348347
if (msg.metrics_source == kMessageAgeSourceLabel) {
349348
message_age_count++;

0 commit comments

Comments
 (0)