Try again to fix FreeBSD bug re multithreaded memory alloc.

* emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
Do not clear _malloc_thread_enabled_p, undoing the previous change,
which did not work (see <http://bugs.gnu.org/14569#307>).
(main): Do not invoke malloc_enable_thread if (! CANNOT_DUMP
&& (!noninteractive || initialized)).  This attempts to thread
the needle between the Scylla of FreeBSD and the Charybdis of Cygwin.

2 files changed, 18 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f8d54c7fb03..1bd53573086 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Try again to fix FreeBSD bug re multithreaded memory alloc (Bug#14569).
+        * emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
+        Do not clear _malloc_thread_enabled_p, undoing the previous change,
+        which did not work (see <http://bugs.gnu.org/14569#307>).
+        (main): Do not invoke malloc_enable_thread if (! CANNOT_DUMP
+        && (!noninteractive || initialized)).  This attempts to thread
+        the needle between the Scylla of FreeBSD and the Charybdis of Cygwin.
+
 2013-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * image.c (x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'.
diff --git a/src/emacs.c b/src/emacs.c
index bebc5e420ad..4b709527ff0 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -128,7 +128,6 @@ extern int malloc_set_state (void*);
    dumping.  Used to work around a bug in glibc's malloc.  */
 static bool malloc_using_checking;
 #elif defined HAVE_PTHREAD && !defined SYSTEM_MALLOC
-extern int _malloc_thread_enabled_p;
 extern void malloc_enable_thread (void);
 #endif
 
@@ -682,12 +681,6 @@ main (int argc, char **argv)
   stack_base = &dummy;
 #endif
 
-#if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
-  /* Disable mutexes in gmalloc.c.  Otherwise, FreeBSD Emacs recursively
-     loops with pthread_mutex_lock calling calloc and vice versa.  */
-  _malloc_thread_enabled_p = 0;
-#endif
-
 #ifdef G_SLICE_ALWAYS_MALLOC
   /* This is used by the Cygwin build.  */
   xputenv ("G_SLICE=always-malloc");
@@ -1084,7 +1077,14 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
     }
 
 #if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
-  malloc_enable_thread ();
+# ifndef CANNOT_DUMP
+  /* Do not make gmalloc thread-safe when creating bootstrap-emacs, as
+     that causes an infinite recursive loop with FreeBSD.  But do make
+     it thread-safe when creating emacs, otherwise bootstrap-emacs
+     fails on Cygwin.  See Bug#14569.  */
+  if (!noninteractive || initialized)
+# endif
+    malloc_enable_thread ();
 #endif
 
   init_signals (dumping);