commit f6957b795ea3daca60fec61b3e2e67b597b0a62b
author Steven Moreland <smoreland@google.com> Sat Sep 24 03:12:16 2022 +0000
committer Steven Moreland <smoreland@google.com> Sat Sep 24 03:22:17 2022 +0000
tree c9e1f585c91197cfebe57777e0ca87773a9bfdbb
parent 00a54e416a72ab98ebb31c6dfb4b6eb581f41166

libbinder: log debug server start/stop

09-24 03:19:36.379  3299  3301 I binderHostDeviceTest-service: RpcBinder: Started Binder debug on android.binderHostDeviceTestService
09-24 03:19:36.380  3302  3302 I servicedispatcher: Finish setting up RPC on service binderHostDeviceTestService on port 52133
09-24 03:19:36.778  3299  3301 I binderHostDeviceTest-service: RpcBinder: binder died, shutting down RpcServer for android.binderHostDeviceTestService

Before we didn't have logs when this happens, but it's a pretty significant event.

Fixes: 244597104
Test: binderHostDeviceTest
Change-Id: Ic22851663d18e4fd3d3518a2b25714582f8e05d6

libs/binder/Binder.cpp

diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 481d704..5e725a9 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -232,7 +232,10 @@
           : mRpcServer(rpcServer), mKeepAliveBinder(keepAliveBinder), mBinder(binder) {}
     virtual ~RpcServerLink();
     void binderDied(const wp<IBinder>&) override {
-        LOG_RPC_DETAIL("RpcServerLink: binder died, shutting down RpcServer");
+        auto promoted = mBinder.promote();
+        ALOGI("RpcBinder: binder died, shutting down RpcServer for %s",
+              promoted ? String8(promoted->getInterfaceDescriptor()).c_str() : "<NULL>");
+
         if (mRpcServer == nullptr) {
             ALOGW("RpcServerLink: Unable to shut down RpcServer because it does not exist.");
         } else {
@@ -241,11 +244,7 @@
         }
         mRpcServer.clear();
 
-        auto promoted = mBinder.promote();
-        if (promoted == nullptr) {
-            ALOGW("RpcServerLink: Unable to remove link from parent binder object because parent "
-                  "binder object is gone.");
-        } else {
+        if (promoted) {
             promoted->removeRpcServerLink(sp<RpcServerLink>::fromExisting(this));
         }
         mBinder.clear();
@@ -706,6 +705,7 @@
         return status;
     }
     rpcServer->setMaxThreads(binderThreadPoolMaxCount);
+    LOG(INFO) << "RpcBinder: Started Binder debug on " << getInterfaceDescriptor();
     rpcServer->start();
     e->mRpcServerLinks.emplace(link);
     LOG_RPC_DETAIL("%s(fd=%d) successful", __PRETTY_FUNCTION__, socketFdForPrint);