summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2018-09-26 16:07:12 -0700
committer Yifan Hong <elsk@google.com> 2018-09-26 16:09:46 -0700
commita5ae7868e74c70b7586b4cfe2f1e4311dbec3c05 (patch)
tree19cbe643631dc8dc13d9cb18d11192790ba39173
parent85eaa63b1d122790d364ae02cdc8a8c2f1e73cf3 (diff)
Revert "lshal: close fd before joining thread"
This reverts commit b9d19c87abce709ba11da4f0307cc6922b9aa52d. Reason of revert: will sometimes cause `lshal debug` to produce no output at all. Bug: 111997867 Test: while true; do date; lshal debug android.hardware.health.storage@1.0::IStorage/default; done Change-Id: I31062b479ea8a9f1c5b94a1ad0969bc5e2e92cd3
-rw-r--r--cmds/lshal/PipeRelay.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/lshal/PipeRelay.cpp b/cmds/lshal/PipeRelay.cpp
index 3a17e03050..87d75ac2d4 100644
--- a/cmds/lshal/PipeRelay.cpp
+++ b/cmds/lshal/PipeRelay.cpp
@@ -77,12 +77,13 @@ void PipeRelay::CloseFd(int *fd) {
PipeRelay::~PipeRelay() {
CloseFd(&mFds[1]);
- CloseFd(&mFds[0]);
if (mThread != nullptr) {
mThread->join();
mThread.clear();
}
+
+ CloseFd(&mFds[0]);
}
status_t PipeRelay::initCheck() const {