Mercurial > hg > xemacs-beta
diff src/alloc.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 | 641d0cdd1d00 1fae11d56ad2 |
line wrap: on
line diff
--- a/src/alloc.c Mon Mar 15 16:15:12 2010 -0500 +++ b/src/alloc.c Mon Mar 15 16:35:38 2010 -0500 @@ -102,6 +102,36 @@ Bytecount __temp_alloca_size__; Bytecount funcall_alloca_count; +/* All the built-in lisp object types are enumerated in `enum lrecord_type'. + Additional ones may be defined by a module (none yet). We leave some + room in `lrecord_implementations_table' for such new lisp object types. */ +const struct lrecord_implementation *lrecord_implementations_table[(int)lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT]; +int lrecord_type_count = lrecord_type_last_built_in_type; + +/* This is just for use by the printer, to allow things to print uniquely. + We have a separate UID space for each object. (Important because the + UID is only 20 bits in old-GC, and 22 in NEW_GC.) */ +int lrecord_uid_counter[countof (lrecord_implementations_table)]; + +/* Non-zero means we're in the process of doing the dump */ +int purify_flag; + +/* Non-zero means we're pdumping out or in */ +#ifdef PDUMP +int in_pdump; +#endif + +#ifdef ERROR_CHECK_TYPES + +Error_Behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN, ERROR_ME_DEBUG_WARN; + +#endif + +/* Very cheesy ways of figuring out how much memory is being used for + data. #### Need better (system-dependent) ways. */ +void *minimum_address_seen; +void *maximum_address_seen; + /* Determine now whether we need to garbage collect or not, to make Ffuncall() faster */ #define INCREMENT_CONS_COUNTER_1(size) \ @@ -172,28 +202,6 @@ } while (0) #endif /*not NEW_GC */ -/* This is just for use by the printer, to allow things to print uniquely */ -int lrecord_uid_counter; - -/* Non-zero means we're in the process of doing the dump */ -int purify_flag; - -/* Non-zero means we're pdumping out or in */ -#ifdef PDUMP -int in_pdump; -#endif - -#ifdef ERROR_CHECK_TYPES - -Error_Behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN, ERROR_ME_DEBUG_WARN; - -#endif - -/* Very cheesy ways of figuring out how much memory is being used for - data. #### Need better (system-dependent) ways. */ -void *minimum_address_seen; -void *maximum_address_seen; - #ifndef NEW_GC int c_readonly (Lisp_Object obj) @@ -436,10 +444,7 @@ MALLOC_END (); } -#ifdef ERROR_CHECK_GC - -#ifndef NEW_GC -static void +void deadbeef_memory (void *ptr, Bytecount size) { UINT_32_BIT *ptr4 = (UINT_32_BIT *) ptr; @@ -449,14 +454,6 @@ while (beefs--) (*ptr4++) = 0xDEADBEEF; /* -559038737 base 10 */ } -#endif /* not NEW_GC */ - -#else /* !ERROR_CHECK_GC */ - - -#define deadbeef_memory(ptr, size) - -#endif /* !ERROR_CHECK_GC */ #undef xstrdup char * @@ -1953,7 +1950,7 @@ Lisp_Compiled_Function *f; ALLOC_FROB_BLOCK_LISP_OBJECT (compiled_function, Lisp_Compiled_Function, - f, &lrecord_compiled_function); + f, &lrecord_compiled_function); f->stack_depth = 0; f->specpdl_depth = 0; @@ -2170,7 +2167,8 @@ { Lisp_Button_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (button_data, Lisp_Button_Data, d, &lrecord_button_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (button_data, Lisp_Button_Data, d, + &lrecord_button_data); zero_nonsized_lisp_object (wrap_button_data (d)); return wrap_button_data (d); } @@ -2183,7 +2181,8 @@ { Lisp_Motion_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (motion_data, Lisp_Motion_Data, d, &lrecord_motion_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (motion_data, Lisp_Motion_Data, d, + &lrecord_motion_data); zero_nonsized_lisp_object (wrap_motion_data (d)); return wrap_motion_data (d); @@ -2197,7 +2196,8 @@ { Lisp_Process_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (process_data, Lisp_Process_Data, d, &lrecord_process_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (process_data, Lisp_Process_Data, d, + &lrecord_process_data); zero_nonsized_lisp_object (wrap_process_data (d)); d->process = Qnil; @@ -2212,7 +2212,8 @@ { Lisp_Timeout_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (timeout_data, Lisp_Timeout_Data, d, &lrecord_timeout_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (timeout_data, Lisp_Timeout_Data, d, + &lrecord_timeout_data); zero_nonsized_lisp_object (wrap_timeout_data (d)); d->function = Qnil; d->object = Qnil; @@ -2228,7 +2229,8 @@ { Lisp_Magic_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (magic_data, Lisp_Magic_Data, d, &lrecord_magic_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (magic_data, Lisp_Magic_Data, d, + &lrecord_magic_data); zero_nonsized_lisp_object (wrap_magic_data (d)); return wrap_magic_data (d); @@ -2242,7 +2244,8 @@ { Lisp_Magic_Eval_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (magic_eval_data, Lisp_Magic_Eval_Data, d, &lrecord_magic_eval_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (magic_eval_data, Lisp_Magic_Eval_Data, d, + &lrecord_magic_eval_data); zero_nonsized_lisp_object (wrap_magic_eval_data (d)); d->object = Qnil; @@ -2257,7 +2260,8 @@ { Lisp_Eval_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (eval_data, Lisp_Eval_Data, d, &lrecord_eval_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (eval_data, Lisp_Eval_Data, d, + &lrecord_eval_data); zero_nonsized_lisp_object (wrap_eval_data (d)); d->function = Qnil; d->object = Qnil; @@ -2273,7 +2277,8 @@ { Lisp_Misc_User_Data *d; - ALLOC_FROB_BLOCK_LISP_OBJECT (misc_user_data, Lisp_Misc_User_Data, d, &lrecord_misc_user_data); + ALLOC_FROB_BLOCK_LISP_OBJECT (misc_user_data, Lisp_Misc_User_Data, d, + &lrecord_misc_user_data); zero_nonsized_lisp_object (wrap_misc_user_data (d)); d->function = Qnil; d->object = Qnil; @@ -2312,7 +2317,7 @@ Lisp_Marker *p; NOSEEUM_ALLOC_FROB_BLOCK_LISP_OBJECT (marker, Lisp_Marker, p, - &lrecord_marker); + &lrecord_marker); p->buffer = 0; p->membpos = 0; marker_next (p) = 0; @@ -3356,11 +3361,6 @@ /* Garbage Collection */ /************************************************************************/ -/* All the built-in lisp object types are enumerated in `enum lrecord_type'. - Additional ones may be defined by a module (none yet). We leave some - room in `lrecord_implementations_table' for such new lisp object types. */ -const struct lrecord_implementation *lrecord_implementations_table[(int)lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT]; -int lrecord_type_count = lrecord_type_last_built_in_type; #ifndef USE_KKCC /* Object marker functions are in the lrecord_implementation structure. But copying them to a parallel array is much more cache-friendly. @@ -4391,7 +4391,7 @@ #define ADDITIONAL_FREE_string(ptr) do { \ Bytecount size = ptr->size_; \ if (BIG_STRING_SIZE_P (size)) \ - xfree (ptr->data_); \ + xfree (ptr->data_); \ } while (0) SWEEP_FIXED_TYPE_BLOCK_1 (string, Lisp_String, u.lheader); @@ -5117,7 +5117,6 @@ funcall_allocation_flag = 0; funcall_alloca_count = 0; - lrecord_uid_counter = 259; #ifndef NEW_GC debug_string_purity = 0; #endif /* not NEW_GC */ @@ -5185,6 +5184,8 @@ lrecord_implementations_table[i] = 0; } + dump_add_opaque (lrecord_uid_counter, sizeof (lrecord_uid_counter)); + INIT_LISP_OBJECT (cons); INIT_LISP_OBJECT (vector); INIT_LISP_OBJECT (string);