From 1673df2e0d9f5c62211b6a9c89b6886ca288bde8 Mon Sep 17 00:00:00 2001
From: Jan Djärv
Date: Sat, 2 Apr 2005 12:05:38 +0000
Subject: * alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
 mallopt.

* ralloc.c (r_alloc_init): Ditto.
---
 src/alloc.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/alloc.c')

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)
          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;
-- 
cgit v1.2.1


From bbc012e0c3a0e91beecb09643956fa09979420ab Mon Sep 17 00:00:00 2001
From: Kim F. Storm
Date: Sun, 3 Apr 2005 22:27:05 +0000
Subject: (Fgarbage_collect): Call CHECK_CONS_LIST before and after gc.

---
 src/alloc.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/alloc.c')

diff --git a/src/alloc.c b/src/alloc.c
index a907247d21c..f3af3940e15 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4687,6 +4687,8 @@ returns nil, because real GC can't be done.  */)
   if (pure_bytes_used_before_overflow)
     return Qnil;
 
+  CHECK_CONS_LIST ();
+
   /* Don't keep undo information around forever.
      Do this early on, so it is no problem if the user quits.  */
   {
@@ -4880,6 +4882,8 @@ returns nil, because real GC can't be done.  */)
 
   UNBLOCK_INPUT;
 
+  CHECK_CONS_LIST ();
+
   /* clear_marks (); */
   gc_in_progress = 0;
 
-- 
cgit v1.2.1