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

Problem: stack overflow on win64 #2876. Basically zmq::signaler_t::wait suffers from stack bloating the same way socket_poller was found to be bloated due to the large size of fd_set

Browse Source 
Solution: replace the fd_set in the routine with an instance of optimized_fd_set_t
This commit is contained in:
Alessio M 2018-06-27 18:01:02 +01:00
parent 83e1712d67
commit 9066e0670f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/signaler.cpp
View File

@ -29,6 +29,7 @@
#include "precompiled.hpp" #include "precompiled.hpp"
#include "poller.hpp" #include "poller.hpp"
#include "polling_util.hpp"
#if defined ZMQ_POLL_BASED_ON_POLL #if defined ZMQ_POLL_BASED_ON_POLL
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_AIX #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_AIX
@ -270,19 +271,21 @@ int zmq::signaler_t::wait (int timeout_)
#elif defined ZMQ_POLL_BASED_ON_SELECT #elif defined ZMQ_POLL_BASED_ON_SELECT
fd_set fds; optimized_fd_set_t fds (FD_SETSIZE);
FD_ZERO (&fds); FD_ZERO (fds.get ());
FD_SET (_r, &fds); FD_SET (_r, fds.get ());
struct timeval timeout; struct timeval timeout;
if (timeout_ >= 0) { if (timeout_ >= 0) {
timeout.tv_sec = timeout_ / 1000; timeout.tv_sec = timeout_ / 1000;
timeout.tv_usec = timeout_ % 1000 * 1000; timeout.tv_usec = timeout_ % 1000 * 1000;
} }
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
int rc = select (0, &fds, NULL, NULL, timeout_ >= 0 ? &timeout : NULL); int rc =
select (0, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
#else #else
int rc = select (_r + 1, &fds, NULL, NULL, timeout_ >= 0 ? &timeout : NULL); int rc =
select (_r + 1, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
if (unlikely (rc < 0)) { if (unlikely (rc < 0)) {
errno_assert (errno == EINTR); errno_assert (errno == EINTR);
return -1; return -1;