commit fa55d6ec8496deb5e40865f13f8bf6a971ca622d
author Martijn Coenen <maco@google.com> Tue Dec 20 06:08:31 2016 +0100
committer Martijn Coenen <maco@google.com> Thu Dec 29 09:10:47 2016 +0100
tree 74f28bc9ffa1fec4cb017e06c6dc351217e93a28
parent 8d12b50cfb20eaef50e0998abe8d458866896003

Automatically start threadpool.

Generated code should automatically start a threadpool
in one of the following scenarios:
  - You pass an asynchronous interface to a remote process
    (so you can receive calls on it).
  - You register a death recipient on an interface
    (so the kernel can notify you on this thread when it dies).

Also, updated tests to use the new configure/joinThreadPool() API.

Bug: 31748996
Test: mma, hidl_test, hidl_test_java
Change-Id: I2262580282c9b25c2e004dfd928b7444f4be78d9

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 259563b..0b98d6b 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -53,8 +53,8 @@
 
 #include <hidl/Status.h>
 #include <hidlmemory/mapping.h>
+
 #include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
 
 #include <utils/Condition.h>
 #include <utils/Timers.h>
@@ -95,9 +95,10 @@
 using ::android::hardware::tests::pointer::V1_0::IPointer;
 using ::android::hardware::tests::memory::V1_0::IMemoryTest;
 using ::android::hardware::IPCThreadState;
-using ::android::hardware::ProcessState;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
+using ::android::hardware::configureRpcThreadpool;
+using ::android::hardware::joinRpcThreadpool;
 using ::android::hardware::hidl_array;
 using ::android::hardware::hidl_death_recipient;
 using ::android::hardware::hidl_memory;
@@ -279,6 +280,7 @@
     // binderized service.
     if ((pid = fork()) == 0) {
         // in child process
+        configureRpcThreadpool(1, true /*callerWillJoin*/);
         sp<T> server = T::getService(serviceName, true);
         gServiceName = serviceName;
         signal(SIGTERM, signal_handler);
@@ -289,9 +291,7 @@
             exit(-1);
         }
         ALOGD("SERVER starting %s", serviceName.c_str());
-        ProcessState::self()->setThreadPoolMaxThreadCount(0);
-        ProcessState::self()->startThreadPool();
-        IPCThreadState::self()->joinThreadPool();
+        joinRpcThreadpool();
         ALOGD("SERVER %s ends.", serviceName.c_str());
         exit(0);
     }
@@ -338,7 +338,6 @@
     }
 
     void getServices() {
-
         manager = IServiceManager::getService("manager");
 
         // alternatively:
@@ -590,9 +589,6 @@
         std::string instanceName = "test-instance";
         EXPECT_TRUE(ISimple::registerForNotifications(instanceName, notification));
 
-        ProcessState::self()->setThreadPoolMaxThreadCount(0);
-        ProcessState::self()->startThreadPool();
-
         Simple* instance = new Simple(1);
         EXPECT_EQ(::android::OK, instance->registerAsService(instanceName));
 
@@ -623,9 +619,6 @@
         std::string instanceTwo = "test-instance-two";
         EXPECT_TRUE(ISimple::registerForNotifications("", notification));
 
-        ProcessState::self()->setThreadPoolMaxThreadCount(0);
-        ProcessState::self()->startThreadPool();
-
         Simple* instanceA = new Simple(1);
         EXPECT_EQ(::android::OK, instanceA->registerAsService(instanceOne));
         Simple* instanceB = new Simple(2);
@@ -1232,10 +1225,6 @@
 };
 
 TEST_F(HidlTest, DeathRecipientTest) {
-    // Need a threadpool to receive death calls from the kernel
-    ProcessState::self()->setThreadPoolMaxThreadCount(0);
-    ProcessState::self()->startThreadPool();
-
     sp<HidlDeathRecipient> recipient = new HidlDeathRecipient();
     sp<HidlDeathRecipient> recipient2 = new HidlDeathRecipient();