commit e2dadf0c4f132d3a39309f4e274f1a35f7caaaed
author Yifan Hong <elsk@google.com> Tue Feb 14 15:43:31 2017 -0800
committer Yifan Hong <elsk@google.com> Wed Feb 15 15:51:12 2017 -0800
tree bce9aecee27424edcf19d44fa3f9e8908df9b33c
parent 38d53e0327f200a8a16f99d1e1a09e33c2be8e81

lshal: Add timeout for IPC calls.

IPC calls into interfaces should be done fault-torelently.
Add a timeout for each IPC call made so that lshal won't be
indefinitely blocked even if the interface don't reply
promptly.

Bug: 35317039

Test: lshal

Change-Id: Icb8157716ad68bddb5b33304b9063aa6f233985d

cmds/lshal/Lshal.cpp

diff --git a/cmds/lshal/Lshal.cpp b/cmds/lshal/Lshal.cpp
index d213fd3..a2dabce 100644
--- a/cmds/lshal/Lshal.cpp
+++ b/cmds/lshal/Lshal.cpp
@@ -29,6 +29,8 @@
 #include <android/hidl/manager/1.0/IServiceManager.h>
 #include <hidl/ServiceManagement.h>
 
+#include "Timeout.h"
+
 using ::android::hardware::hidl_string;
 using ::android::hidl::manager::V1_0::IServiceManager;
 
@@ -163,7 +165,7 @@
     using namespace ::android::hardware;
     using namespace ::android::hidl::manager::V1_0;
     using namespace ::android::hidl::base::V1_0;
-    auto ret = manager->list([&] (const auto &fqInstanceNames) {
+    auto ret = timeoutIPC(manager, &IServiceManager::list, [&] (const auto &fqInstanceNames) {
         for (const auto &fqInstanceName : fqInstanceNames) {
             putEntry({
                 .interfaceName = fqInstanceName,
@@ -186,7 +188,7 @@
     using namespace ::android::hardware;
     using namespace ::android::hidl::manager::V1_0;
     using namespace ::android::hidl::base::V1_0;
-    auto ret = manager->debugDump([&] (const auto &infos) {
+    auto ret = timeoutIPC(manager, &IServiceManager::debugDump, [&] (const auto &infos) {
         for (const auto &info : infos) {
             putEntry({
                 .interfaceName =
@@ -214,7 +216,7 @@
     using namespace ::android::hidl::base::V1_0;
     const std::string mode = "hwbinder";
     Status status = OK;
-    auto listRet = manager->list([&] (const auto &fqInstanceNames) {
+    auto listRet = timeoutIPC(manager, &IServiceManager::list, [&] (const auto &fqInstanceNames) {
         // server pid, .ptr value of binder object, child pids
         std::map<std::string, DebugInfo> allDebugInfos;
         std::map<pid_t, std::map<uint64_t, Pids>> allPids;
@@ -222,7 +224,7 @@
             const auto pair = split(fqInstanceName, '/');
             const auto &serviceName = pair.first;
             const auto &instanceName = pair.second;
-            auto getRet = manager->get(serviceName, instanceName);
+            auto getRet = timeoutIPC(manager, &IServiceManager::get, serviceName, instanceName);
             if (!getRet.isOk()) {
                 mErr << "Warning: Skipping \"" << fqInstanceName << "\": "
                      << "cannot be fetched from service manager:"
@@ -237,7 +239,7 @@
                 status |= DUMP_BINDERIZED_ERROR;
                 continue;
             }
-            auto debugRet = service->getDebugInfo([&] (const auto &debugInfo) {
+            auto debugRet = timeoutIPC(service, &IBase::getDebugInfo, [&] (const auto &debugInfo) {
                 allDebugInfos[fqInstanceName] = debugInfo;
                 if (debugInfo.pid >= 0) {
                     allPids[static_cast<pid_t>(debugInfo.pid)].clear();