diff options
| author | Corinna Vinschen <corinna-cygwin@cygwin.com> | 2021-10-26 19:03:28 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2021-10-28 23:35:17 +0300 |
| commit | e528cfe919d757ba9bc07db1798cb17560bba457 (patch) | |
| tree | 95564384f7627a58dd29c78bf26e138e7daef85b /winsup/cygwin/dcrt0.cc | |
| parent | 462ca33745cfa45302eeeb1d6e6bd82cc64c4027 (diff) | |
Cygwin: split malloc_initcygwin-3_3_1-release
Cygwin 3.3 only: Replace SRWLOCK usage for malloc synchronization with
the first incarnation of the patch splitting malloc_init into two parts.
The SRWLOCK usage requires TryAcquireSRWLockExclusive, which isn't
available on Vista / Server 2008, unfortunately.
Per https://cygwin.com/pipermail/cygwin-developers/2021-October/012429.html,
we may encounter a crash when starting multiple threads during process
startup (here: fhandler_fifo::fixup_after_{fork,exec}) which in turn
allocate memory via malloc.
The problem is concurrent usage of malloc before the malloc muto has
been initialized.
To fix this issue, split malloc_init into malloc_init_0, called from
dll_crt0_0, and malloc_init_1, called from dll_crt_0_1. malloc_init_0
just initializes the muto, malloc_init_1 checks for user space provided
malloc.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 6f4723bb0..31dfd6f03 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -29,6 +29,7 @@ details. */ #include "shared_info.h" #include "cygwin_version.h" #include "dll_init.h" +#include "cygmalloc.h" #include "heap.h" #include "tls_pbuf.h" #include "exception.h" @@ -769,6 +770,8 @@ dll_crt0_0 () NtOpenProcessToken (NtCurrentProcess (), MAXIMUM_ALLOWED, &hProcToken); set_cygwin_privileges (hProcToken); + malloc_init_0 (); + device::init (); do_global_ctors (&__CTOR_LIST__, 1); cygthread::init (); @@ -857,7 +860,7 @@ dll_crt0_1 (void *) on a functioning malloc and it's possible that the user's program may have overridden malloc. We only know about that at this stage, unfortunately. */ - malloc_init (); + malloc_init_1 (); user_shared->initialize (); #ifdef CYGHEAP_DEBUG |