comparison src/specifier.c @ 853:2b6fa2618f76

[xemacs-hg @ 2002-05-28 08:44:22 by ben] merge my stderr-proc ws make-docfile.c: Fix places where we forget to check for EOF. code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and friends work both ways but Cygwin programs don't like the CRs. code-process.el, multicast.el, process.el: Removed. Improvements to call-process-internal: -- allows a buffer to be specified for input and stderr output -- use it on all systems -- implement C-g as documented -- clean up and comment call-process-region uses new call-process facilities; no temp file. remove duplicate funs in process.el. comment exactly how coding systems work and fix various problems. open-multicast-group now does similar coding-system frobbing to open-network-stream. dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time. xemacs.mak: Add -DSTRICT. ================================================================ ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES ================================================================ Standard output and standard error can be processed separately in a process. Each can have its own buffer, its own mark in that buffer, and its filter function. You can specify a separate buffer for stderr in `start-process' to get things started, or use the new primitives: set-process-stderr-buffer process-stderr-buffer process-stderr-mark set-process-stderr-filter process-stderr-filter Also, process-send-region takes a 4th optional arg, a buffer. Currently always uses a pipe() under Unix to read the error output. (#### Would a PTY be better?) sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c. wait_for_termination() now only needed on a few really old systems. console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for error input. Create Lstreams for reading in the error channel. Many process methods need change. In general the changes are fairly clear as they involve duplicating what's used for reading the normal stdout and changing for stderr -- although tedious, as such changes are required throughout the entire process code. Rewrote the code that reads process output to do two loops, one for stdout and one for stderr. gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr. ================================================================ NEW ERROR-TRAPPING MECHANISM ================================================================ Totally rewrite error trapping code to be unified and support more features. Basic function is call_trapping_problems(), which lets you specify, by means of flags, what sorts of problems you want trapped. these can include -- quit -- errors -- throws past the function -- creation of "display objects" (e.g. buffers) -- deletion of already-existing "display objects" (e.g. buffers) -- modification of already-existing buffers -- entering the debugger -- gc -- errors->warnings (ala suspended errors) etc. All other error funs rewritten in terms of this one. Various older mechanisms removed or rewritten. window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to note_object_created(), for use with trapping_problems mechanism. When deleting, call check_allowed_operation() and note_object deleted(). The trapping-problems code records the objects created since the call-trapping-problems began. Those objects can be deleted, but none others (i.e. previously existing ones). bytecode.c, cmdloop.c: internal_catch takes another arg. eval.c: Add long comments describing the "five lists" used to maintain state (backtrace, gcpro, specbind, etc.) in the Lisp engine. backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or redo in terms of new one. frame.c, gutter.c: Flush out the concept of "critical display section", defined by the in_display() var. Use an internal_bind() to get it reset, rather than just doing it at end, because there may be a non-local exit. event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on old mechanisms. glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay. insdel.c: Protect hooks against deleting existing buffers. frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers. Otherwise we run into stickiness in redisplay because internal_equal() can QUIT. ================================================================ SIGNAL, C-G CHANGES ================================================================ Here we change the way that C-g interacts with event reading. The idea is that a C-g occurring while we're reading a user event should be read as C-g, but elsewhere should be a QUIT. The former code did all sorts of bizarreness -- requiring that no QUIT occurs anywhere in event-reading code (impossible to enforce given the stuff called or Lisp code invoked), and having some weird system involving enqueue/dequeue of a C-g and interaction with Vquit_flag -- and it didn't work. Now, we simply enclose all code where we want C-g read as an event with {begin/end}_dont_check_for_quit(). This completely turns off the mechanism that checks (and may remove or alter) C-g in the read-ahead queues, so we just get the C-g normal. Signal.c documents this very carefully. cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old out-of-date comments. event-stream.c: Fix C-g handling to actually work. device-x.c: Disable quit checking when err out. signal.c: Cleanup. Add large descriptive comment. process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT. It's not necessary to use REALLY_QUIT and just confuses the issue. lisp.h: Comment quit handlers. ================================================================ CONS CHANGES ================================================================ free_cons() now takes a Lisp_Object not the result of XCONS(). car and cdr have been renamed so that they don't get used directly; go through XCAR(), XCDR() instead. alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object, not Lisp_Cons chartab.c: Eliminate direct use of ->car, ->cdr, should be black box. callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons. ================================================================ USE INTERNAL-BIND-* ================================================================ eval.c: Cleanups of these funs. alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object() in place of whatever varied and cumbersome mechanisms were formerly there. ================================================================ SPECBIND SANITY ================================================================ backtrace.h: - Improved comments backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity checking code each time the catchlist or specbind stack change. Removed older prototype of same mechanism. ================================================================ MISC ================================================================ lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship. device-msw.c: Correct bad Unicode-ization. print.c: Be more careful when not initialized or in fatal error handling. search.c: Eliminate running_asynch_code, an FSF holdover. alloc.c: Added comments about gc-cons-threshold. dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value tree, like in menubar-x.c. gui.c: Use Qunbound not Qnil as the default for gethash. lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP(). lisp.h: Use ERROR_CHECK_STRUCTURES to turn on ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK lisp.h: Add assert_with_message. lisp.h: Add macros for gcproing entire arrays. (You could do this before but it required manual twiddling the gcpro structure.) lisp.h: Add prototypes for new functions defined elsewhere.
author ben
date Tue, 28 May 2002 08:45:36 +0000
parents 6728e641994e
children 79c6ff3eef26
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
1363 signal_error (Qsetting_constant, 1363 signal_error (Qsetting_constant,
1364 "Attempt to modify read-only specifier", 1364 "Attempt to modify read-only specifier",
1365 spec); 1365 spec);
1366 } 1366 }
1367 1367
1368 /* Helper function which unwind protects the value of
1369 Vunlock_ghost_specifiers, then sets it to non-nil value */
1370 static Lisp_Object
1371 restore_unlock_value (Lisp_Object val)
1372 {
1373 Vunlock_ghost_specifiers = val;
1374 return val;
1375 }
1376
1377 int 1368 int
1378 unlock_ghost_specifiers_protected (void) 1369 unlock_ghost_specifiers_protected (void)
1379 { 1370 {
1380 int depth = specpdl_depth (); 1371 return internal_bind_lisp_object (&Vunlock_ghost_specifiers, Qt);
1381 record_unwind_protect (restore_unlock_value,
1382 Vunlock_ghost_specifiers);
1383 Vunlock_ghost_specifiers = Qt;
1384 return depth;
1385 } 1372 }
1386 1373
1387 /* This gets hit so much that the function call overhead had a 1374 /* This gets hit so much that the function call overhead had a
1388 measurable impact (according to Quantify). #### We should figure 1375 measurable impact (according to Quantify). #### We should figure
1389 out the frequency with which this is called with the various types 1376 out the frequency with which this is called with the various types
2815 2802
2816 /************************************************************************/ 2803 /************************************************************************/
2817 /* Caching in the struct window or frame */ 2804 /* Caching in the struct window or frame */
2818 /************************************************************************/ 2805 /************************************************************************/
2819 2806
2820 /* Either STRUCT_WINDOW_OFFSET or STRUCT_FRAME_OFFSET can be 0 to indicate 2807 /* Cause the current value of SPECIFIER in the domain of each frame and/or
2821 no caching in that sort of object. */ 2808 window to be cached in the struct frame at STRUCT_FRAME_OFFSET and the
2809 struct window at STRUCT_WINDOW_OFFSET. When the value changes in a
2810 particular window, VALUE_CHANGED_IN_WINDOW is called. When the value
2811 changes in a particular frame, VALUE_CHANGED_IN_FRAME is called.
2812
2813 Either STRUCT_WINDOW_OFFSET or STRUCT_FRAME_OFFSET can be 0 to indicate
2814 no caching in that sort of object. However, if they're not 0, you
2815 must supply a corresponding value-changed function. (This is the case
2816 so that you are forced to consider the ramifications of a value change.
2817 You nearly always need to do something, e.g. set a dirty flag.)
2818
2819 If you create a built-in specifier, you should do the following:
2820
2821 - Make sure the file you create the specifier in has a
2822 specifier_vars_of_foo() function. If not, create it, declare it in
2823 symsinit.h, and make sure it's called in the appropriate place in
2824 emacs.c.
2825 - In specifier_vars_of_foo(), do a DEFVAR_SPECIFIER(), followed by
2826 initializing the specifier using Fmake_specifier(), followed by
2827 set_specifier_fallback(), followed (optionally) by
2828 set_specifier_caching().
2829 - If you used set_specifier_caching(), make sure to create the
2830 appropriate value-changed functions. Also make sure to add the
2831 appropriate slots where the values are cached to frameslots.h and
2832 winslots.h.
2833
2834 Do a grep for menubar_visible_p for an example.
2835 */
2822 2836
2823 /* #### It would be nice if the specifier caching automatically knew 2837 /* #### It would be nice if the specifier caching automatically knew
2824 about specifier fallbacks, so we didn't have to do it ourselves. */ 2838 about specifier fallbacks, so we didn't have to do it ourselves. */
2825 2839
2826 void 2840 void
2841 sp->caching = xnew_and_zero (struct specifier_caching); 2855 sp->caching = xnew_and_zero (struct specifier_caching);
2842 sp->caching->offset_into_struct_window = struct_window_offset; 2856 sp->caching->offset_into_struct_window = struct_window_offset;
2843 sp->caching->value_changed_in_window = value_changed_in_window; 2857 sp->caching->value_changed_in_window = value_changed_in_window;
2844 sp->caching->offset_into_struct_frame = struct_frame_offset; 2858 sp->caching->offset_into_struct_frame = struct_frame_offset;
2845 sp->caching->value_changed_in_frame = value_changed_in_frame; 2859 sp->caching->value_changed_in_frame = value_changed_in_frame;
2860 if (struct_window_offset)
2861 assert (value_changed_in_window);
2862 if (struct_frame_offset)
2863 assert (value_changed_in_frame);
2846 sp->caching->always_recompute = always_recompute; 2864 sp->caching->always_recompute = always_recompute;
2847 Vcached_specifiers = Fcons (specifier, Vcached_specifiers); 2865 Vcached_specifiers = Fcons (specifier, Vcached_specifiers);
2848 if (BODILY_SPECIFIER_P (sp)) 2866 if (BODILY_SPECIFIER_P (sp))
2849 GHOST_SPECIFIER(sp)->caching = sp->caching; 2867 GHOST_SPECIFIER(sp)->caching = sp->caching;
2850 recompute_cached_specifier_everywhere (specifier); 2868 recompute_cached_specifier_everywhere (specifier);