kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable sigpipe on osx when writing/reading into a dead pipe

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-03-18 17:52:01 -07:00
parent 521f02c90e
commit c421d19800
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ixwebsocket/IXSelectInterruptPipe.cpp
View File

@@ -56,7 +56,7 @@ namespace ix
if (fcntl(_fildes[kPipeReadIndex], F_SETFL, O_NONBLOCK) == -1) if (fcntl(_fildes[kPipeReadIndex], F_SETFL, O_NONBLOCK) == -1)
{ {
std::stringstream ss; std::stringstream ss;
ss << "SelectInterruptPipe::init() failed in fcntl() call" ss << "SelectInterruptPipe::init() failed in fcntl(..., O_NONBLOCK) call"
<< " : " << strerror(errno); << " : " << strerror(errno);
errorMsg = ss.str(); errorMsg = ss.str();
@@ -68,7 +68,7 @@ namespace ix
if (fcntl(_fildes[kPipeWriteIndex], F_SETFL, O_NONBLOCK) == -1) if (fcntl(_fildes[kPipeWriteIndex], F_SETFL, O_NONBLOCK) == -1)
{ {
std::stringstream ss; std::stringstream ss;
ss << "SelectInterruptPipe::init() failed in fcntl() call" ss << "SelectInterruptPipe::init() failed in fcntl(..., O_NONBLOCK) call"
<< " : " << strerror(errno); << " : " << strerror(errno);
errorMsg = ss.str(); errorMsg = ss.str();
@@ -77,13 +77,31 @@ namespace ix
return false; return false;
} }
// #ifdef F_SETNOSIGPIPE
// FIXME: on macOS we should configure the pipe to not trigger SIGPIPE if (fcntl(_fildes[kPipeWriteIndex], F_SETNOSIGPIPE, 1) == -1)
// on reads/writes to a closed fd {
// std::stringstream ss;
// The generation of the SIGPIPE signal can be suppressed using the ss << "SelectInterruptPipe::init() failed in fcntl(.... F_SETNOSIGPIPE) call"
// F_SETNOSIGPIPE fcntl command. << " : " << strerror(errno);
// errorMsg = ss.str();
_fildes[kPipeReadIndex] = -1;
_fildes[kPipeWriteIndex] = -1;
return false;
}
if (fcntl(_fildes[kPipeWriteIndex], F_SETNOSIGPIPE, 1) == -1)
{
std::stringstream ss;
ss << "SelectInterruptPipe::init() failed in fcntl(..., F_SETNOSIGPIPE) call"
<< " : " << strerror(errno);
errorMsg = ss.str();
_fildes[kPipeReadIndex] = -1;
_fildes[kPipeWriteIndex] = -1;
return false;
}
#endif
return true; return true;
} }