emacs: src/alloc.c comparison

comparison src/alloc.c @ 89943:4c90ffeb71c5

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 28 Jun 2004 07:56:49 +0000
parents	68c22ea6027c ca648e6d2d7b
children	59dcbfe97385

comparison

equal deleted inserted replaced

-:9cb747ae49af
+:4c90ffeb71c5
 /* Two limits controlling how much undo information to keep.  */
 EMACS_INT undo_limit;
 EMACS_INT undo_strong_limit;
+EMACS_INT undo_outer_limit;
 /* Number of live and free conses etc.  */
 static int total_conses, total_markers, total_symbols, total_vector_size;
 static int total_free_conses, total_free_markers, total_free_symbols;
 Lisp_Object Vgc_elapsed;	/* accumulated elapsed time in GC  */
 EMACS_INT gcs_done;		/* accumulated GCs  */
 static void mark_buffer P_ ((Lisp_Object));
 extern void mark_kboards P_ ((void));
+extern void mark_backtrace P_ ((void));
 static void gc_sweep P_ ((void));
 static void mark_glyph_matrix P_ ((struct glyph_matrix *));
 static void mark_face_cache P_ ((struct face_cache *));
 #ifdef HAVE_WINDOW_SYSTEM
 #endif
 #ifdef HAVE_POSIX_MEMALIGN
 {
 	int err = posix_memalign (&base, BLOCK_ALIGN, ABLOCKS_BYTES);
-	abase = err ? (base = NULL) : base;
+	if (err)
+	  base = NULL;
+	abase = base;
 }
 #else
 base = malloc (ABLOCKS_BYTES);
 abase = ALIGN (base, BLOCK_ALIGN);
+#endif
 if (base == 0)
 	{
 	  UNBLOCK_INPUT;
 	  memory_full ();
 	}
-#endif
 aligned = (base == abase);
 if (!aligned)
 	((void**)abase)[-1] = base;
 /* Put on free list.  */
 ablock->x.next_free = free_ablock;
 free_ablock = ablock;
 /* Update busy count.  */
 ABLOCKS_BUSY (abase) = (struct ablocks *) (-2 + (long) ABLOCKS_BUSY (abase));
 if (2 > (long) ABLOCKS_BUSY (abase))
 { /* All the blocks are free.  */
 int i = 0, aligned = (long) ABLOCKS_BUSY (abase);
 struct ablock **tem = &free_ablock;
 struct ablock *atop = &abase->blocks[aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1];
 current_sblock = tb;
 }
 DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0,
-doc: /* Return a newly created string of length LENGTH, with each element being INIT.
+doc: /* Return a newly created string of length LENGTH, with INIT in each element.
-Both LENGTH and INIT must be numbers.  */)
+LENGTH must be an integer.
+INIT must be an integer that represents a character.  */)
 (length, init)
 Lisp_Object length, init;
 {
 register Lisp_Object val;
 register unsigned char *p, *end;
 int real_init, i;
 int length_in_chars, length_in_elts, bits_per_value;
 CHECK_NATNUM (length);
-bits_per_value = sizeof (EMACS_INT) * BITS_PER_CHAR;
+bits_per_value = sizeof (EMACS_INT) * BOOL_VECTOR_BITS_PER_CHAR;
 length_in_elts = (XFASTINT (length) + bits_per_value - 1) / bits_per_value;
-length_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1) / BITS_PER_CHAR);
+length_in_chars = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
+		     / BOOL_VECTOR_BITS_PER_CHAR);
 /* We must allocate one more elements than LENGTH_IN_ELTS for the
 slot `size' of the struct Lisp_Bool_Vector.  */
 val = Fmake_vector (make_number (length_in_elts + 1), Qnil);
 p = XBOOL_VECTOR (val);
 real_init = (NILP (init) ? 0 : -1);
 for (i = 0; i < length_in_chars ; i++)
 p->data[i] = real_init;
 /* Clear the extraneous bits in the last byte.  */
-if (XINT (length) != length_in_chars * BITS_PER_CHAR)
+if (XINT (length) != length_in_chars * BOOL_VECTOR_BITS_PER_CHAR)
 XBOOL_VECTOR (val)->data[length_in_chars - 1]
-&= (1 << (XINT (length) % BITS_PER_CHAR)) - 1;
+&= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
 return val;
 }
 #if GC_MARK_STACK
 ptr->car = Vdead;
 #endif
 cons_free_list = ptr;
 }
 DEFUN ("cons", Fcons, Scons, 2, 2, 0,
 doc: /* Create a new cons, give it CAR and CDR as components, and return it.  */)
 (car, cdr)
 Lisp_Object car, cdr;
 Lisp_Object tag;
 Lisp_Object val;
 struct catchtag *next;
 };
-struct backtrace
-{
-struct backtrace *next;
-Lisp_Object *function;
-Lisp_Object *args;	/* Points to vector of args.  */
-int nargs;		/* Length of vector.  */
-/* If nargs is UNEVALLED, args points to slot holding list of
-unevalled args.  */
-char evalargs;
-};
 /***********************************************************************
 			  Protection from GC
 ***********************************************************************/
 ()
 {
 register struct specbinding *bind;
 struct catchtag *catch;
 struct handler *handler;
-register struct backtrace *backlist;
 char stack_top_variable;
 register int i;
 int message_p;
 Lisp_Object total[8];
 int count = SPECPDL_INDEX ();
 	   Qt tends to return NULL, which effectively turns undo back on.
 	   So don't call truncate_undo_list if undo_list is Qt.  */
 	if (! EQ (nextb->undo_list, Qt))
 	  nextb->undo_list
 	    = truncate_undo_list (nextb->undo_list, undo_limit,
-				  undo_strong_limit);
+				  undo_strong_limit, undo_outer_limit);
 	/* Shrink buffer gaps, but skip indirect and dead buffers.  */
 	if (nextb->base_buffer == 0 && !NILP (nextb->name))
 	  {
 	    /* If a buffer's gap size is more than 10% of the buffer
 for (handler = handlerlist; handler; handler = handler->next)
 {
 mark_object (handler->handler);
 mark_object (handler->var);
 }
-for (backlist = backtrace_list; backlist; backlist = backlist->next)
+mark_backtrace ();
-{
-mark_object (*backlist->function);
-if (backlist->nargs == UNEVALLED || backlist->nargs == MANY)
-	i = 0;
-else
-	i = backlist->nargs - 1;
-for (; i >= 0; i--)
-	mark_object (backlist->args[i]);
-}
 mark_kboards ();
-/* Look thru every buffer's undo list
+#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
+mark_stack ();
+#endif
+#ifdef USE_GTK
+{
+extern void xg_mark_data ();
+xg_mark_data ();
+}
+#endif
+/* Everything is now marked, except for the things that require special
+finalization, i.e. the undo_list.
+Look thru every buffer's undo list
 for elements that update markers that were not marked,
 and delete them.  */
 {
 register struct buffer *nextb = all_buffers;
 		    prev = tail;
 		    tail = XCDR (tail);
 		  }
 	      }
 	  }
+	/* Now that we have stripped the elements that need not be in the
+	   undo_list any more, we can finally mark the list.  */
+	mark_object (nextb->undo_list);
 	nextb = nextb->next;
 }
 }
-#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
-mark_stack ();
-#endif
-#ifdef USE_GTK
-{
-extern void xg_mark_data ();
-xg_mark_data ();
-}
-#endif
 gc_sweep ();
 /* Clear the mark bits that we set in certain root slots.  */
 VECTOR_MARK (buffer);
 MARK_INTERVAL_TREE (BUF_INTERVALS (buffer));
-if (CONSP (buffer->undo_list))
+/* For now, we just don't mark the undo_list.  It's done later in
-{
+a special way just before the sweep phase, and after stripping
-Lisp_Object tail;
+some of its elements that are not needed any more.  */
-tail = buffer->undo_list;
-/* We mark the undo list specially because
-	 its pointers to markers should be weak.  */
-while (CONSP (tail))
-	{
-	  register struct Lisp_Cons *ptr = XCONS (tail);
-	  if (CONS_MARKED_P (ptr))
-	    break;
-	  CONS_MARK (ptr);
-	  if (GC_CONSP (ptr->car)
-	      && !CONS_MARKED_P (XCONS (ptr->car))
-	      && GC_MARKERP (XCAR (ptr->car)))
-	    {
-	      CONS_MARK (XCONS (ptr->car));
-	      mark_object (XCDR (ptr->car));
-	    }
-	  else
-	    mark_object (ptr->car);
-	  if (CONSP (ptr->cdr))
-	    tail = ptr->cdr;
-	  else
-	    break;
-	}
-mark_object (XCDR (tail));
-}
-else
-mark_object (buffer->undo_list);
 if (buffer->overlays_before)
 {
 XSETMISC (tmp, buffer->overlays_before);
 mark_object (tmp);
 which includes both saved text and other data.  */);
 undo_limit = 20000;
 DEFVAR_INT ("undo-strong-limit", &undo_strong_limit,
 	      doc: /* Don't keep more than this much size of undo information.
-A command which pushes past this size is itself forgotten.
+A previous command which pushes the undo list past this size
-This limit is applied when garbage collection happens.
+is entirely forgotten when GC happens.
 The size is counted as the number of bytes occupied,
 which includes both saved text and other data.  */);
 undo_strong_limit = 30000;
+DEFVAR_INT ("undo-outer-limit", &undo_outer_limit,
+	      doc: /* Don't keep more than this much size of undo information.
+If the current command has produced more than this much undo information,
+GC discards it.  This is a last-ditch limit to prevent memory overflow.
+The size is counted as the number of bytes occupied,
+which includes both saved text and other data.  */);
+undo_outer_limit = 300000;
 DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages,
 	       doc: /* Non-nil means display messages at start and end of garbage collection.  */);
 garbage_collection_messages = 0;

Mercurial > emacs

comparison src/alloc.c @ 89943:4c90ffeb71c5