tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use a pipe rather than a socketpair to collect debug information from"

Browse source 
am: 14906cd8e9

Change-Id: I6e8622374d62ebba2a72f6abff253669c3b8351e
This commit is contained in:
Andreas Huber 2018-05-29 17:44:57 -07:00 committed by android-build-merger
commit 9129e86f04
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmds/lshal/PipeRelay.cpp
View file

@ -16,7 +16,6 @@
#include "PipeRelay.h"
#include <sys/socket.h>
#include <utils/Thread.h>
namespace android {
@ -58,7 +57,7 @@ bool PipeRelay::RelayThread::threadLoop() {
PipeRelay::PipeRelay(std::ostream &os)
: mInitCheck(NO_INIT) {
int res = socketpair(AF_UNIX, SOCK_STREAM, 0 /* protocol */, mFds);
int res = pipe(mFds);
if (res < 0) {
mInitCheck = -errno;
@ -77,20 +76,13 @@ void PipeRelay::CloseFd(int *fd) {
}
PipeRelay::~PipeRelay() {
if (mFds[1] >= 0) {
shutdown(mFds[1], SHUT_WR);
}
if (mFds[0] >= 0) {
shutdown(mFds[0], SHUT_RD);
}
CloseFd(&mFds[1]);
if (mThread != NULL) {
mThread->join();
mThread.clear();
}
CloseFd(&mFds[1]);
CloseFd(&mFds[0]);
}