From 462ca33745cfa45302eeeb1d6e6bd82cc64c4027 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 28 Oct 2021 20:39:42 +0200
Subject: Revert "Cygwin: convert malloc lock to SRWLOCK"

This reverts commit 44a79a6eca3d322020dda0919023d78dda129d4d.
---
 winsup/cygwin/cygmalloc.h       | 8 +++-----
 winsup/cygwin/dcrt0.cc          | 1 -
 winsup/cygwin/fork.cc           | 2 +-
 winsup/cygwin/heap.cc           | 1 +
 winsup/cygwin/heap.h            | 1 +
 winsup/cygwin/malloc_wrapper.cc | 4 +++-
 winsup/cygwin/release/3.3.0     | 4 ----
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/winsup/cygwin/cygmalloc.h b/winsup/cygwin/cygmalloc.h
index 36f56294f..84bad824c 100644
--- a/winsup/cygwin/cygmalloc.h
+++ b/winsup/cygwin/cygmalloc.h
@@ -36,11 +36,9 @@ void *mmap64 (void *, size_t, int, int, int, off_t);
 
 #elif defined (__INSIDE_CYGWIN__)
 
-# define __malloc_lock() AcquireSRWLockExclusive (&mallock)
-# define __malloc_trylock() TryAcquireSRWLockExclusive (&mallock)
-# define __malloc_unlock() ReleaseSRWLockExclusive (&mallock)
-extern SRWLOCK NO_COPY mallock;
-void malloc_init ();
+# define __malloc_lock() mallock.acquire ()
+# define __malloc_unlock() mallock.release ()
+extern muto mallock;
 
 #endif
 
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index f3d09c169..6f4723bb0 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -29,7 +29,6 @@ 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"
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 912f17274..719217856 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -296,7 +296,7 @@ frok::parent (volatile char * volatile stack_here)
   si.lpReserved2 = (LPBYTE) &ch;
   si.cbReserved2 = sizeof (ch);
 
-  bool locked = __malloc_trylock ();
+  bool locked = __malloc_lock ();
 
   /* Remove impersonation */
   cygheap->user.deimpersonate ();
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc
index f27f81bc4..b839c8cd4 100644
--- a/winsup/cygwin/heap.cc
+++ b/winsup/cygwin/heap.cc
@@ -230,6 +230,7 @@ user_heap_info::init ()
   debug_printf ("heap base %p, heap top %p, heap size %ly (%lu)",
 		base, top, chunk, chunk);
   page_const--;
+  // malloc_init ();
 }
 
 #define pround(n) (((size_t)(n) + page_const) & ~page_const)
diff --git a/winsup/cygwin/heap.h b/winsup/cygwin/heap.h
index 25200f286..565758e48 100644
--- a/winsup/cygwin/heap.h
+++ b/winsup/cygwin/heap.h
@@ -10,6 +10,7 @@ details. */
 
 /* Heap management. */
 void heap_init ();
+void malloc_init ();
 
 #define inheap(s) \
   (cygheap->user_heap.ptr && s \
diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc
index 2842e5398..3b245800a 100644
--- a/winsup/cygwin/malloc_wrapper.cc
+++ b/winsup/cygwin/malloc_wrapper.cc
@@ -269,11 +269,13 @@ strdup (const char *s)
    newlib will call __malloc_lock and __malloc_unlock at appropriate
    times.  */
 
-SRWLOCK NO_COPY mallock = SRWLOCK_INIT;
+muto NO_COPY mallock;
 
 void
 malloc_init ()
 {
+  mallock.init ("mallock");
+
   /* Check if malloc is provided by application. If so, redirect all
      calls to malloc/free/realloc to application provided. This may
      happen if some other dll calls cygwin's malloc, but main code provides
diff --git a/winsup/cygwin/release/3.3.0 b/winsup/cygwin/release/3.3.0
index 1595b1753..895c27397 100644
--- a/winsup/cygwin/release/3.3.0
+++ b/winsup/cygwin/release/3.3.0
@@ -78,7 +78,3 @@ Bug Fixes
 - Fix access violation that can sometimes occur when copy/pasting between
   32-bit and 64-bit Cygwin environments.  Align clipboard descriptor layouts.
   Addresses: https://cygwin.com/pipermail/cygwin-patches/2021q4/011517.html
-
-- Fix a synchronization issue when running multiple threads from DLL
-  initialization which in turn call malloc.
-  Addresses: https://cygwin.com/pipermail/cygwin/2021-October/249635.html
-- 
cgit v1.2.3