From 9dcab80617b54e1c9a8f82fefb601489b3e154ae Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 4 Aug 2020 11:19:28 +0200 Subject: [PATCH] Remove stat API from EmulatedEndpoint. stats() method on EmulatedEndpoint has to be called from network emulation internal task queue and user has no access to that task queue, so user can't call this method. Because of that remove it from public API and keep it only on implementation. Bug: webrtc:11756 Change-Id: I2fb7256abe94d6900965512f90c6a53a0708a7b0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180880 Reviewed-by: Tommi Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#31867} --- api/test/network_emulation/network_emulation_interfaces.h | 2 -- test/network/network_emulation.h | 2 +- test/network/network_emulation_manager.cc | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/test/network_emulation/network_emulation_interfaces.h b/api/test/network_emulation/network_emulation_interfaces.h index ebb1eedc78..db1f9ada67 100644 --- a/api/test/network_emulation/network_emulation_interfaces.h +++ b/api/test/network_emulation/network_emulation_interfaces.h @@ -187,8 +187,6 @@ class EmulatedEndpoint : public EmulatedNetworkReceiverInterface { virtual void UnbindReceiver(uint16_t port) = 0; virtual rtc::IPAddress GetPeerLocalAddress() const = 0; - virtual std::unique_ptr stats() const = 0; - private: // Ensure that there can be no other subclass than EmulatedEndpointImpl. This // means that it's always safe to downcast EmulatedEndpoint instances to diff --git a/test/network/network_emulation.h b/test/network/network_emulation.h index 5531efd041..c60f85d0b9 100644 --- a/test/network/network_emulation.h +++ b/test/network/network_emulation.h @@ -447,7 +447,7 @@ class EmulatedEndpointImpl : public EmulatedEndpoint { const rtc::Network& network() const { return *network_.get(); } - std::unique_ptr stats() const override; + std::unique_ptr stats() const; private: static constexpr uint16_t kFirstEphemeralPort = 49152; diff --git a/test/network/network_emulation_manager.cc b/test/network/network_emulation_manager.cc index b5ba4545ba..1e8e5ef9ff 100644 --- a/test/network/network_emulation_manager.cc +++ b/test/network/network_emulation_manager.cc @@ -301,7 +301,11 @@ void NetworkEmulationManagerImpl::GetStats( task_queue_.PostTask([endpoints, stats_callback]() { EmulatedNetworkStatsBuilder stats_builder; for (auto* endpoint : endpoints) { - stats_builder.AddEmulatedNetworkStats(*endpoint->stats()); + // It's safe to cast here because EmulatedEndpointImpl can be the only + // implementation of EmulatedEndpoint, because only it has access to + // EmulatedEndpoint constructor. + auto endpoint_impl = static_cast(endpoint); + stats_builder.AddEmulatedNetworkStats(*endpoint_impl->stats()); } stats_callback(stats_builder.Build()); });