From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 17 Sep 2012 07:54:32 +0000 (+0300)
Subject: Fix the value of __malloc_extra_blocks.
X-Git-Tag: emacs-24.2.90~269^2~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45ba16c706cf9f009997550f5a3de6ea96643a92;p=emacs.git

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 daabdd7613e..68c30dbe19e 100644
--- 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 b0134ea730a..6b03c50ab21 100644
--- 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