diff options
| author | Jan Djärv | 2005-04-02 12:05:38 +0000 |
|---|---|---|
| committer | Jan Djärv | 2005-04-02 12:05:38 +0000 |
| commit | 1673df2e0d9f5c62211b6a9c89b6886ca288bde8 (patch) | |
| tree | a60f67887e6c5112d2f6fdff1cff2791c3d486b8 /src/alloc.c | |
| parent | 2f2e23735660707d2fae26b2c596ebe1c45b69b8 (diff) | |
| download | emacs-1673df2e0d9f5c62211b6a9c89b6886ca288bde8.tar.gz emacs-1673df2e0d9f5c62211b6a9c89b6886ca288bde8.zip | |
* alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
mallopt.
* ralloc.c (r_alloc_init): Ditto.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index d529ab9927b..a907247d21c 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1933,14 +1933,18 @@ allocate_string_data (s, nchars, nbytes) | |||
| 1933 | mmap'ed data typically have an address towards the top of the | 1933 | mmap'ed data typically have an address towards the top of the |
| 1934 | address space, which won't fit into an EMACS_INT (at least on | 1934 | address space, which won't fit into an EMACS_INT (at least on |
| 1935 | 32-bit systems with the current tagging scheme). --fx */ | 1935 | 32-bit systems with the current tagging scheme). --fx */ |
| 1936 | BLOCK_INPUT; | ||
| 1936 | mallopt (M_MMAP_MAX, 0); | 1937 | mallopt (M_MMAP_MAX, 0); |
| 1938 | UNBLOCK_INPUT; | ||
| 1937 | #endif | 1939 | #endif |
| 1938 | 1940 | ||
| 1939 | b = (struct sblock *) lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP); | 1941 | b = (struct sblock *) lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP); |
| 1940 | 1942 | ||
| 1941 | #ifdef DOUG_LEA_MALLOC | 1943 | #ifdef DOUG_LEA_MALLOC |
| 1942 | /* Back to a reasonable maximum of mmap'ed areas. */ | 1944 | /* Back to a reasonable maximum of mmap'ed areas. */ |
| 1945 | BLOCK_INPUT; | ||
| 1943 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); | 1946 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); |
| 1947 | UNBLOCK_INPUT; | ||
| 1944 | #endif | 1948 | #endif |
| 1945 | 1949 | ||
| 1946 | b->next_free = &b->first_data; | 1950 | b->next_free = &b->first_data; |