mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 13:20:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete expired field trial WebRTC-SignalNetworkPreferenceChange

Browse source 
Bug: webrtc:42221944
Change-Id: I786d73f5ede27d4ab40a9b3b2fef49da45bd3444
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350302
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42274}
This commit is contained in:
Danil Chapovalov 2024-05-08 17:17:51 +02:00 committed by WebRTC LUCI CQ
parent 14426c0ff9
commit b0fe794d7d
3 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
experiments/field_trials.py
View file

@ -736,9 +736,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-SetSocketReceiveBuffer', FieldTrial('WebRTC-SetSocketReceiveBuffer',
42223976, 42223976,
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-SignalNetworkPreferenceChange',
42221944,
date(2024, 4, 1)),
FieldTrial('WebRTC-SimulcastEncoderAdapter-GetEncoderInfoOverride', FieldTrial('WebRTC-SimulcastEncoderAdapter-GetEncoderInfoOverride',
NO_BUG, NO_BUG,
date(2024, 4, 1)), date(2024, 4, 1)),
@ -878,7 +875,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
]) # yapf: disable ]) # yapf: disable
POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \ POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
'84f7bc41874cd36cc4d5306e86972f53fef83f29' 'b0b0cce63bfdf327229b569576a07b716db186b7'
REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union( REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
POLICY_EXEMPT_FIELD_TRIALS) POLICY_EXEMPT_FIELD_TRIALS)

22
rtc_base/network.cc
View file

@ -306,14 +306,8 @@ webrtc::MdnsResponderInterface* NetworkManager::GetMdnsResponder() const {
return nullptr; return nullptr;
} }
NetworkManagerBase::NetworkManagerBase( NetworkManagerBase::NetworkManagerBase()
const webrtc::FieldTrialsView* field_trials) : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED) {}
: field_trials_(field_trials),
enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED),
signal_network_preference_change_(
field_trials
? field_trials->IsEnabled("WebRTC-SignalNetworkPreferenceChange")
: false) {}
NetworkManager::EnumerationPermission NetworkManager::EnumerationPermission
NetworkManagerBase::enumeration_permission() const { NetworkManagerBase::enumeration_permission() const {
@ -439,9 +433,6 @@ void NetworkManagerBase::MergeNetworkList(
} }
if (net->network_preference() != existing_net->network_preference()) { if (net->network_preference() != existing_net->network_preference()) {
existing_net->set_network_preference(net->network_preference()); existing_net->set_network_preference(net->network_preference());
if (signal_network_preference_change_) {
*changed = true;
}
} }
RTC_DCHECK(net->active()); RTC_DCHECK(net->active());
} }
@ -546,14 +537,13 @@ BasicNetworkManager::BasicNetworkManager(
NetworkMonitorFactory* network_monitor_factory, NetworkMonitorFactory* network_monitor_factory,
SocketFactory* socket_factory, SocketFactory* socket_factory,
const webrtc::FieldTrialsView* field_trials_view) const webrtc::FieldTrialsView* field_trials_view)
: NetworkManagerBase(field_trials_view), : field_trials_(field_trials_view),
field_trials_(field_trials_view),
network_monitor_factory_(network_monitor_factory), network_monitor_factory_(network_monitor_factory),
socket_factory_(socket_factory), socket_factory_(socket_factory),
allow_mac_based_ipv6_( allow_mac_based_ipv6_(
field_trials()->IsEnabled("WebRTC-AllowMACBasedIPv6")), field_trials_->IsEnabled("WebRTC-AllowMACBasedIPv6")),
bind_using_ifname_( bind_using_ifname_(
!field_trials()->IsDisabled("WebRTC-BindUsingInterfaceName")) { !field_trials_->IsDisabled("WebRTC-BindUsingInterfaceName")) {
RTC_DCHECK(socket_factory_); RTC_DCHECK(socket_factory_);
} }
@ -998,7 +988,7 @@ void BasicNetworkManager::StartNetworkMonitor() {
} }
if (!network_monitor_) { if (!network_monitor_) {
network_monitor_.reset( network_monitor_.reset(
network_monitor_factory_->CreateNetworkMonitor(*field_trials())); network_monitor_factory_->CreateNetworkMonitor(*field_trials_));
if (!network_monitor_) { if (!network_monitor_) {
return; return;
} }

13
rtc_base/network.h
View file

@ -191,7 +191,7 @@ class RTC_EXPORT NetworkManager : public DefaultLocalAddressProvider,
// Base class for NetworkManager implementations. // Base class for NetworkManager implementations.
class RTC_EXPORT NetworkManagerBase : public NetworkManager { class RTC_EXPORT NetworkManagerBase : public NetworkManager {
public: public:
NetworkManagerBase(const webrtc::FieldTrialsView* field_trials = nullptr); NetworkManagerBase();
std::vector<const Network*> GetNetworks() const override; std::vector<const Network*> GetNetworks() const override;
std::vector<const Network*> GetAnyAddressNetworks() override; std::vector<const Network*> GetAnyAddressNetworks() override;
@ -237,15 +237,8 @@ class RTC_EXPORT NetworkManagerBase : public NetworkManager {
int prefix_length, int prefix_length,
AdapterType type) const; AdapterType type) const;
const webrtc::FieldTrialsView* field_trials() const {
return field_trials_.get();
}
private: private:
friend class NetworkTest; friend class NetworkTest;
webrtc::AlwaysValidPointer<const webrtc::FieldTrialsView,
webrtc::FieldTrialBasedConfig>
field_trials_;
EnumerationPermission enumeration_permission_; EnumerationPermission enumeration_permission_;
std::vector<Network*> networks_; std::vector<Network*> networks_;
@ -262,10 +255,6 @@ class RTC_EXPORT NetworkManagerBase : public NetworkManager {
// network id 0 because we only compare the network ids in the old and the new // network id 0 because we only compare the network ids in the old and the new
// best connections in the transport channel. // best connections in the transport channel.
uint16_t next_available_network_id_ = 1; uint16_t next_available_network_id_ = 1;
// True if calling network_preference() with a changed value
// should result in firing the SignalNetworkChanged signal.
bool signal_network_preference_change_ = false;
}; };
// Basic implementation of the NetworkManager interface that gets list // Basic implementation of the NetworkManager interface that gets list