* fork.cc (fork_parent): Stop malloc activity while fork is in control of the

heap.
* sigproc.cc (NZOMBIES): Rename from ZOMBIEMAX for clarity.
(zombies): Revert to original behavior.  Allocating zombie array resulted in
performance hit.
* winsup.h: Declare malloc lock routines.

1 files changed, 6 insertions, 12 deletions

diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc
index 783fec956..7aa29f5c6 100644
--- a/winsup/cygwin/malloc_wrapper.cc
+++ b/winsup/cygwin/malloc_wrapper.cc
@@ -154,8 +154,7 @@ _strdup_r (struct _reent *, const char *s)
 /* These routines are used by the application if it
    doesn't provide its own malloc. */
 
-extern "C"
-void
+extern "C" void
 export_free (void *p)
 {
   malloc_printf ("(%p), called by %x", p, ((int *)&p)[-1]);
@@ -165,8 +164,7 @@ export_free (void *p)
     user_data->free (p);
 }
 
-extern "C"
-void *
+extern "C" void *
 export_malloc (int size)
 {
   void *res;
@@ -179,8 +177,7 @@ export_malloc (int size)
   return res;
 }
 
-extern "C"
-void *
+extern "C" void *
 export_realloc (void *p, int size)
 {
   void *res;
@@ -192,8 +189,7 @@ export_realloc (void *p, int size)
   return res;
 }
 
-extern "C"
-void *
+extern "C" void *
 export_calloc (size_t nmemb, size_t size)
 {
   void *res;
@@ -234,15 +230,13 @@ malloc_init ()
     }
 }
 
-extern "C"
-void
+extern "C" void
 __malloc_lock (struct _reent *)
 {
   mprotect->acquire ();
 }
 
-extern "C"
-void
+extern "C" void
 __malloc_unlock (struct _reent *)
 {
   mprotect->release ();