3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1628 from hintjens/master

Browse Source 
Fix for #1399
This commit is contained in:
Constantin Rack 2015-11-01 10:47:33 +01:00
commit ac46e6da96
2 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/signaler.cpp
View File

@ -100,20 +100,15 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
unsigned int step_ms = max_ms_ / 10; unsigned int step_ms = max_ms_ / 10;
if (step_ms < 1) if (step_ms < 1)
step_ms = 1; step_ms = 1;
if (step_ms > 100) if (step_ms > 100)
step_ms = 100; step_ms = 100;
int rc = 0; // do not sleep on first attempt int rc = 0; // do not sleep on first attempt
do {
do if (rc == -1 && errno == EAGAIN) {
{
if (rc == -1 && errno == EAGAIN)
{
sleep_ms (step_ms); sleep_ms (step_ms);
ms_so_far += step_ms; ms_so_far += step_ms;
} }
rc = close (fd_); rc = close (fd_);
} while (ms_so_far < max_ms_ && rc == -1 && errno == EAGAIN); } while (ms_so_far < max_ms_ && rc == -1 && errno == EAGAIN);

2
src/tcp.cpp
View File

@ -218,7 +218,6 @@ void zmq::tune_tcp_retransmit_timeout (fd_t sockfd_, int timeout_)
&& errno != EBADF && errno != EBADF
&& errno != EDESTADDRREQ && errno != EDESTADDRREQ
&& errno != EFAULT && errno != EFAULT
&& errno != EINVAL
&& errno != EISCONN && errno != EISCONN
&& errno != EMSGSIZE && errno != EMSGSIZE
&& errno != ENOMEM && errno != ENOMEM
@ -269,7 +268,6 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
if (rc == -1) { if (rc == -1) {
errno_assert (errno != EBADF errno_assert (errno != EBADF
&& errno != EFAULT && errno != EFAULT
&& errno != EINVAL
&& errno != ENOMEM && errno != ENOMEM
&& errno != ENOTSOCK); && errno != ENOTSOCK);
if (errno == EWOULDBLOCK || errno == EINTR) if (errno == EWOULDBLOCK || errno == EINTR)