Merge pull request #4060 from martin-ksti/fix-stack-overflow-on-windows-x64

fix stack overflow on windows x64
This commit is contained in:
Luca Boccassi 2020-10-09 19:01:44 +01:00 committed by GitHub
commit f578b26790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -63,11 +63,18 @@ void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
_arg = arg_;
if (name_)
strncpy (_name, name_, sizeof (_name) - 1);
// set default stack size to 4MB to avoid std::map stack overflow on x64
unsigned int stack = 0;
#if defined _WIN64
stack = 0x400000;
#endif
#if defined _WIN32_WCE
_descriptor =
(HANDLE) CreateThread (NULL, 0, &::thread_routine, this, 0, &_thread_id);
(HANDLE) CreateThread (NULL, stack, &::thread_routine, this, 0, &_thread_id);
#else
_descriptor = (HANDLE) _beginthreadex (NULL, 0, &::thread_routine, this, 0,
_descriptor = (HANDLE) _beginthreadex (NULL, stack, &::thread_routine, this, 0,
&_thread_id);
#endif
win_assert (_descriptor != NULL);