talksik/easywsclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

poll() blocks for ever when timeout is negative.

Browse Source
This commit is contained in:
wpelissero
2015-09-10 09:54:01 +02:00
parent 47da376034
commit 4eb06e0f1b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3 -3
View File
@@ -50,9 +50,9 @@ static pointer from_url(std::string url);
static pointer create_dummy(); static pointer create_dummy();
// Function to perform actual network send()/recv() I/O: // Function to perform actual network send()/recv() I/O:
// (note: if all you need is to recv()/dispatch() messages, then timeout can be // (note: if all you need is to recv()/dispatch() messages, then a
// used to block until a message arrives. By default, when timeout is 0, poll() // negative timeout can be used to block until a message arrives.
// will not block at all.) // By default, when timeout is 0, poll() will not block at all.)
void poll(int timeout = 0); // timeout in milliseconds void poll(int timeout = 0); // timeout in milliseconds
// Receive a message, and pass it to callable(). Really, this just looks at // Receive a message, and pass it to callable(). Really, this just looks at
easywsclient.cpp
+2 -2
View File
@@ -188,7 +188,7 @@ class _RealWebSocket : public easywsclient::WebSocket
} }
return; return;
} }
if (timeout > 0) { if (timeout != 0) {
fd_set rfds; fd_set rfds;
fd_set wfds; fd_set wfds;
timeval tv = { timeout/1000, (timeout%1000) * 1000 }; timeval tv = { timeout/1000, (timeout%1000) * 1000 };
@@ -196,7 +196,7 @@ class _RealWebSocket : public easywsclient::WebSocket
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_SET(sockfd, &rfds); FD_SET(sockfd, &rfds);
if (txbuf.size()) { FD_SET(sockfd, &wfds); } if (txbuf.size()) { FD_SET(sockfd, &wfds); }
select(sockfd + 1, &rfds, &wfds, NULL, &tv); select(sockfd + 1, &rfds, &wfds, 0, timeout > 0 ? &tv : 0);
} }
while (true) { while (true) {
// FD_ISSET(0, &rfds) will be true // FD_ISSET(0, &rfds) will be true