Improve the way to get binder service in ResolverEventReporter
To prevent DNS lookup threads from being blocked by waiting for
the netd_listener service ready, use non-blocking call to get the
service.
Test: system/netd/tests/runtests.sh passed
Change-Id: I1148d49f87cce4091e18b5cfaf363177f4fdbfd0
diff --git a/resolv/ResolverEventReporter.cpp b/resolv/ResolverEventReporter.cpp
index 908cbce..da442ee 100644
--- a/resolv/ResolverEventReporter.cpp
+++ b/resolv/ResolverEventReporter.cpp
@@ -14,20 +14,25 @@
* limitations under the License.
*/
-#include <android/binder_manager.h>
-
#include "ResolverEventReporter.h"
+#include <android/binder_manager.h>
+
using aidl::android::net::metrics::INetdEventListener;
std::shared_ptr<INetdEventListener> ResolverEventReporter::getListener() {
// It should be initialized only once.
static ResolverEventReporter reporter;
-
- return reporter.mListener;
+ return reporter.getNetdEventListener();
}
-ResolverEventReporter::ResolverEventReporter() {
- ndk::SpAIBinder binder = ndk::SpAIBinder(AServiceManager_getService("netd_listener"));
- mListener = INetdEventListener::fromBinder(binder);
+std::shared_ptr<INetdEventListener> ResolverEventReporter::getNetdEventListener() {
+ std::lock_guard lock(mEventMutex);
+ if (mListener == nullptr) {
+ // Use the non-blocking call AServiceManager_checkService in order not to delay DNS
+ // lookup threads when the netd_listener service is not ready.
+ ndk::SpAIBinder binder = ndk::SpAIBinder(AServiceManager_checkService("netd_listener"));
+ mListener = INetdEventListener::fromBinder(binder);
+ }
+ return mListener;
}