[Emacs-diffs] /srv/bzr/emacs/trunk r110065: Fix the value of __malloc_extra_blocks.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110065
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-17 10:54:32 +0300
message:
  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.
modified:
  src/ChangeLog
  src/ralloc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-17 01:02:11 +0000
+++ b/src/ChangeLog     2012-09-17 07:54:32 +0000
@@ -1,3 +1,9 @@
+2012-09-17  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        Remove no-longer-needed Solaris 2.4 vfork bug workaround.

=== modified file 'src/ralloc.c'
--- a/src/ralloc.c      2012-09-15 07:06:56 +0000
+++ b/src/ralloc.c      2012-09-17 07:54:32 +0000
@@ -1204,9 +1204,15 @@
   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