Mercurial > emacs
comparison src/alloc.c @ 83015:ae6d0d2ecb1d
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-31
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-55
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 11 Jan 2004 23:12:24 +0000 |
| parents | f82e3a6f5ccb 72ce38380ab3 |
| children | 82c3b4da43ca |
comparison
equal
deleted
inserted
replaced
| 83014:f5cadabb36dd | 83015:ae6d0d2ecb1d |
|---|---|
| 2497 | 2497 |
| 2498 #ifdef DOUG_LEA_MALLOC | 2498 #ifdef DOUG_LEA_MALLOC |
| 2499 /* Prevent mmap'ing the chunk. Lisp data may not be mmap'ed | 2499 /* Prevent mmap'ing the chunk. Lisp data may not be mmap'ed |
| 2500 because mapped region contents are not preserved in | 2500 because mapped region contents are not preserved in |
| 2501 a dumped Emacs. */ | 2501 a dumped Emacs. */ |
| 2502 BLOCK_INPUT; | |
| 2502 mallopt (M_MMAP_MAX, 0); | 2503 mallopt (M_MMAP_MAX, 0); |
| 2504 UNBLOCK_INPUT; | |
| 2503 #endif | 2505 #endif |
| 2504 | 2506 |
| 2505 nbytes = sizeof *p + (len - 1) * sizeof p->contents[0]; | 2507 nbytes = sizeof *p + (len - 1) * sizeof p->contents[0]; |
| 2506 p = (struct Lisp_Vector *) lisp_malloc (nbytes, type); | 2508 p = (struct Lisp_Vector *) lisp_malloc (nbytes, type); |
| 2507 | 2509 |
| 2508 #ifdef DOUG_LEA_MALLOC | 2510 #ifdef DOUG_LEA_MALLOC |
| 2509 /* Back to a reasonable maximum of mmap'ed areas. */ | 2511 /* Back to a reasonable maximum of mmap'ed areas. */ |
| 2512 BLOCK_INPUT; | |
| 2510 mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); | 2513 mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); |
| 2514 UNBLOCK_INPUT; | |
| 2511 #endif | 2515 #endif |
| 2512 | 2516 |
| 2513 consing_since_gc += nbytes; | 2517 consing_since_gc += nbytes; |
| 2514 vector_cells_consed += len; | 2518 vector_cells_consed += len; |
| 2515 | 2519 |