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

Socket code refactoring, plus stop polling with a 1s timeout in readBytes while we only want to poll with a 1ms timeout

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-03-04 13:40:00 -08:00
parent 0c226c7629
commit c202f8cf1d
2 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ixwebsocket/IXSocket.cpp
View File

@@ -28,7 +28,7 @@ namespace ix
Socket::Socket(int fd) :
_sockfd(fd)
{
_readBuffer.resize(kChunkSize);
;
}
Socket::~Socket()
@@ -44,22 +44,7 @@ namespace ix
return;
}
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(_sockfd, &rfds);
#ifdef __linux__
FD_SET(_eventfd.getFd(), &rfds);
#endif
struct timeval timeout;
timeout.tv_sec = timeoutSecs;
timeout.tv_usec = 0;
int sockfd = _sockfd;
int nfds = (std::max)(sockfd, _eventfd.getFd());
int ret = select(nfds + 1, &rfds, nullptr, nullptr,
(timeoutSecs < 0) ? nullptr : &timeout);
int ret = select(timeoutSecs, 0);
PollResultType pollResult = PollResultType_ReadyForRead;
if (ret < 0)
@@ -74,6 +59,27 @@ namespace ix
if (onPollCallback) onPollCallback(pollResult);
}
int Socket::select(int timeoutSecs, int timeoutMs)
{
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(_sockfd, &rfds);
#ifdef __linux__
FD_SET(_eventfd.getFd(), &rfds);
#endif
struct timeval timeout;
timeout.tv_sec = timeoutSecs;
timeout.tv_usec = 1000 * timeoutMs;
int sockfd = _sockfd;
int nfds = (std::max)(sockfd, _eventfd.getFd());
int ret = ::select(nfds + 1, &rfds, nullptr, nullptr,
(timeoutSecs < 0) ? nullptr : &timeout);
return ret;
}
void Socket::wakeUpFromPoll()
{
// this will wake up the thread blocked on select, only needed on Linux
@@ -216,8 +222,13 @@ namespace ix
else if (ret < 0 && (getErrno() == EWOULDBLOCK ||
getErrno() == EAGAIN))
{
// wait with 1 ms timeout
poll(nullptr, 1);
// Wait with a timeout until something is ready to read.
// This way we are not busy looping
int res = select(0, 1);
if (res < 0 && (errno == EBADF || errno == EINVAL))
{
return false;
}
}
// There was an error during the read, abort
else
@@ -253,6 +264,11 @@ namespace ix
const OnProgressCallback& onProgressCallback,
const CancellationRequest& isCancellationRequested)
{
if (_readBuffer.empty())
{
_readBuffer.resize(kChunkSize);
}
std::vector<uint8_t> output;
while (output.size() != length)
{
@@ -276,8 +292,9 @@ namespace ix
if (onProgressCallback) onProgressCallback((int) output.size(), (int) length);
// Error
poll(nullptr, 10);
// Wait with a timeout until something is ready to read.
// This way we are not busy looping
select(0, 1);
}
return std::make_pair(true, std::string(output.begin(),