Mercurial > emacs
changeset 61225:1e515cc6ca0c
* alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
mallopt.
* ralloc.c (r_alloc_init): Ditto.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 02 Apr 2005 12:05:38 +0000 |
| parents | 25684d3a9952 |
| children | 1050c59c8ed5 |
| files | src/ChangeLog src/alloc.c src/ralloc.c |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Apr 02 11:32:18 2005 +0000 +++ b/src/ChangeLog Sat Apr 02 12:05:38 2005 +0000 @@ -1,3 +1,10 @@ +2005-04-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling + mallopt. + + * ralloc.c (r_alloc_init): Ditto. + 2005-04-01 Kenichi Handa <handa@m17n.org> * lisp.h (Vascii_upcase_table, Vascii_canon_table,
--- a/src/alloc.c Sat Apr 02 11:32:18 2005 +0000 +++ b/src/alloc.c Sat Apr 02 12:05:38 2005 +0000 @@ -1933,14 +1933,18 @@ mmap'ed data typically have an address towards the top of the address space, which won't fit into an EMACS_INT (at least on 32-bit systems with the current tagging scheme). --fx */ + BLOCK_INPUT; mallopt (M_MMAP_MAX, 0); + UNBLOCK_INPUT; #endif b = (struct sblock *) lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP); #ifdef DOUG_LEA_MALLOC /* Back to a reasonable maximum of mmap'ed areas. */ + BLOCK_INPUT; mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); + UNBLOCK_INPUT; #endif b->next_free = &b->first_data;
--- a/src/ralloc.c Sat Apr 02 11:32:18 2005 +0000 +++ b/src/ralloc.c Sat Apr 02 12:05:38 2005 +0000 @@ -1255,7 +1255,9 @@ #endif #ifdef DOUG_LEA_MALLOC - mallopt (M_TOP_PAD, 64 * 4096); + BLOCK_INPUT; + mallopt (M_TOP_PAD, 64 * 4096); + UNBLOCK_INPUT; #else #ifndef SYSTEM_MALLOC /* Give GNU malloc's morecore some hysteresis