comparison src/console.c @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents 190b164ddcac
children af2db7d310f2
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
102 { 102 {
103 struct console *con = XCONSOLE (obj); 103 struct console *con = XCONSOLE (obj);
104 104
105 #define MARKED_SLOT(x) mark_object (con->x) 105 #define MARKED_SLOT(x) mark_object (con->x)
106 #include "conslots.h" 106 #include "conslots.h"
107 #undef MARKED_SLOT
108 107
109 /* Can be zero for Vconsole_defaults, Vconsole_local_symbols */ 108 /* Can be zero for Vconsole_defaults, Vconsole_local_symbols */
110 if (con->conmeths) 109 if (con->conmeths)
111 { 110 {
112 mark_object (con->conmeths->symbol); 111 mark_object (con->conmeths->symbol);
576 static Lisp_Object 575 static Lisp_Object
577 find_nonminibuffer_frame_not_on_console (Lisp_Object console) 576 find_nonminibuffer_frame_not_on_console (Lisp_Object console)
578 { 577 {
579 return find_some_frame (find_nonminibuffer_frame_not_on_console_predicate, 578 return find_some_frame (find_nonminibuffer_frame_not_on_console_predicate,
580 LISP_TO_VOID (console)); 579 LISP_TO_VOID (console));
580 }
581
582 static void
583 nuke_all_console_slots (struct console *con, Lisp_Object zap)
584 {
585 zero_lcrecord (con);
586
587 #define MARKED_SLOT(x) con->x = zap
588 #include "conslots.h"
581 } 589 }
582 590
583 /* Delete console CON. 591 /* Delete console CON.
584 592
585 If FORCE is non-zero, allow deletion of the only frame. 593 If FORCE is non-zero, allow deletion of the only frame.
717 event_stream_unselect_console (con); 725 event_stream_unselect_console (con);
718 726
719 MAYBE_CONMETH (con, delete_console, (con)); 727 MAYBE_CONMETH (con, delete_console, (con));
720 728
721 Vconsole_list = delq_no_quit (console, Vconsole_list); 729 Vconsole_list = delq_no_quit (console, Vconsole_list);
730
722 RESET_CHANGED_SET_FLAGS; 731 RESET_CHANGED_SET_FLAGS;
732
733 /* Nobody should be accessing anything in this object any more, and
734 making all Lisp_Objects Qnil allows for better GC'ing in case a
735 pointer to the dead console continues to hang around. Zero all
736 other structs in case someone tries to access something through
737 them. */
738 nuke_all_console_slots (con, Qnil);
723 con->conmeths = dead_console_methods; 739 con->conmeths = dead_console_methods;
724 740
725 UNGCPRO; 741 UNGCPRO;
726 } 742 }
727 743
1201 #ifdef HAVE_WINDOW_SYSTEM 1217 #ifdef HAVE_WINDOW_SYSTEM
1202 Fprovide (intern ("window-system")); 1218 Fprovide (intern ("window-system"));
1203 #endif 1219 #endif
1204 } 1220 }
1205 1221
1206 /* The docstrings for DEFVAR_* are recorded externally by make-docfile. */ 1222 /* The docstrings for DEFVAR_* are recorded externally by make-docfile. */ \
1207 #define DEFVAR_CONSOLE_LOCAL_1(lname, field_name, forward_type, magicfun) do { \ 1223 #define DEFVAR_CONSOLE_LOCAL_1(lname, field_name, forward_type, magicfun) \
1208 static const struct symbol_value_forward I_hate_C = \ 1224 do { \
1209 { /* struct symbol_value_forward */ \ 1225 static const struct symbol_value_forward I_hate_C = \
1210 { /* struct symbol_value_magic */ \ 1226 { /* struct symbol_value_forward */ \
1211 { /* struct lcrecord_header */ \ 1227 { /* struct symbol_value_magic */ \
1212 { /* struct lrecord_header */ \ 1228 { /* struct lcrecord_header */ \
1213 lrecord_type_symbol_value_forward, /* lrecord_type_index */ \ 1229 { /* struct lrecord_header */ \
1214 1, /* mark bit */ \ 1230 lrecord_type_symbol_value_forward, /* lrecord_type_index */ \
1215 1, /* c_readonly bit */ \ 1231 1, /* mark bit */ \
1216 1 /* lisp_readonly bit */ \ 1232 1, /* c_readonly bit */ \
1217 }, \ 1233 1 /* lisp_readonly bit */ \
1218 0, /* next */ \ 1234 }, \
1219 0, /* uid */ \ 1235 0, /* next */ \
1220 0 /* free */ \ 1236 0, /* uid */ \
1221 }, \ 1237 0 /* free */ \
1222 &(console_local_flags.field_name), \ 1238 }, \
1223 forward_type \ 1239 &(console_local_flags.field_name), \
1224 }, \ 1240 forward_type \
1225 magicfun \ 1241 }, \
1226 }; \ 1242 magicfun \
1227 \ 1243 }; \
1228 { \ 1244 \
1229 int offset = ((char *)symbol_value_forward_forward (&I_hate_C) \ 1245 { \
1230 - (char *)&console_local_flags); \ 1246 int offset = ((char *)symbol_value_forward_forward (&I_hate_C) \
1231 \ 1247 - (char *)&console_local_flags); \
1232 defvar_magic (lname, &I_hate_C); \ 1248 \
1233 \ 1249 defvar_magic (lname, &I_hate_C); \
1234 *((Lisp_Object *)(offset + (char *)XCONSOLE (Vconsole_local_symbols))) \ 1250 \
1235 = intern (lname); \ 1251 *((Lisp_Object *)(offset + (char *)XCONSOLE (Vconsole_local_symbols))) \
1236 } \ 1252 = intern (lname); \
1253 } \
1237 } while (0) 1254 } while (0)
1238 1255
1239 #define DEFVAR_CONSOLE_LOCAL_MAGIC(lname, field_name, magicfun) \ 1256 #define DEFVAR_CONSOLE_LOCAL_MAGIC(lname, field_name, magicfun) \
1240 DEFVAR_CONSOLE_LOCAL_1 (lname, field_name, \ 1257 DEFVAR_CONSOLE_LOCAL_1 (lname, field_name, \
1241 SYMVAL_SELECTED_CONSOLE_FORWARD, magicfun) 1258 SYMVAL_SELECTED_CONSOLE_FORWARD, magicfun)
1250 #define DEFVAR_CONSOLE_DEFAULTS_MAGIC(lname, field_name, magicfun) \ 1267 #define DEFVAR_CONSOLE_DEFAULTS_MAGIC(lname, field_name, magicfun) \
1251 DEFVAR_SYMVAL_FWD(lname, &(console_local_flags.field_name), \ 1268 DEFVAR_SYMVAL_FWD(lname, &(console_local_flags.field_name), \
1252 SYMVAL_DEFAULT_CONSOLE_FORWARD, magicfun) 1269 SYMVAL_DEFAULT_CONSOLE_FORWARD, magicfun)
1253 #define DEFVAR_CONSOLE_DEFAULTS(lname, field_name) \ 1270 #define DEFVAR_CONSOLE_DEFAULTS(lname, field_name) \
1254 DEFVAR_CONSOLE_DEFAULTS_MAGIC (lname, field_name, 0) 1271 DEFVAR_CONSOLE_DEFAULTS_MAGIC (lname, field_name, 0)
1255
1256 static void
1257 nuke_all_console_slots (struct console *con, Lisp_Object zap)
1258 {
1259 zero_lcrecord (con);
1260
1261 #define MARKED_SLOT(x) con->x = zap
1262 #include "conslots.h"
1263 #undef MARKED_SLOT
1264 }
1265 1272
1266 static void 1273 static void
1267 common_init_complex_vars_of_console (void) 1274 common_init_complex_vars_of_console (void)
1268 { 1275 {
1269 /* Make sure all markable slots in console_defaults 1276 /* Make sure all markable slots in console_defaults
1465 if ((XINT (console_local_flags.slot) != -2 && \ 1472 if ((XINT (console_local_flags.slot) != -2 && \
1466 XINT (console_local_flags.slot) != -3) \ 1473 XINT (console_local_flags.slot) != -3) \
1467 != !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \ 1474 != !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \
1468 abort () 1475 abort ()
1469 #include "conslots.h" 1476 #include "conslots.h"
1470 #undef MARKED_SLOT 1477 }
1471 }