Mercurial > emacs
comparison src/alloc.c @ 90136:7a3341d65a12
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-33
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 223-227)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 02 Apr 2005 22:40:25 +0000 |
| parents | 4da4a09e8b1b 1e515cc6ca0c |
| children | 02f1dbc4a199 |
comparison
equal
deleted
inserted
replaced
| 90135:baa2d4aa0064 | 90136:7a3341d65a12 |
|---|---|
| 1931 In case you think of allowing it in a dumped Emacs at the | 1931 In case you think of allowing it in a dumped Emacs at the |
| 1932 cost of not being able to re-dump, there's another reason: | 1932 cost of not being able to re-dump, there's another reason: |
| 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; |
| 1947 b->first_data.string = NULL; | 1951 b->first_data.string = NULL; |
| 1948 b->next = large_sblocks; | 1952 b->next = large_sblocks; |
