comparison src/event-unixoid.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 19dfb459d51a
children 804517e16990
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
181 } 181 }
182 182
183 static int 183 static int
184 get_process_infd (Lisp_Process *p) 184 get_process_infd (Lisp_Process *p)
185 { 185 {
186 Lisp_Object instr, outstr; 186 Lisp_Object instr, outstr, errstr;
187 get_process_streams (p, &instr, &outstr); 187 get_process_streams (p, &instr, &outstr, &errstr);
188 assert (!NILP (instr)); 188 assert (!NILP (instr));
189 return filedesc_stream_fd (XLSTREAM (instr)); 189 return filedesc_stream_fd (XLSTREAM (instr));
190 } 190 }
191 191
192 int 192 static int
193 event_stream_unixoid_select_process (Lisp_Process *proc) 193 get_process_errfd (Lisp_Process *p)
194 { 194 {
195 int infd = get_process_infd (proc); 195 Lisp_Object instr, outstr, errstr;
196 196 get_process_streams (p, &instr, &outstr, &errstr);
197 FD_SET (infd, &input_wait_mask); 197 if (!NILP (errstr))
198 FD_SET (infd, &non_fake_input_wait_mask); 198 return filedesc_stream_fd (XLSTREAM (errstr));
199 FD_SET (infd, &process_only_mask); 199 else
200 return infd; 200 return -1;
201 } 201 }
202 202
203 int 203 void
204 event_stream_unixoid_unselect_process (Lisp_Process *proc) 204 event_stream_unixoid_select_process (Lisp_Process *proc, int doin, int doerr,
205 { 205 int *infd, int *errfd)
206 int infd = get_process_infd (proc); 206 {
207 207 if (doin)
208 FD_CLR (infd, &input_wait_mask); 208 {
209 FD_CLR (infd, &non_fake_input_wait_mask); 209 *infd = get_process_infd (proc);
210 FD_CLR (infd, &process_only_mask); 210 FD_SET (*infd, &input_wait_mask);
211 return infd; 211 FD_SET (*infd, &non_fake_input_wait_mask);
212 FD_SET (*infd, &process_only_mask);
213 }
214
215 if (doerr)
216 {
217 *errfd = get_process_errfd (proc);
218
219 if (*errfd >= 0)
220 {
221 FD_SET (*errfd, &input_wait_mask);
222 FD_SET (*errfd, &non_fake_input_wait_mask);
223 FD_SET (*errfd, &process_only_mask);
224 }
225 }
226 }
227
228 void
229 event_stream_unixoid_unselect_process (Lisp_Process *proc, int doin, int doerr,
230 int *infd, int *errfd)
231 {
232 if (doin)
233 {
234 *infd = get_process_infd (proc);
235 FD_CLR (*infd, &input_wait_mask);
236 FD_CLR (*infd, &non_fake_input_wait_mask);
237 FD_CLR (*infd, &process_only_mask);
238 }
239
240 if (doerr)
241 {
242 *errfd = get_process_errfd (proc);
243
244 if (*errfd >= 0)
245 {
246 FD_CLR (*errfd, &input_wait_mask);
247 FD_CLR (*errfd, &non_fake_input_wait_mask);
248 FD_CLR (*errfd, &process_only_mask);
249 }
250 }
212 } 251 }
213 252
214 int 253 int
215 poll_fds_for_input (SELECT_TYPE mask) 254 poll_fds_for_input (SELECT_TYPE mask)
216 { 255 {
243 282
244 /****************************************************************************/ 283 /****************************************************************************/
245 /* Unixoid (file descriptors based) process I/O streams routines */ 284 /* Unixoid (file descriptors based) process I/O streams routines */
246 /****************************************************************************/ 285 /****************************************************************************/
247 286
248 USID 287 void
249 event_stream_unixoid_create_stream_pair (void* inhandle, void* outhandle, 288 event_stream_unixoid_create_io_streams (void* inhandle, void* outhandle,
250 Lisp_Object* instream, 289 void *errhandle, Lisp_Object* instream,
251 Lisp_Object* outstream, 290 Lisp_Object* outstream,
252 int flags) 291 Lisp_Object* errstream,
253 { 292 USID* in_usid,
254 int infd, outfd; 293 USID* err_usid,
294 int flags)
295 {
296 int infd, outfd, errfd;
255 /* Decode inhandle and outhandle. Their meaning depends on 297 /* Decode inhandle and outhandle. Their meaning depends on
256 the process implementation being used. */ 298 the process implementation being used. */
257 #if defined (HAVE_WIN32_PROCESSES)
258 /* We're passed in Windows handles. Open new fds for them */
259 if ((HANDLE)inhandle != INVALID_HANDLE_VALUE)
260 {
261 infd = open_osfhandle ((HANDLE)inhandle, 0);
262 if (infd < 0)
263 return USID_ERROR;
264 }
265 else
266 infd = -1;
267
268 if ((HANDLE)outhandle != INVALID_HANDLE_VALUE)
269 {
270 outfd = open_osfhandle ((HANDLE)outhandle, 0);
271 if (outfd < 0)
272 {
273 if (infd >= 0)
274 retry_close (infd);
275 return USID_ERROR;
276 }
277 }
278 else
279 outfd = -1;
280
281 flags = 0;
282 #elif defined (HAVE_UNIX_PROCESSES)
283 /* We are passed plain old file descs */ 299 /* We are passed plain old file descs */
284 infd = (int)inhandle; 300 infd = (int) inhandle;
285 outfd = (int)outhandle; 301 outfd = (int) outhandle;
286 #else 302 errfd = (int) errhandle;
287 # error Which processes do you have?
288 #endif
289 303
290 *instream = (infd >= 0 304 *instream = (infd >= 0
291 ? make_filedesc_input_stream (infd, 0, -1, 0) 305 ? make_filedesc_input_stream (infd, 0, -1, 0)
292 : Qnil); 306 : Qnil);
293 307
294 *outstream = (outfd >= 0 308 *outstream = (outfd >= 0
295 ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK) 309 ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK)
296 : Qnil); 310 : Qnil);
297 311
298 #if defined(HAVE_UNIX_PROCESSES) 312 *errstream = (errfd >= 0
313 ? make_filedesc_input_stream (errfd, 0, -1, 0)
314 : Qnil);
315
299 /* FLAGS is process->pty_flag for UNIX_PROCESSES */ 316 /* FLAGS is process->pty_flag for UNIX_PROCESSES */
300 if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0) 317 if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0)
301 { 318 {
302 Intbyte eof_char = get_eof_char (outfd); 319 Intbyte eof_char = get_eof_char (outfd);
303 int pty_max_bytes = get_pty_max_bytes (outfd); 320 int pty_max_bytes = get_pty_max_bytes (outfd);
304 filedesc_stream_set_pty_flushing (XLSTREAM(*outstream), pty_max_bytes, eof_char); 321 filedesc_stream_set_pty_flushing (XLSTREAM (*outstream), pty_max_bytes,
305 } 322 eof_char);
306 #endif 323 }
307 324
308 return FD_TO_USID (infd); 325 *in_usid = FD_TO_USID (infd);
309 } 326 *err_usid = FD_TO_USID (errfd);
310 327 }
311 USID 328
312 event_stream_unixoid_delete_stream_pair (Lisp_Object instream, 329 void
313 Lisp_Object outstream) 330 event_stream_unixoid_delete_io_streams (Lisp_Object instream,
314 { 331 Lisp_Object outstream,
315 int in = (NILP(instream) ? -1 332 Lisp_Object errstream,
333 USID *in_usid,
334 USID *err_usid)
335 {
336 int in = (NILP (instream) ? -1
316 : filedesc_stream_fd (XLSTREAM (instream))); 337 : filedesc_stream_fd (XLSTREAM (instream)));
317 int out = (NILP(outstream) ? -1 338 int out = (NILP (outstream) ? -1
318 : filedesc_stream_fd (XLSTREAM (outstream))); 339 : filedesc_stream_fd (XLSTREAM (outstream)));
340 int err = (NILP (errstream) ? -1
341 : filedesc_stream_fd (XLSTREAM (errstream)));
319 342
320 if (in >= 0) 343 if (in >= 0)
321 retry_close (in); 344 retry_close (in);
322 if (out != in && out >= 0) 345 if (out != in && out >= 0)
323 retry_close (out); 346 retry_close (out);
324 347 if (err != in && err != out && err >= 0)
325 return FD_TO_USID (in); 348 retry_close (err);
349
350 *in_usid = FD_TO_USID (in);
351 *err_usid = FD_TO_USID (err);
326 } 352 }
327 353
328 354
329 void 355 void
330 init_event_unixoid (void) 356 init_event_unixoid (void)