libbinder: FdTrigger methods use status_t
Instead of boolean :) for better, more actionable logs.
Bug: 185167543
Test: binderRpcTest
Change-Id: I097784a45e9f7a8c8cfa44f9521ae4f4049de7fc
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index 6ad3b45..e3bf2a5 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -151,9 +151,11 @@
LOG_ALWAYS_FATAL_IF(mShutdownTrigger == nullptr, "Cannot create join signaler");
}
- while (mShutdownTrigger->triggerablePollRead(mServer)) {
+ status_t status;
+ while ((status = mShutdownTrigger->triggerablePollRead(mServer)) == OK) {
(void)acceptOne();
}
+ LOG_RPC_DETAIL("RpcServer::join exiting with %s", statusToString(status).c_str());
{
std::lock_guard<std::mutex> _l(mLock);
@@ -236,10 +238,13 @@
LOG_ALWAYS_FATAL_IF(server->mShutdownTrigger == nullptr);
int32_t id;
- bool idValid =
+ status_t status =
server->mShutdownTrigger->interruptableReadFully(clientFd.get(), &id, sizeof(id));
+ bool idValid = status == OK;
if (!idValid) {
- ALOGE("Failed to read ID for client connecting to RPC server.");
+ ALOGE("Failed to read ID for client connecting to RPC server: %s",
+ statusToString(status).c_str());
+ // still need to cleanup before we can return
}
std::thread thisThread;