[xemacs-hg @ 2002-05-23 11:46:08 by ben] fix for raymond toy's crash, alloca crashes, some recover-session improvements files.el: Recover-session improvements: Only show session files where some files can actually be recovered, and show in chronological order. subr.el, menubar-items.el: As promised to rms, the functionality in truncate-string-with-continuation-dots has been merged into truncate-string-to-width. Change callers in menubar-items.el. select.el: Document some of these funs better. Fix problem where we were doing own-clipboard twice. Makefile.in.in: Add alloca.o. Ensure that alloca.s doesn't compile into alloca.o, but allocax.o (not that it's currently used or anything.) EmacsFrame.c, abbrev.c, alloc.c, alloca.c, callint.c, callproc.c, config.h.in, device-msw.c, device-x.c, dired.c, doc.c, editfns.c, emacs.c, emodules.c, eval.c, event-Xt.c, event-msw.c, event-stream.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-x.c, input-method-xlib.c, intl-win32.c, lisp.h, lread.c, menubar-gtk.c, menubar-msw.c, menubar.c, mule-wnnfns.c, nt.c, objects-msw.c, process-nt.c, realpath.c, redisplay-gtk.c, redisplay-output.c, redisplay-x.c, redisplay.c, search.c, select-msw.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: Fix Raymond Toy's crash. Repeat to self: 2^21 - 1 is NOT the same as (2 << 21) - 1. Fix crashes due to excessive alloca(). replace alloca() with ALLOCA(), which calls the C alloca() [which uses xmalloc()] when the size is too big. Insert in various places calls to try to flush the C alloca() stored info if there is any. Add MALLOC_OR_ALLOCA(), for places that expect to be alloca()ing large blocks. This xmalloc()s when too large and records an unwind-protect to free -- relying on the caller to unbind_to() elsewhere in the function. Use it in concat(). Use MALLOC instead of ALLOCA in select-msw.c. xemacs.mak: Add alloca.o.

--- a/src/alloc.c	Tue May 21 23:47:40 2002 +0000
+++ b/src/alloc.c	Thu May 23 11:46:46 2002 +0000
@@ -94,6 +94,10 @@
 /* Number of bytes of consing done since the last gc */
 static EMACS_INT consing_since_gc;
 int need_to_garbage_collect;
+int need_to_check_c_alloca;
+int funcall_allocation_flag;
+Bytecount __temp_alloca_size__;
+Bytecount funcall_alloca_count;
 
 /* Determine now whether we need to garbage collect or not, to make
    Ffuncall() faster */
@@ -401,6 +405,10 @@
      esp. as the object are not large -- large stuff like buffer text and
      redisplay structures and allocated separately. */
   memset (val, 0, size);
+
+  if (need_to_check_c_alloca)
+    xemacs_c_alloca (0);
+
   return val;
 }
 
@@ -1909,7 +1917,7 @@
 #endif
 
 /* You do NOT want to be calling this! (And if you do, you must call
-   XSET_STRING_ASCII_BEGIN() after modifying the string.) Use alloca()
+   XSET_STRING_ASCII_BEGIN() after modifying the string.) Use ALLOCA ()
    instead and then call make_string() like the rest of the world. */
 
 Lisp_Object
@@ -3999,6 +4007,12 @@
   return make_int (total_data_usage ());
 }
 
+void
+recompute_funcall_allocation_flag (void)
+{
+  funcall_allocation_flag = need_to_garbage_collect || need_to_check_c_alloca;
+}
+
 /* True if it's time to garbage collect now. */
 static void
 recompute_need_to_garbage_collect (void)
@@ -4014,6 +4028,7 @@
        gc_cons_percentage
 #endif /* 0 */
        );
+  recompute_funcall_allocation_flag ();
 }
 
 
@@ -4219,6 +4234,9 @@
 
   consing_since_gc = 0;
   need_to_garbage_collect = always_gc;
+  need_to_check_c_alloca = 0;
+  funcall_allocation_flag = 0;
+  funcall_alloca_count = 0;
 
 #if 1
   gc_cons_threshold = 500000; /* XEmacs change */