Mercurial > hg > xemacs-beta
diff src/extents.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 | f965e31a35f0 |
| children | b0ab9aa48977 |
line wrap: on
line diff
--- a/src/extents.c Mon Mar 15 16:15:12 2010 -0500 +++ b/src/extents.c Mon Mar 15 16:35:38 2010 -0500 @@ -506,6 +506,8 @@ changes */ int in_modeline_generation; +int debug_soe; + /************************************************************************/ /* Generalized gap array */ @@ -1529,24 +1531,7 @@ return info->soe; } -/* #### don't even think of #define'ing this, the prototype of - print_extent_1 has changed! */ -/* #define SOE_DEBUG */ - -#ifdef SOE_DEBUG - -static void print_extent_1 (char *buf, Lisp_Object extent); - -static void -print_extent_2 (EXTENT e) -{ - Lisp_Object extent; - char buf[200]; - - extent = wrap_extent (e); - print_extent_1 (buf, extent); - fputs (buf, stdout); -} +#ifdef DEBUG_XEMACS static void soe_dump (Lisp_Object obj) @@ -1558,29 +1543,29 @@ if (!soe) { - printf ("No SOE"); + stderr_out ("No SOE"); return; } sel = soe->extents; - printf ("SOE pos is %d (memxpos %d)\n", - soe->pos < 0 ? soe->pos : - buffer_or_string_memxpos_to_bytexpos (obj, soe->pos), - soe->pos); + stderr_out ("SOE pos is %ld (memxpos %ld)\n", + soe->pos < 0 ? soe->pos : + buffer_or_string_memxpos_to_bytexpos (obj, soe->pos), + soe->pos); for (endp = 0; endp < 2; endp++) { - printf (endp ? "SOE end:" : "SOE start:"); + stderr_out (endp ? "SOE end:" : "SOE start:"); for (i = 0; i < extent_list_num_els (sel); i++) { EXTENT e = extent_list_at (sel, i, endp); - putchar ('\t'); - print_extent_2 (e); + stderr_out ("\t"); + debug_print (wrap_extent (e)); } - putchar ('\n'); - } - putchar ('\n'); -} - -#endif + stderr_out ("\n"); + } + stderr_out ("\n"); +} + +#endif /* DEBUG_XEMACS */ /* Insert EXTENT into OBJ's stack of extents, if necessary. */ @@ -1589,23 +1574,30 @@ { Stack_Of_Extents *soe = buffer_or_string_stack_of_extents (obj); -#ifdef SOE_DEBUG - printf ("Inserting into SOE: "); - print_extent_2 (extent); - putchar ('\n'); +#ifdef DEBUG_XEMACS + if (debug_soe) + { + stderr_out ("Inserting into SOE: "); + debug_print (wrap_extent (extent)); + stderr_out ("\n"); + } #endif if (!soe || soe->pos < extent_start (extent) || soe->pos > extent_end (extent)) { -#ifdef SOE_DEBUG - printf ("(not needed)\n\n"); +#ifdef DEBUG_XEMACS + if (debug_soe) + stderr_out ("(not needed)\n\n"); #endif return; } extent_list_insert (soe->extents, extent); -#ifdef SOE_DEBUG - puts ("SOE afterwards is:"); - soe_dump (obj); +#ifdef DEBUG_XEMACS + if (debug_soe) + { + stderr_out ("SOE afterwards is:\n"); + soe_dump (obj); + } #endif } @@ -1616,23 +1608,30 @@ { Stack_Of_Extents *soe = buffer_or_string_stack_of_extents (obj); -#ifdef SOE_DEBUG - printf ("Deleting from SOE: "); - print_extent_2 (extent); - putchar ('\n'); +#ifdef DEBUG_XEMACS + if (debug_soe) + { + stderr_out ("Deleting from SOE: "); + debug_print (wrap_extent (extent)); + stderr_out ("\n"); + } #endif if (!soe || soe->pos < extent_start (extent) || soe->pos > extent_end (extent)) { -#ifdef SOE_DEBUG - puts ("(not needed)\n"); +#ifdef DEBUG_XEMACS + if (debug_soe) + stderr_out ("(not needed)\n\n"); #endif return; } extent_list_delete (soe->extents, extent); -#ifdef SOE_DEBUG - puts ("SOE afterwards is:"); - soe_dump (obj); +#ifdef DEBUG_XEMACS + if (debug_soe) + { + stderr_out ("SOE afterwards is:\n"); + soe_dump (obj); + } #endif } @@ -1652,11 +1651,12 @@ assert (bel); #endif -#ifdef SOE_DEBUG - printf ("Moving SOE from %d (memxpos %d) to %d (memxpos %d)\n", - soe->pos < 0 ? soe->pos : - buffer_or_string_memxpos_to_bytexpos (obj, soe->pos), soe->pos, - buffer_or_string_memxpos_to_bytexpos (obj, pos), pos); +#ifdef DEBUG_XEMACS + if (debug_soe) + stderr_out ("Moving SOE from %ld (memxpos %ld) to %ld (memxpos %ld)\n", + soe->pos < 0 ? soe->pos : + buffer_or_string_memxpos_to_bytexpos (obj, soe->pos), soe->pos, + buffer_or_string_memxpos_to_bytexpos (obj, pos), pos); #endif if (soe->pos < pos) { @@ -1670,8 +1670,9 @@ } else { -#ifdef SOE_DEBUG - puts ("(not needed)\n"); +#ifdef DEBUG_XEMACS + if (debug_soe) + stderr_out ("(not needed)\n\n"); #endif return; } @@ -1756,9 +1757,12 @@ } soe->pos = pos; -#ifdef SOE_DEBUG - puts ("SOE afterwards is:"); - soe_dump (obj); +#ifdef DEBUG_XEMACS + if (debug_soe) + { + stderr_out ("SOE afterwards is:\n"); + soe_dump (obj); + } #endif } @@ -3200,10 +3204,10 @@ Lisp_Object function = extent_initial_redisplay_function (e); Lisp_Object obj; - /* printf ("initial redisplay function called!\n "); */ - - /* print_extent_2 (e); - printf ("\n"); */ + /* stderr_out ("initial redisplay function called!\n "); */ + + /* debug_print (wrap_extent (e)); + stderr_out ("\n"); */ /* FIXME: One should probably inhibit the displaying of this extent to reduce flicker */ @@ -3288,8 +3292,6 @@ if (NILP (v)) continue; write_fmt_string_lisp (printcharfun, "%S ", 1, XCAR (tail)); } - - write_fmt_string (printcharfun, "0x%lx", (long) ext); } static void @@ -3333,10 +3335,11 @@ if (print_readably) { if (!EXTENT_LIVE_P (XEXTENT (obj))) - printing_unreadable_object_fmt ("#<destroyed extent>"); + printing_unreadable_object_fmt ("#<destroyed extent 0x%x>", + LISP_OBJECT_UID (obj)); else - printing_unreadable_object_fmt ("#<extent 0x%lx>", - (long) XEXTENT (obj)); + printing_unreadable_object_fmt ("#<extent 0x%x>", + LISP_OBJECT_UID (obj)); } if (!EXTENT_LIVE_P (XEXTENT (obj))) @@ -3346,17 +3349,19 @@ write_ascstring (printcharfun, "#<extent "); print_extent_1 (obj, printcharfun, escapeflag); write_ascstring (printcharfun, extent_detached_p (XEXTENT (obj)) - ? " from " : " in "); + ? "from " : "in "); write_fmt_string (printcharfun, "%s%s%s", title, name, posttitle); } } else { if (print_readably) - printing_unreadable_object_fmt ("#<extent>"); + printing_unreadable_object_fmt ("#<extent 0x%x>", + LISP_OBJECT_UID (obj)); write_ascstring (printcharfun, "#<extent"); } - write_ascstring (printcharfun, ">"); + + write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); } static int @@ -7560,6 +7565,15 @@ void vars_of_extents (void) { +#ifdef DEBUG_XEMACS + DEFVAR_BOOL ("debug-soe", &debug_soe /* +If non-nil, display debugging information about the SOE ("stack of extents"). +The SOE is a cache of extents overlapping a specified region, used to +speed up `map-extents' and certain other functions. +*/ ); + debug_soe = 0; +#endif /* DEBUG_XEMACS */ + DEFVAR_INT ("mouse-highlight-priority", &mouse_highlight_priority /* The priority to use for the mouse-highlighting pseudo-extent that is used to highlight extents with the `mouse-face' attribute set.