commit 1042306ba3bdaf4fbca2e84bf81f5cbbf2bcab3d
author Yifan Hong <elsk@google.com> Fri Oct 08 16:26:32 2021 -0700
committer Yifan Hong <elsk@google.com> Fri Oct 08 19:16:48 2021 -0700
tree 220cae619e357e56b18fdfbc0e7d78a377957aab
parent a25b01205608f993dfdc5f9589a9eef4f159baa4

binder: RpcSession::*MaxThreads -> *MaxIncomingThreads

We'll add a separate number for outgoing threads

Bug: 194225767
Test: pass

Change-Id: I7bf178c098adc6359582792a2f1ca1248a336b9f

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 37f6c7f..486b67b 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -76,18 +76,18 @@
     return sp<RpcSession>::make(std::move(ctx));
 }
 
-void RpcSession::setMaxThreads(size_t threads) {
+void RpcSession::setMaxIncomingThreads(size_t threads) {
     std::lock_guard<std::mutex> _l(mMutex);
     LOG_ALWAYS_FATAL_IF(!mConnections.mOutgoing.empty() || !mConnections.mIncoming.empty(),
-                        "Must set max threads before setting up connections, but has %zu client(s) "
-                        "and %zu server(s)",
+                        "Must set max incoming threads before setting up connections, but has %zu "
+                        "client(s) and %zu server(s)",
                         mConnections.mOutgoing.size(), mConnections.mIncoming.size());
-    mMaxThreads = threads;
+    mMaxIncomingThreads = threads;
 }
 
-size_t RpcSession::getMaxThreads() {
+size_t RpcSession::getMaxIncomingThreads() {
     std::lock_guard<std::mutex> _l(mMutex);
-    return mMaxThreads;
+    return mMaxIncomingThreads;
 }
 
 bool RpcSession::setProtocolVersion(uint32_t version) {
@@ -484,7 +484,7 @@
         if (status_t status = connectAndInit(mId, false /*incoming*/); status != OK) return status;
     }
 
-    for (size_t i = 0; i < mMaxThreads; i++) {
+    for (size_t i = 0; i < mMaxIncomingThreads; i++) {
         if (status_t status = connectAndInit(mId, true /*incoming*/); status != OK) return status;
     }
 
@@ -697,9 +697,9 @@
         std::unique_ptr<RpcTransport> rpcTransport) {
     std::lock_guard<std::mutex> _l(mMutex);
 
-    if (mConnections.mIncoming.size() >= mMaxThreads) {
+    if (mConnections.mIncoming.size() >= mMaxIncomingThreads) {
         ALOGE("Cannot add thread to session with %zu threads (max is set to %zu)",
-              mConnections.mIncoming.size(), mMaxThreads);
+              mConnections.mIncoming.size(), mMaxIncomingThreads);
         return nullptr;
     }