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

select refactoring IXSocket::select -> IXSocket::poll

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-06-25 10:16:40 -07:00
parent 06b4762c19
commit eea42bff66
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ixwebsocket/IXSocket.cpp
View File

@ -44,12 +44,10 @@ namespace ix
close(); close();
} }
PollResultType Socket::poll(int timeoutMs) PollResultType Socket::poll(bool readyToRead,
{ int timeoutMs,
return isReadyToRead(timeoutMs); int sockfd,
} int interruptFd)
PollResultType Socket::select(bool readyToRead, int timeoutMs)
{ {
fd_set rfds; fd_set rfds;
fd_set wfds; fd_set wfds;
@ -57,13 +55,12 @@ namespace ix
FD_ZERO(&wfds); FD_ZERO(&wfds);
fd_set* fds = (readyToRead) ? &rfds : & wfds; fd_set* fds = (readyToRead) ? &rfds : & wfds;
if (_sockfd != -1) if (sockfd != -1)
{ {
FD_SET(_sockfd, fds); FD_SET(sockfd, fds);
} }
// File descriptor used to interrupt select when needed // File descriptor used to interrupt select when needed
int interruptFd = _selectInterrupt->getFd();
if (interruptFd != -1) if (interruptFd != -1)
{ {
FD_SET(interruptFd, fds); FD_SET(interruptFd, fds);
@ -74,7 +71,6 @@ namespace ix
timeout.tv_usec = 1000 * (timeoutMs % 1000); timeout.tv_usec = 1000 * (timeoutMs % 1000);
// Compute the highest fd. // Compute the highest fd.
int sockfd = _sockfd;
int nfds = (std::max)(sockfd, interruptFd); int nfds = (std::max)(sockfd, interruptFd);
int ret = ::select(nfds + 1, &rfds, &wfds, nullptr, int ret = ::select(nfds + 1, &rfds, &wfds, nullptr,
@ -122,7 +118,7 @@ namespace ix
} }
bool readyToRead = true; bool readyToRead = true;
return select(readyToRead, timeoutMs); return poll(readyToRead, timeoutMs, _sockfd, _selectInterrupt->getFd());
} }
PollResultType Socket::isReadyToWrite(int timeoutMs) PollResultType Socket::isReadyToWrite(int timeoutMs)
@ -133,7 +129,7 @@ namespace ix
} }
bool readyToRead = false; bool readyToRead = false;
return select(readyToRead, timeoutMs); return poll(readyToRead, timeoutMs, _sockfd, _selectInterrupt->getFd());
} }
// Wake up from poll/select by writing to the pipe which is watched by select // Wake up from poll/select by writing to the pipe which is watched by select

5
ixwebsocket/IXSocket.h
View File

@ -97,7 +97,10 @@ namespace ix
std::mutex _socketMutex; std::mutex _socketMutex;
private: private:
PollResultType select(bool readyToRead, int timeoutMs); PollResultType poll(bool readyToRead,
int timeoutMs,
int sockfd,
int interruptFd);
static const int kDefaultPollTimeout; static const int kDefaultPollTimeout;
static const int kDefaultPollNoTimeout; static const int kDefaultPollNoTimeout;

2
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -330,7 +330,7 @@ namespace ix
} }
// poll the socket // poll the socket
PollResultType pollResult = _socket->poll(lastingTimeoutDelayInMs); PollResultType pollResult = _socket->isReadyToRead(lastingTimeoutDelayInMs);
// Make sure we send all the buffered data // Make sure we send all the buffered data
// there can be a lot of it for large messages. // there can be a lot of it for large messages.