comparison src/sysdep.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 e7ee5f8bde58
children 1d8fb2eee1bb
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
126 126
127 127
128 /************************************************************************/ 128 /************************************************************************/
129 /* subprocess control */ 129 /* subprocess control */
130 /************************************************************************/ 130 /************************************************************************/
131
132 #ifdef NEED_SYNC_PROCESS_CODE
133
134 /* True iff we are about to fork off a synchronous process or if we
135 are waiting for it. */
136 volatile int synch_process_alive;
137
138 /* Nonzero => this is a string explaining death of synchronous subprocess. */
139 const char *synch_process_death;
140
141 /* If synch_process_death is zero,
142 this is exit code of synchronous subprocess. */
143 int synch_process_retcode;
144
145 #endif /* NEED_SYNC_PROCESS_CODE */
131 146
132 #ifdef HAVE_TTY 147 #ifdef HAVE_TTY
133 148
134 #ifdef SIGTSTP 149 #ifdef SIGTSTP
135 150
182 #ifdef F_SETFL 197 #ifdef F_SETFL
183 fcntl (fd, F_SETFL, O_NONBLOCK); 198 fcntl (fd, F_SETFL, O_NONBLOCK);
184 #endif 199 #endif
185 } 200 }
186 201
187 #if defined (NO_SUBPROCESSES) 202 #ifdef NEED_SYNC_PROCESS_CODE /* #### Used only on super-ancient systems */
188 203
189 #ifdef BSD 204 static void
190 void
191 wait_without_blocking (void)
192 {
193 wait3 (0, WNOHANG | WUNTRACED, 0);
194 synch_process_alive = 0;
195 }
196 #endif /* BSD */
197
198 #endif /* NO_SUBPROCESSES */
199
200
201 void
202 wait_for_termination (int pid) 205 wait_for_termination (int pid)
203 { 206 {
204 /* #### With the new improved SIGCHLD handling stuff, there is much 207 /* #### With the new improved SIGCHLD handling stuff, there is much
205 less danger of race conditions and some of the comments below 208 less danger of race conditions and some of the comments below
206 don't apply. This should be updated. */ 209 don't apply. This should be updated. */
307 - EINVAL (incorrect arguments), 310 - EINVAL (incorrect arguments),
308 which are both program bugs. 311 which are both program bugs.
309 312
310 Since implementations may add their own error indicators on top, 313 Since implementations may add their own error indicators on top,
311 we ignore it by default. */ 314 we ignore it by default. */
312 #elif defined (WIN32_NATIVE)
313 /* not used */
314 #elif defined (EMACS_BLOCK_SIGNAL) && !defined (BROKEN_WAIT_FOR_SIGNAL) && defined (SIGCHLD) 315 #elif defined (EMACS_BLOCK_SIGNAL) && !defined (BROKEN_WAIT_FOR_SIGNAL) && defined (SIGCHLD)
315 while (1) 316 while (1)
316 { 317 {
317 static int wait_debugging = 0; /* Set nonzero to make following 318 static int wait_debugging = 0; /* Set nonzero to make following
318 function work under dbx (at least for bsd). */ 319 function work under dbx (at least for bsd). */
340 sigpause()/sigsuspend(), then your OS doesn't implement 341 sigpause()/sigsuspend(), then your OS doesn't implement
341 this properly (this applies under hpux9, for example). 342 this properly (this applies under hpux9, for example).
342 Try defining BROKEN_WAIT_FOR_SIGNAL. */ 343 Try defining BROKEN_WAIT_FOR_SIGNAL. */
343 EMACS_WAIT_FOR_SIGNAL (SIGCHLD); 344 EMACS_WAIT_FOR_SIGNAL (SIGCHLD);
344 } 345 }
345 #else /* not HAVE_WAITPID and not WIN32_NATIVE and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */ 346 #else /* not HAVE_WAITPID and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */
346 /* This approach is kind of cheesy but is guaranteed(?!) to work 347 /* This approach is kind of cheesy but is guaranteed(?!) to work
347 for all systems. */ 348 for all systems. */
348 while (1) 349 while (1)
349 { 350 {
350 QUIT; 351 QUIT;
355 start_interrupts (); 356 start_interrupts ();
356 } 357 }
357 #endif /* OS features */ 358 #endif /* OS features */
358 } 359 }
359 360
361 #endif /* NEED_SYNC_PROCESS_CODE */
360 362
361 #if !defined (NO_SUBPROCESSES) 363 #if !defined (NO_SUBPROCESSES)
362 364
363 /* 365 /*
364 * flush any pending output 366 * flush any pending output
925 927
926 /* ------------------------------------------------------ */ 928 /* ------------------------------------------------------ */
927 /* SIGIO control */ 929 /* SIGIO control */
928 /* ------------------------------------------------------ */ 930 /* ------------------------------------------------------ */
929 931
930 #if defined(SIGIO) && !defined(BROKEN_SIGIO) 932 #if defined (SIGIO) && !defined (BROKEN_SIGIO)
931 933
932 static void 934 static void
933 init_sigio_on_device (struct device *d) 935 init_sigio_on_device (struct device *d)
934 { 936 {
935 int filedesc = DEVICE_INFD (d); 937 int filedesc = DEVICE_INFD (d);
2638 /* No harm in looping regardless of the INTERRUPTIBLE_IO setting. */ 2640 /* No harm in looping regardless of the INTERRUPTIBLE_IO setting. */
2639 while ((rtnval = read (fildes, buf, nbyte)) == -1 2641 while ((rtnval = read (fildes, buf, nbyte)) == -1
2640 && (errno == EINTR)) 2642 && (errno == EINTR))
2641 { 2643 {
2642 if (allow_quit) 2644 if (allow_quit)
2643 REALLY_QUIT; 2645 QUIT;
2644 } 2646 }
2645 return rtnval; 2647 return rtnval;
2646 } 2648 }
2647 2649
2648 ssize_t 2650 ssize_t
2661 while (nbyte > 0) 2663 while (nbyte > 0)
2662 { 2664 {
2663 ssize_t rtnval = write (fildes, b, nbyte); 2665 ssize_t rtnval = write (fildes, b, nbyte);
2664 2666
2665 if (allow_quit) 2667 if (allow_quit)
2666 REALLY_QUIT; 2668 QUIT;
2667 2669
2668 if (rtnval == -1) 2670 if (rtnval == -1)
2669 { 2671 {
2670 if (errno == EINTR) 2672 if (errno == EINTR)
2671 continue; 2673 continue;