Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1b079a0 authored by Mike Yu's avatar Mike Yu
Browse files

Make getStatusForMetrics safer against deadlock 

This CL makes the code safer against deadlock, because we don't
have to hold both cache lock and PrivateDnsConfiguration lock at
the same time.

Bug: 256507582
Test: atest
Change-Id: I8c4f9e17542c9847f6f1e95967d7d20a99856635
parent 87ca2454

PrivateDnsConfiguration.cpp

+2 −1
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ PrivateDnsStatus PrivateDnsConfiguration::getStatusLocked(unsigned netId) const 
}



NetworkDnsServerSupportReported PrivateDnsConfiguration::getStatusForMetrics(unsigned netId) const {

    const auto networkType = resolv_get_network_types_for_net(netId);

    std::lock_guard guard(mPrivateDnsLock);



    if (mPrivateDnsModes.find(netId) == mPrivateDnsModes.end()) {
@@ -202,7 +203,7 @@ NetworkDnsServerSupportReported PrivateDnsConfiguration::getStatusForMetrics(uns 


    const PrivateDnsStatus status = getStatusLocked(netId);

    NetworkDnsServerSupportReported event = {};

    event.set_network_type(resolv_get_network_types_for_net(netId));

    event.set_network_type(networkType);

    event.set_private_dns_modes(convertEnumType(status.mode));



    if (const auto it = mUnorderedDnsTracker.find(netId); it != mUnorderedDnsTracker.end()) {