Fix the value of __malloc_extra_blocks.

 src/ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize
 __malloc_extra_blocks to 32 instead of 64, like alloc.c did in
 emacs_blocked_malloc, now deleted.

diff --git a/src/ChangeLog b/src/ChangeLog
index daabdd7613e03e622f32538e338f360773ed32f8..68c30dbe19ea9525f49cff90d1fa7cc8843e2ad7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize
+       __malloc_extra_blocks to 32 instead of 64, like alloc.c did in
+       emacs_blocked_malloc, now deleted.
+
 2012-09-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove no-longer-needed Solaris 2.4 vfork bug workaround.

diff --git a/src/ralloc.c b/src/ralloc.c
index b0134ea730a0e2d80d303bf97a9dc7f0d55ebebf..6b03c50ab2188b26b5b343c3af1bd1bfc1afb80a 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1204,9 +1204,15 @@ r_alloc_init (void)
   UNBLOCK_INPUT;
 #else
 #ifndef SYSTEM_MALLOC
-  /* Give GNU malloc's morecore some hysteresis
-     so that we move all the relocatable blocks much less often.  */
-  __malloc_extra_blocks = 64;
+  /* Give GNU malloc's morecore some hysteresis so that we move all
+     the relocatable blocks much less often.  The number used to be
+     64, but alloc.c would override that with 32 in code that was
+     removed when SYNC_INPUT became the only input handling mode.
+     That code was condition on !DOUG_LEA_MALLOC, so the call to
+     mallopt above is left unchanged.  (Actually, I think there's no
+     system nowadays that uses DOUG_LEA_MALLOC and also uses
+     REL_ALLOC.)  */
+  __malloc_extra_blocks = 32;
 #endif
 #endif