Mercurial > hg > xemacs-beta
comparison src/alloc.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 | 2c12fe2da451 |
comparison
equal
deleted
inserted
replaced
852:d83885ef293b | 853:2b6fa2618f76 |
---|---|
153 | 153 |
154 /* Percentage of consing of total data size before another GC. */ | 154 /* Percentage of consing of total data size before another GC. */ |
155 static EMACS_INT gc_cons_percentage; | 155 static EMACS_INT gc_cons_percentage; |
156 | 156 |
157 #ifdef ERROR_CHECK_GC | 157 #ifdef ERROR_CHECK_GC |
158 int always_gc; /* Debugging hack */ | 158 int always_gc; /* Debugging hack; equivalent to |
159 (setq gc-cons-thresold -1) */ | |
159 #else | 160 #else |
160 #define always_gc 0 | 161 #define always_gc 0 |
161 #endif | 162 #endif |
162 | 163 |
163 /* Nonzero during gc */ | 164 /* Nonzero during gc */ |
171 /* This is just for use by the printer, to allow things to print uniquely */ | 172 /* This is just for use by the printer, to allow things to print uniquely */ |
172 static int lrecord_uid_counter; | 173 static int lrecord_uid_counter; |
173 | 174 |
174 /* Nonzero when calling certain hooks or doing other things where | 175 /* Nonzero when calling certain hooks or doing other things where |
175 a GC would be bad */ | 176 a GC would be bad */ |
176 int gc_currently_forbidden; | 177 static int gc_currently_forbidden; |
177 | 178 |
178 /* Hooks. */ | 179 /* Hooks. */ |
179 Lisp_Object Vpre_gc_hook, Qpre_gc_hook; | 180 Lisp_Object Vpre_gc_hook, Qpre_gc_hook; |
180 Lisp_Object Vpost_gc_hook, Qpost_gc_hook; | 181 Lisp_Object Vpost_gc_hook, Qpost_gc_hook; |
181 | 182 |
927 } | 928 } |
928 return 0; | 929 return 0; |
929 } | 930 } |
930 | 931 |
931 static const struct lrecord_description cons_description[] = { | 932 static const struct lrecord_description cons_description[] = { |
932 { XD_LISP_OBJECT, offsetof (Lisp_Cons, car) }, | 933 { XD_LISP_OBJECT, offsetof (Lisp_Cons, car_) }, |
933 { XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr) }, | 934 { XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr_) }, |
934 { XD_END } | 935 { XD_END } |
935 }; | 936 }; |
936 | 937 |
937 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("cons", cons, | 938 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("cons", cons, |
938 mark_cons, print_cons, 0, | 939 mark_cons, print_cons, 0, |
956 Lisp_Cons *c; | 957 Lisp_Cons *c; |
957 | 958 |
958 ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c); | 959 ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c); |
959 set_lheader_implementation (&c->lheader, &lrecord_cons); | 960 set_lheader_implementation (&c->lheader, &lrecord_cons); |
960 val = wrap_cons (c); | 961 val = wrap_cons (c); |
961 c->car = car; | 962 XSETCAR (val, car); |
962 c->cdr = cdr; | 963 XSETCDR (val, cdr); |
963 return val; | 964 return val; |
964 } | 965 } |
965 | 966 |
966 /* This is identical to Fcons() but it used for conses that we're | 967 /* This is identical to Fcons() but it used for conses that we're |
967 going to free later, and is useful when trying to track down | 968 going to free later, and is useful when trying to track down |
3025 SWEEP_FIXED_TYPE_BLOCK (cons, Lisp_Cons); | 3026 SWEEP_FIXED_TYPE_BLOCK (cons, Lisp_Cons); |
3026 } | 3027 } |
3027 | 3028 |
3028 /* Explicitly free a cons cell. */ | 3029 /* Explicitly free a cons cell. */ |
3029 void | 3030 void |
3030 free_cons (Lisp_Cons *ptr) | 3031 free_cons (Lisp_Object cons) |
3031 { | 3032 { |
3033 Lisp_Cons *ptr = XCONS (cons); | |
3034 | |
3032 #ifdef ERROR_CHECK_GC | 3035 #ifdef ERROR_CHECK_GC |
3033 /* If the CAR is not an int, then it will be a pointer, which will | 3036 /* If the CAR is not an int, then it will be a pointer, which will |
3034 always be four-byte aligned. If this cons cell has already been | 3037 always be four-byte aligned. If this cons cell has already been |
3035 placed on the free list, however, its car will probably contain | 3038 placed on the free list, however, its car will probably contain |
3036 a chain pointer to the next cons on the list, which has cleverly | 3039 a chain pointer to the next cons on the list, which has cleverly |
3037 had all its 0's and 1's inverted. This allows for a quick | 3040 had all its 0's and 1's inverted. This allows for a quick |
3038 check to make sure we're not freeing something already freed. */ | 3041 check to make sure we're not freeing something already freed. */ |
3039 if (POINTER_TYPE_P (XTYPE (ptr->car))) | 3042 if (POINTER_TYPE_P (XTYPE (cons_car (ptr)))) |
3040 ASSERT_VALID_POINTER (XPNTR (ptr->car)); | 3043 ASSERT_VALID_POINTER (XPNTR (cons_car (ptr))); |
3041 #endif /* ERROR_CHECK_GC */ | 3044 #endif /* ERROR_CHECK_GC */ |
3042 | 3045 |
3043 #ifndef ALLOC_NO_POOLS | 3046 #ifndef ALLOC_NO_POOLS |
3044 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, Lisp_Cons, ptr); | 3047 FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, Lisp_Cons, ptr); |
3045 #endif /* ALLOC_NO_POOLS */ | 3048 #endif /* ALLOC_NO_POOLS */ |
3056 Lisp_Object rest, next; | 3059 Lisp_Object rest, next; |
3057 | 3060 |
3058 for (rest = list; !NILP (rest); rest = next) | 3061 for (rest = list; !NILP (rest); rest = next) |
3059 { | 3062 { |
3060 next = XCDR (rest); | 3063 next = XCDR (rest); |
3061 free_cons (XCONS (rest)); | 3064 free_cons (rest); |
3062 } | 3065 } |
3063 } | 3066 } |
3064 | 3067 |
3065 /* explicitly free an alist. You **must make sure** that you have | 3068 /* explicitly free an alist. You **must make sure** that you have |
3066 created all the cons cells that make up this alist and that there | 3069 created all the cons cells that make up this alist and that there |
3073 Lisp_Object rest, next; | 3076 Lisp_Object rest, next; |
3074 | 3077 |
3075 for (rest = alist; !NILP (rest); rest = next) | 3078 for (rest = alist; !NILP (rest); rest = next) |
3076 { | 3079 { |
3077 next = XCDR (rest); | 3080 next = XCDR (rest); |
3078 free_cons (XCONS (XCAR (rest))); | 3081 free_cons (XCAR (rest)); |
3079 free_cons (XCONS (rest)); | 3082 free_cons (rest); |
3080 } | 3083 } |
3081 } | 3084 } |
3082 | 3085 |
3083 static void | 3086 static void |
3084 sweep_compiled_functions (void) | 3087 sweep_compiled_functions (void) |
3504 /* There, that ought to be enough... */ | 3507 /* There, that ought to be enough... */ |
3505 | 3508 |
3506 } | 3509 } |
3507 | 3510 |
3508 | 3511 |
3509 static Lisp_Object | |
3510 restore_gc_inhibit (Lisp_Object val) | |
3511 { | |
3512 gc_currently_forbidden = XINT (val); | |
3513 return val; | |
3514 } | |
3515 | |
3516 int | 3512 int |
3517 begin_gc_forbidden (void) | 3513 begin_gc_forbidden (void) |
3518 { | 3514 { |
3519 int speccount = record_unwind_protect (restore_gc_inhibit, | 3515 return internal_bind_int (&gc_currently_forbidden, 1); |
3520 make_int (gc_currently_forbidden)); | |
3521 gc_currently_forbidden = 1; | |
3522 return speccount; | |
3523 } | 3516 } |
3524 | 3517 |
3525 void | 3518 void |
3526 end_gc_forbidden (int count) | 3519 end_gc_forbidden (int count) |
3527 { | 3520 { |
3630 stuff that might run Lisp code; otherwise, we'll likely | 3623 stuff that might run Lisp code; otherwise, we'll likely |
3631 have infinite GC recursion. */ | 3624 have infinite GC recursion. */ |
3632 speccount = begin_gc_forbidden (); | 3625 speccount = begin_gc_forbidden (); |
3633 | 3626 |
3634 if (!gc_hooks_inhibited) | 3627 if (!gc_hooks_inhibited) |
3635 run_hook_trapping_errors ("Error in pre-gc-hook", Qpre_gc_hook); | 3628 run_hook_trapping_problems |
3629 ("Error in pre-gc-hook", Qpre_gc_hook, | |
3630 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); | |
3636 | 3631 |
3637 /* Now show the GC cursor/message. */ | 3632 /* Now show the GC cursor/message. */ |
3638 if (!noninteractive) | 3633 if (!noninteractive) |
3639 { | 3634 { |
3640 if (FRAME_WIN_P (f)) | 3635 if (FRAME_WIN_P (f)) |
3741 struct catchtag *catch; | 3736 struct catchtag *catch; |
3742 for (catch = catchlist; catch; catch = catch->next) | 3737 for (catch = catchlist; catch; catch = catch->next) |
3743 { | 3738 { |
3744 mark_object (catch->tag); | 3739 mark_object (catch->tag); |
3745 mark_object (catch->val); | 3740 mark_object (catch->val); |
3741 mark_object (catch->actual_tag); | |
3746 } | 3742 } |
3747 } | 3743 } |
3748 | 3744 |
3749 { | 3745 { |
3750 struct backtrace *backlist; | 3746 struct backtrace *backlist; |
3799 | 3795 |
3800 run_post_gc_actions (); | 3796 run_post_gc_actions (); |
3801 | 3797 |
3802 /******* End of garbage collection ********/ | 3798 /******* End of garbage collection ********/ |
3803 | 3799 |
3804 run_hook_trapping_errors ("Error in post-gc-hook", Qpost_gc_hook); | 3800 run_hook_trapping_problems |
3801 ("Error in post-gc-hook", Qpost_gc_hook, | |
3802 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); | |
3805 | 3803 |
3806 /* Now remove the GC cursor/message */ | 3804 /* Now remove the GC cursor/message */ |
3807 if (!noninteractive) | 3805 if (!noninteractive) |
3808 { | 3806 { |
3809 if (cursor_changed) | 3807 if (cursor_changed) |
4361 Garbage collection happens automatically when `eval' or `funcall' are | 4359 Garbage collection happens automatically when `eval' or `funcall' are |
4362 called. (Note that `funcall' is called implicitly as part of evaluation.) | 4360 called. (Note that `funcall' is called implicitly as part of evaluation.) |
4363 By binding this temporarily to a large number, you can effectively | 4361 By binding this temporarily to a large number, you can effectively |
4364 prevent garbage collection during a part of the program. | 4362 prevent garbage collection during a part of the program. |
4365 | 4363 |
4364 Normally, you cannot set this value less than 10,000 (if you do, it is | |
4365 automatically reset during the next garbage collection). However, if | |
4366 XEmacs was compiled with DEBUG_XEMACS, this does not happen, allowing | |
4367 you to set this value very low to track down problems with insufficient | |
4368 GCPRO'ing. If you set this to a negative number, garbage collection will | |
4369 happen at *EVERY* call to `eval' or `funcall'. This is an extremely | |
4370 effective way to check GCPRO problems, but be warned that your XEmacs | |
4371 will be unusable! You almost certainly won't have the patience to wait | |
4372 long enough to be able to set it back. | |
4373 | |
4366 See also `consing-since-gc'. | 4374 See also `consing-since-gc'. |
4367 */ ); | 4375 */ ); |
4368 | 4376 |
4369 DEFVAR_INT ("gc-cons-percentage", &gc_cons_percentage /* | 4377 DEFVAR_INT ("gc-cons-percentage", &gc_cons_percentage /* |
4370 *Percentage of memory allocated between garbage collections. | 4378 *Percentage of memory allocated between garbage collections. |