Mercurial > hg > xemacs-beta
comparison src/device.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 |
---|---|
1 /* Generic device functions. | 1 /* Generic device functions. |
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. |
3 Copyright (C) 1994, 1995 Free Software Foundation, Inc. | 3 Copyright (C) 1994, 1995 Free Software Foundation, Inc. |
4 Copyright (C) 1995, 1996, 2002 Ben Wing | 4 Copyright (C) 1995, 1996, 2002 Ben Wing. |
5 | 5 |
6 This file is part of XEmacs. | 6 This file is part of XEmacs. |
7 | 7 |
8 XEmacs is free software; you can redistribute it and/or modify it | 8 XEmacs is free software; you can redistribute it and/or modify it |
9 under the terms of the GNU General Public License as published by the | 9 under the terms of the GNU General Public License as published by the |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
21 Boston, MA 02111-1307, USA. */ | 21 Boston, MA 02111-1307, USA. */ |
22 | 22 |
23 /* Synched up with: Not in FSF. */ | 23 /* Synched up with: Not in FSF. */ |
24 | 24 |
25 /* Original version by Chuck Thompson; | 25 /* Written by Ben Wing, late 1995? |
26 rewritten and expanded by Ben Wing. */ | 26 Based on prototype by Chuck Thompson. |
27 device-system-metric stuff added 1998? by Kirill Katsnelson. | |
28 */ | |
27 | 29 |
28 #include <config.h> | 30 #include <config.h> |
29 #include "lisp.h" | 31 #include "lisp.h" |
30 | 32 |
31 #include "buffer.h" | 33 #include "buffer.h" |
152 allocate_device (Lisp_Object console) | 154 allocate_device (Lisp_Object console) |
153 { | 155 { |
154 Lisp_Object device; | 156 Lisp_Object device; |
155 struct device *d = alloc_lcrecord_type (struct device, &lrecord_device); | 157 struct device *d = alloc_lcrecord_type (struct device, &lrecord_device); |
156 struct gcpro gcpro1; | 158 struct gcpro gcpro1; |
159 | |
160 zero_lcrecord (d); | |
157 | 161 |
158 device = wrap_device (d); | 162 device = wrap_device (d); |
159 GCPRO1 (device); | 163 GCPRO1 (device); |
160 | 164 |
161 nuke_all_device_slots (d, Qnil); | 165 nuke_all_device_slots (d, Qnil); |
565 | 569 |
566 MAYBE_DEVMETH (d, init_device, (d, props)); | 570 MAYBE_DEVMETH (d, init_device, (d, props)); |
567 | 571 |
568 /* Do it this way so that the device list is in order of creation */ | 572 /* Do it this way so that the device list is in order of creation */ |
569 con->device_list = nconc2 (con->device_list, Fcons (device, Qnil)); | 573 con->device_list = nconc2 (con->device_list, Fcons (device, Qnil)); |
574 note_object_created (device); | |
575 | |
570 RESET_CHANGED_SET_FLAGS; | 576 RESET_CHANGED_SET_FLAGS; |
571 if (NILP (Vdefault_device) || DEVICE_STREAM_P (XDEVICE (Vdefault_device))) | 577 if (NILP (Vdefault_device) || DEVICE_STREAM_P (XDEVICE (Vdefault_device))) |
572 Vdefault_device = device; | 578 Vdefault_device = device; |
573 | 579 |
574 init_device_sound (d); | 580 init_device_sound (d); |
685 /* OK to delete an already-deleted device. */ | 691 /* OK to delete an already-deleted device. */ |
686 if (!DEVICE_LIVE_P (d)) | 692 if (!DEVICE_LIVE_P (d)) |
687 return; | 693 return; |
688 | 694 |
689 device = wrap_device (d); | 695 device = wrap_device (d); |
696 | |
697 if (!force) | |
698 check_allowed_operation (OPERATION_DELETE_OBJECT, device, Qnil); | |
699 | |
690 GCPRO1 (device); | 700 GCPRO1 (device); |
691 | 701 |
692 c = XCONSOLE (DEVICE_CONSOLE (d)); | 702 c = XCONSOLE (DEVICE_CONSOLE (d)); |
693 | 703 |
694 if (!called_from_delete_console) | 704 if (!called_from_delete_console) |
806 pointer to the dead device continues to hang around. Zero all | 816 pointer to the dead device continues to hang around. Zero all |
807 other structs in case someone tries to access something through | 817 other structs in case someone tries to access something through |
808 them. */ | 818 them. */ |
809 nuke_all_device_slots (d, Qnil); | 819 nuke_all_device_slots (d, Qnil); |
810 d->devmeths = dead_console_methods; | 820 d->devmeths = dead_console_methods; |
821 note_object_deleted (device); | |
811 | 822 |
812 UNGCPRO; | 823 UNGCPRO; |
813 } | 824 } |
814 | 825 |
815 /* delete a device as a result of an I/O error. Called from | 826 /* delete a device as a result of an I/O error. Called from |
1210 | 1221 |
1211 void | 1222 void |
1212 call_critical_lisp_code (struct device *d, Lisp_Object function, | 1223 call_critical_lisp_code (struct device *d, Lisp_Object function, |
1213 Lisp_Object object) | 1224 Lisp_Object object) |
1214 { | 1225 { |
1226 /* This function cannot GC */ | |
1215 int count = begin_gc_forbidden (); | 1227 int count = begin_gc_forbidden (); |
1228 struct gcpro gcpro1; | |
1229 Lisp_Object args[3]; | |
1230 | |
1216 specbind (Qinhibit_quit, Qt); | 1231 specbind (Qinhibit_quit, Qt); |
1217 record_unwind_protect (unlock_device, wrap_device (d)); | 1232 record_unwind_protect (unlock_device, wrap_device (d)); |
1218 | 1233 |
1219 /* [[There's no real reason to bother doing unwind-protects, because if | 1234 /* [[There's no real reason to bother doing unwind-protects, because if |
1220 initialize-*-faces signals an error, emacs is going to crash | 1235 initialize-*-faces signals an error, emacs is going to crash |
1223 with non-initial devices, we should signal an error but NOT kill | 1238 with non-initial devices, we should signal an error but NOT kill |
1224 ourselves! --ben | 1239 ourselves! --ben |
1225 */ | 1240 */ |
1226 LOCK_DEVICE (d); | 1241 LOCK_DEVICE (d); |
1227 | 1242 |
1228 /* But it's useful to have an error handler; otherwise an infinite | 1243 args[0] = Qreally_early_error_handler; |
1244 args[1] = function; | |
1245 args[2] = object; | |
1246 | |
1247 GCPRO1_ARRAY (args, 3); | |
1248 | |
1249 /* It's useful to have an error handler; otherwise an infinite | |
1229 loop may result. */ | 1250 loop may result. */ |
1230 if (!NILP (object)) | 1251 Fcall_with_condition_handler (!NILP (object) ? 3 : 2, args); |
1231 call1_with_handler (Qreally_early_error_handler, function, object); | 1252 |
1232 else | 1253 UNGCPRO; |
1233 call0_with_handler (Qreally_early_error_handler, function); | |
1234 | 1254 |
1235 unbind_to (count); | 1255 unbind_to (count); |
1236 } | 1256 } |
1237 | 1257 |
1238 | 1258 |