# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1112443538 0
# Node ID 1e515cc6ca0cd6a6743b65690e30c24881f653c1
# Parent  25684d3a99525b926e075007c0e3dd6d834d4fbc
* alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
mallopt.

* ralloc.c (r_alloc_init): Ditto.

diff -r 25684d3a9952 -r 1e515cc6ca0c src/ChangeLog
--- 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,
diff -r 25684d3a9952 -r 1e515cc6ca0c src/alloc.c
--- 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;
diff -r 25684d3a9952 -r 1e515cc6ca0c src/ralloc.c
--- 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