Mercurial > emacs
changeset 66547:9373f926904a
(BYTES_USED): Use uordblks, not arena.
(bytes_used_when_reconsidered): New variable.
(emacs_blocked_free): Set that.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 30 Oct 2005 07:34:05 +0000 |
| parents | dbf1b265828e |
| children | 2e58815bc4ab |
| files | src/alloc.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alloc.c Sun Oct 30 04:07:50 2005 +0000 +++ b/src/alloc.c Sun Oct 30 07:34:05 2005 +0000 @@ -138,6 +138,8 @@ static __malloc_size_t bytes_used_when_full; +static __malloc_size_t bytes_used_when_reconsidered; + /* Mark, unmark, query mark bit of a Lisp string. S must be a pointer to a struct Lisp_String. */ @@ -521,7 +523,7 @@ #ifdef DOUG_LEA_MALLOC -# define BYTES_USED (mallinfo ().arena) +# define BYTES_USED (mallinfo ().uordblks) #else # define BYTES_USED _bytes_used #endif @@ -1179,7 +1181,7 @@ The code here is correct as long as SPARE_MEMORY is substantially larger than the block size malloc uses. */ && (bytes_used_when_full - > ((bytes_used_now = BYTES_USED) + > ((bytes_used_when_reconsidered = BYTES_USED) + max (malloc_hysteresis, 4) * SPARE_MEMORY))) refill_memory_reserve ();