diff options
Diffstat (limited to 'libs/binder/RpcSession.cpp')
-rw-r--r-- | libs/binder/RpcSession.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index 1a821f14c9..233a8e4b86 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp @@ -90,16 +90,16 @@ size_t RpcSession::getMaxIncomingThreads() { return mMaxIncomingThreads; } -void RpcSession::setMaxOutgoingConnections(size_t threads) { +void RpcSession::setMaxOutgoingConnections(size_t connections) { RpcMutexLockGuard _l(mMutex); LOG_ALWAYS_FATAL_IF(mStartedSetup, "Must set max outgoing threads before setting up connections"); - mMaxOutgoingThreads = threads; + mMaxOutgoingConnections = connections; } size_t RpcSession::getMaxOutgoingThreads() { RpcMutexLockGuard _l(mMutex); - return mMaxOutgoingThreads; + return mMaxOutgoingConnections; } bool RpcSession::setProtocolVersionInternal(uint32_t version, bool checkStarted) { @@ -558,11 +558,11 @@ status_t RpcSession::setupClient(const std::function<status_t(const std::vector< return status; } - size_t outgoingThreads = std::min(numThreadsAvailable, mMaxOutgoingThreads); - ALOGI_IF(outgoingThreads != numThreadsAvailable, + size_t outgoingConnections = std::min(numThreadsAvailable, mMaxOutgoingConnections); + ALOGI_IF(outgoingConnections != numThreadsAvailable, "Server hints client to start %zu outgoing threads, but client will only start %zu " "because it is preconfigured to start at most %zu outgoing threads.", - numThreadsAvailable, outgoingThreads, mMaxOutgoingThreads); + numThreadsAvailable, outgoingConnections, mMaxOutgoingConnections); // TODO(b/189955605): we should add additional sessions dynamically // instead of all at once - the other side should be responsible for setting @@ -571,10 +571,10 @@ status_t RpcSession::setupClient(const std::function<status_t(const std::vector< // any requests at all. // we've already setup one client - LOG_RPC_DETAIL("RpcSession::setupClient() instantiating %zu outgoing (server max: %zu) and %zu " - "incoming threads", - outgoingThreads, numThreadsAvailable, mMaxIncomingThreads); - for (size_t i = 0; i + 1 < outgoingThreads; i++) { + LOG_RPC_DETAIL("RpcSession::setupClient() instantiating %zu outgoing connections (server max: " + "%zu) and %zu incoming threads", + outgoingConnections, numThreadsAvailable, mMaxIncomingThreads); + for (size_t i = 0; i + 1 < outgoingConnections; i++) { if (status_t status = connectAndInit(mId, false /*incoming*/); status != OK) return status; } |