Mercurial > hg > xemacs-beta
view src/console-stream.c @ 5146:88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-15 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (c_readonly):
* alloc.c (deadbeef_memory):
* alloc.c (make_compiled_function):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (noseeum_make_marker):
* alloc.c (ADDITIONAL_FREE_string):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* casetab.c:
* casetab.c (print_case_table):
* console.c:
* console.c (print_console):
* database.c (print_database):
* database.c (finalize_database):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (print_devmode):
* device-msw.c (finalize_devmode):
* device.c:
* device.c (print_device):
* elhash.c:
* elhash.c (print_hash_table):
* eval.c (print_multiple_value):
* eval.c (mark_multiple_value):
* events.c (deinitialize_event):
* events.c (print_event):
* events.c (event_equal):
* extents.c:
* extents.c (soe_dump):
* extents.c (soe_insert):
* extents.c (soe_delete):
* extents.c (soe_move):
* extents.c (extent_fragment_update):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* frame.c:
* frame.c (print_frame):
* free-hook.c:
* free-hook.c (check_free):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c:
* gui.c (copy_gui_item):
* hash.c:
* hash.c (NULL_ENTRY):
* hash.c (KEYS_DIFFER_P):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lrecord.h:
* lrecord.h (LISP_OBJECT_UID):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lstream.c (print_lstream):
* lstream.c (finalize_lstream):
* marker.c (print_marker):
* marker.c (marker_equal):
* mc-alloc.c (visit_all_used_page_headers):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* opaque.c (print_opaque):
* opaque.c (print_opaque_ptr):
* opaque.c (equal_opaque_ptr):
* print.c (internal_object_printer):
* print.c (enum printing_badness):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c:
* symbols.c (print_symbol_value_magic):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* window.c (print_window):
* window.c (debug_print_window):
(1) Make lrecord UID's have a separate UID space for each object.
Otherwise, with 20-bit UID's, we rapidly wrap around, especially
when common objects like conses and strings increment the UID value
for every object created. (Originally I tried making two UID spaces,
one for objects that always print readably and hence don't display
the UID, and one for other objects. But certain objects like markers
for which a UID is displayed are still generated rapidly enough that
UID overflow is a serious issue.) This also has the advantage of
making UID values smaller, hence easier to remember -- their main
purpose is to make it easier to keep track of different objects of
the same type when debugging code. Make sure we dump lrecord UID's
so that we don't have problems with pdumped and non-dumped objects
having the same UID.
(2) Display UID's consistently whenever an object (a) doesn't
consistently print readably (objects like cons and string, which
always print readably, can't display a UID), and (b) doesn't
otherwise have a unique property that makes objects of a
particular type distinguishable. (E.g. buffers didn't and still
don't print an ID, but the buffer name uniquely identifies the
buffer.) Some types, such as event, extent, compiled-function,
didn't always (or didn't ever) display an ID; others (such as
marker, extent, lstream, opaque, opaque-ptr, any object using
internal_object_printer()) used to display the actual machine
pointer instead.
(3) Rename NORMAL_LISP_OBJECT_UID to LISP_OBJECT_UID; make it work
over all Lisp objects and take a Lisp object, not a struct pointer.
(4) Some misc cleanups in alloc.c, elhash.c.
(5) Change code in events.c that "deinitializes" an event so that
it doesn't increment the event UID counter in the process. Also
use deadbeef_memory() to overwrite memory instead of doing the same
with custom code. In the process, make deadbeef_memory() in
alloc.c always available, and delete extraneous copy in mc-alloc.c.
Also capitalize all uses of 0xDEADBEEF. Similarly in elhash.c
call deadbeef_memory().
(6) Resurrect "debug SOE" code in extents.c. Make it conditional
on DEBUG_XEMACS and on a `debug-soe' variable, rather than on
SOE_DEBUG. Make it output to stderr, not stdout.
(7) Delete some custom print methods that were identical to
external_object_printer().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Mar 2010 16:35:38 -0500 |
parents | 7be849cb8828 |
children | 308d34e9f07d |
line wrap: on
line source
/* Stream device functions. Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 1996, 2001, 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file has been Mule-ized. */ /* Written by Ben Wing. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "events.h" #include "frame-impl.h" #include "redisplay.h" #include "sysdep.h" #include "window.h" #include "console-stream-impl.h" #include "console-tty.h" #include "sysfile.h" DEFINE_CONSOLE_TYPE (stream); Lisp_Object Vterminal_console; Lisp_Object Vterminal_device; Lisp_Object Vterminal_frame; Lisp_Object Vstdio_str; static const struct memory_description stream_console_data_description_1 [] = { { XD_LISP_OBJECT, offsetof (struct stream_console, instream) }, { XD_END } }; #ifdef NEW_GC DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("stream-console", stream_console, 0, stream_console_data_description_1, Lisp_Stream_Console); #else /* not NEW_GC */ const struct sized_memory_description stream_console_data_description = { sizeof (struct stream_console), stream_console_data_description_1 }; #endif /* not NEW_GC */ static void stream_init_console (struct console *con, Lisp_Object UNUSED (params)) { Lisp_Object tty = CONSOLE_CONNECTION (con); struct stream_console *stream_con; #ifdef NEW_GC if (CONSOLE_STREAM_DATA (con) == NULL) CONSOLE_STREAM_DATA (con) = XSTREAM_CONSOLE (ALLOC_NORMAL_LISP_OBJECT (stream_console)); #else /* not NEW_GC */ if (CONSOLE_STREAM_DATA (con) == NULL) CONSOLE_STREAM_DATA (con) = xnew_and_zero (struct stream_console); #endif /* not NEW_GC */ stream_con = CONSOLE_STREAM_DATA (con); stream_con->instream = Qnil; /* Open the specified console */ if (NILP (tty) || internal_equal (tty, Vstdio_str, 0)) { stream_con->in = stdin; stream_con->out = stdout; stream_con->err = stderr; } else { CHECK_STRING (tty); stream_con->in = stream_con->out = stream_con->err = /* #### We don't currently do coding-system translation on this descriptor. */ qxe_fopen (XSTRING_DATA (tty), READ_PLUS_TEXT); if (!stream_con->in) signal_error (Qio_error, "Unable to open tty", tty); } } static void stream_init_device (struct device *d, Lisp_Object UNUSED (params)) { struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); DEVICE_INFD (d) = fileno (CONSOLE_STREAM_DATA (con)->in); DEVICE_OUTFD (d) = fileno (CONSOLE_STREAM_DATA (con)->out); init_baud_rate (d); init_one_device (d); } static int stream_initially_selected_for_input (struct console *UNUSED (con)) { return noninteractive && initialized; } extern int stdout_needs_newline; static void stream_delete_console (struct console *con) { struct stream_console *stream_con = CONSOLE_STREAM_DATA (con); if (stream_con) { if (/* stream_con->needs_newline */ stdout_needs_newline) /* #### clean this up */ { fputc ('\n', stream_con->out); fflush (stream_con->out); } if (stream_con->in != stdin) retry_fclose (stream_con->in); #ifndef NEW_GC xfree (stream_con); #endif /* not NEW_GC */ CONSOLE_STREAM_DATA (con) = NULL; } } Lisp_Object stream_semi_canonicalize_console_connection (Lisp_Object connection, Error_Behavior UNUSED (errb)) { return NILP (connection) ? Vstdio_str : connection; } Lisp_Object stream_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { if (NILP (connection) || internal_equal (connection, Vstdio_str, 0)) return Vstdio_str; if (!ERRB_EQ (errb, ERROR_ME)) { if (!STRINGP (connection)) return Qunbound; } else CHECK_STRING (connection); return Ffile_truename (connection, Qnil); } Lisp_Object stream_semi_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object stream_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); } static void stream_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), int frame_name_is_defaulted) { #if 0 struct device *d = XDEVICE (FRAME_DEVICE (f)); if (!NILP (DEVICE_FRAME_LIST (d))) invalid_operation ("Only one frame allowed on stream devices", Qunbound); #endif if (frame_name_is_defaulted) f->name = build_ascstring ("stream"); f->height = 80; f->width = 24; f->visible = 0; /* so redisplay doesn't try to do anything */ } static int stream_text_width (struct window *UNUSED (w), struct face_cachel *UNUSED (cachel), const Ichar *UNUSED (str), Charcount len) { return len; } static int stream_left_margin_width (struct window *UNUSED (w)) { return 0; } static int stream_right_margin_width (struct window *UNUSED (w)) { return 0; } static int stream_divider_height (void) { return 1; } static int stream_eol_cursor_width (void) { return 1; } /* We used to try and check for redisplaying on stream devices (e.g. in redisplay_device(), and beg out if so. However, we didn't always manage completely. Now we do manage completely, and to verify this we abort if we try to display a stream device. This might fix some crashes I've been getting in pdump -- the only difference between crash and non-crash is a few changes to the redisplay critical-section handling. */ static void stream_window_output_begin (struct window *UNUSED (w)) { ABORT (); } static void stream_window_output_end (struct window *UNUSED (w)) { ABORT (); } static void stream_frame_output_begin (struct frame *UNUSED (f)) { ABORT (); } static void stream_frame_output_end (struct frame *UNUSED (f)) { ABORT (); } static void stream_output_display_block (struct window *UNUSED (w), struct display_line *UNUSED (dl), int UNUSED (block), int UNUSED (start), int UNUSED (end), int UNUSED (start_pixpos), int UNUSED (cursor_start), int UNUSED (cursor_width), int UNUSED (cursor_height)) { ABORT (); } static void stream_clear_region (Lisp_Object UNUSED (window), struct device* UNUSED (d), struct frame *UNUSED (f), face_index UNUSED (findex), int UNUSED (x), int UNUSED (y), int UNUSED (width), int UNUSED (height), Lisp_Object UNUSED (fcolor), Lisp_Object UNUSED (bcolor), Lisp_Object UNUSED (background_pixmap), Lisp_Object UNUSED (background_placement)) { ABORT (); } static int stream_flash (struct device *UNUSED (d)) { return 0; /* sorry can't do it */ } static void stream_ring_bell (struct device *d, int UNUSED (volume), int UNUSED (pitch), int UNUSED (duration)) { struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); /* Don't output ^G when not a TTY -- in particular, under MS Windows, ^G is interpreted as bell by the console, but not when running under VC++. Probably this would be the same under Unix. */ if (isatty (fileno (CONSOLE_STREAM_DATA (c)->out))) { fputc (07, CONSOLE_STREAM_DATA (c)->out); fflush (CONSOLE_STREAM_DATA (c)->out); } } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_stream (void) { INITIALIZE_CONSOLE_TYPE (stream, "stream", "console-stream-p"); /* console methods */ CONSOLE_HAS_METHOD (stream, init_console); CONSOLE_HAS_METHOD (stream, initially_selected_for_input); CONSOLE_HAS_METHOD (stream, delete_console); CONSOLE_HAS_METHOD (stream, canonicalize_console_connection); CONSOLE_HAS_METHOD (stream, canonicalize_device_connection); CONSOLE_HAS_METHOD (stream, semi_canonicalize_console_connection); CONSOLE_HAS_METHOD (stream, semi_canonicalize_device_connection); /* device methods */ CONSOLE_HAS_METHOD (stream, init_device); /* frame methods */ CONSOLE_HAS_METHOD (stream, init_frame_1); /* redisplay methods */ CONSOLE_HAS_METHOD (stream, text_width); CONSOLE_HAS_METHOD (stream, left_margin_width); CONSOLE_HAS_METHOD (stream, right_margin_width); CONSOLE_HAS_METHOD (stream, divider_height); CONSOLE_HAS_METHOD (stream, eol_cursor_width); CONSOLE_HAS_METHOD (stream, window_output_begin); CONSOLE_HAS_METHOD (stream, window_output_end); CONSOLE_HAS_METHOD (stream, frame_output_begin); CONSOLE_HAS_METHOD (stream, frame_output_end); CONSOLE_HAS_METHOD (stream, output_display_block); CONSOLE_HAS_METHOD (stream, clear_region); CONSOLE_HAS_METHOD (stream, flash); CONSOLE_HAS_METHOD (stream, ring_bell); } void reinit_console_type_create_stream (void) { REINITIALIZE_CONSOLE_TYPE (stream); } void vars_of_console_stream (void) { DEFVAR_LISP ("terminal-console", &Vterminal_console /* The initial console object, which represents XEmacs' stdout. */ ); Vterminal_console = Qnil; DEFVAR_LISP ("terminal-device", &Vterminal_device /* The initial device object, which represents XEmacs' stdout. */ ); Vterminal_device = Qnil; DEFVAR_LISP ("terminal-frame", &Vterminal_frame /* The initial frame object, which represents XEmacs' stdout. */ ); Vterminal_frame = Qnil; /* Moved from console-tty.c */ Vstdio_str = build_ascstring ("stdio"); staticpro (&Vstdio_str); } #ifndef PDUMP void init_console_stream (int UNUSED (reinit)) { /* This function can GC */ if (!initialized) { Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); Vterminal_console = Fdevice_console (Vterminal_device); Vterminal_frame = Fmake_frame (Qnil, Vterminal_device); minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window; } else { /* Re-initialize the FILE fields of the console. */ stream_init_console (XCONSOLE (Vterminal_console), Qnil); if (noninteractive) event_stream_select_console (XCONSOLE (Vterminal_console)); } } #else void init_console_stream (int reinit) { /* This function can GC */ if (!reinit) { Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); Vterminal_console = Fdevice_console (Vterminal_device); Vterminal_frame = Fmake_frame (Qnil, Vterminal_device); minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window; } if (initialized) { stream_init_console (XCONSOLE (Vterminal_console), Qnil); if (noninteractive) event_stream_select_console (XCONSOLE (Vterminal_console)); } } #endif