[Emacs-diffs] Changes to emacs/src/alloc.c

[Stefan Monnier]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.363 emacs/src/alloc.c:1.364
*** emacs/src/alloc.c:1.363     Thu Jan 20 15:37:41 2005
--- emacs/src/alloc.c   Fri Feb 18 18:16:09 2005
***************
*** 1,6 ****
  /* Storage allocation and gc for GNU Emacs Lisp interpreter.
     Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
!       2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,6 ----
  /* Storage allocation and gc for GNU Emacs Lisp interpreter.
     Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
!       2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 890,901 ****
     On glibc-2.3.2, malloc never tries to align, so a padding of 0 is best.
     posix_memalign on the other hand would ideally prefer a value of 4
     because otherwise, there's 1020 bytes wasted between each ablocks.
!    But testing shows that those 1020 will most of the time be efficiently
!    used by malloc to place other objects, so a value of 0 is still preferable
!    unless you have a lot of cons&floats and virtually nothing else.  */
  #define BLOCK_PADDING 0
  #define BLOCK_BYTES \
!   (BLOCK_ALIGN - sizeof (struct aligned_block *) - BLOCK_PADDING)
  
  /* Internal data structures and constants.  */
  
--- 890,902 ----
     On glibc-2.3.2, malloc never tries to align, so a padding of 0 is best.
     posix_memalign on the other hand would ideally prefer a value of 4
     because otherwise, there's 1020 bytes wasted between each ablocks.
!    In Emacs, testing shows that those 1020 can most of the time be
!    efficiently used by malloc to place other objects, so a value of 0 can
!    still preferable unless you have a lot of aligned blocks and virtually
!    nothing else.  */
  #define BLOCK_PADDING 0
  #define BLOCK_BYTES \
!   (BLOCK_ALIGN - sizeof (struct ablock *) - BLOCK_PADDING)
  
  /* Internal data structures and constants.  */