Mercurial > hg > xemacs-beta
annotate src/extents-impl.h @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 79c6ff3eef26 |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 872 | 1 /* Copyright (c) 1994, 1995 Free Software Foundation. |
| 2 Copyright (c) 1995, 1996, 2002 Ben Wing. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #ifndef INCLUDED_extents_impl_h_ | |
| 24 #define INCLUDED_extents_impl_h_ | |
| 25 | |
| 26 #include "extents.h" | |
| 27 | |
| 28 struct extent | |
| 29 { | |
| 30 struct lrecord_header lheader; | |
| 31 | |
| 32 Memxpos start; | |
| 33 Memxpos end; | |
| 34 Lisp_Object object; /* A buffer, string, Qnil (extent detached from no | |
| 35 buffer), Qt (destroyed extent) */ | |
| 36 | |
| 37 /* Extent properties are conceptually a plist, but the most common | |
| 38 props are implemented as bits instead of conses. */ | |
| 39 struct | |
| 40 { | |
| 41 Lisp_Object face; | |
| 42 | |
| 43 /* These flags are simply an optimization for common boolean properties | |
| 44 which go onto the extent's property list. Any of them would work if | |
| 45 done in the normal way, but the space savings of doing these in this | |
| 46 way is significant. Note that if you add a flag, there are numerous | |
| 47 places in extents.c that need to know about it. | |
| 48 | |
| 49 Another consideration is that some of these properties are accessed | |
| 50 during redisplay, so it's good for access to them to be fast (a bit | |
| 51 reference instead of a search down a plist). | |
| 52 | |
| 53 `begin_glyph_layout' and `end_glyph_layout' are unusual in that | |
| 54 they have 4 states instead of 2. | |
| 55 | |
| 56 Other special extent properties are stored in an auxiliary | |
| 57 structure that sits at the beginning of the plist. The has_aux | |
| 58 flag indicates whether this structure exists. The has_parent | |
| 59 flag is an optimization indicating whether the extent has a parent | |
| 60 (this could also be determined by looking in the aux structure). */ | |
| 61 | |
| 62 enum_field (glyph_layout) begin_glyph_layout :2; | |
| 63 /* 2 text, margins, or whitespace */ | |
| 64 enum_field (glyph_layout) end_glyph_layout :2; | |
| 65 /* 4 text, margins, or whitespace */ | |
| 66 unsigned int has_parent :1; /* 5 extent has a parent */ | |
| 67 unsigned int has_aux :1; /* 6 extent has an aux. structure */ | |
| 68 unsigned int start_open :1; /* 7 insertion behavior at start */ | |
| 69 unsigned int end_open :1; /* 8 insertion behavior at end */ | |
| 70 unsigned int unique :1; /* 9 there may be only one attached */ | |
| 71 unsigned int duplicable :1; /* 10 copied to strings by kill/undo */ | |
| 72 unsigned int detachable :1; /* 11 extent detaches if text deleted */ | |
| 73 unsigned int internal :1; /* 12 used by map-extents etc. */ | |
| 74 unsigned int in_red_event :1; /* 13 An event has been spawned for | |
| 75 initial redisplay. | |
| 76 (not exported to lisp) */ | |
| 77 unsigned int unused16 :1; /* 16 unused bits */ | |
| 78 /* --- Adding more flags will cause the extent struct to grow by another | |
| 79 word. It's not clear that this would make a difference, however, | |
| 80 because on 32-bit machines things tend to get allocated in chunks | |
| 81 of 4 bytes. */ | |
| 82 } flags; | |
| 83 /* The plist may have an auxiliary structure as its first element */ | |
| 84 Lisp_Object plist; | |
| 85 }; | |
| 86 | |
| 87 /* Basic properties of an extent (not affected by the extent's parent) */ | |
| 88 #define extent_object(e) ((e)->object) | |
| 89 #define extent_start(e) ((e)->start + 0) | |
| 90 #define extent_end(e) ((e)->end + 0) | |
| 91 #define set_extent_start(e, val) ((void) ((e)->start = (val))) | |
| 92 #define set_extent_end(e, val) ((void) ((e)->end = (val))) | |
| 93 #define extent_endpoint(e, endp) ((endp) ? extent_end (e) : extent_start (e)) | |
| 94 #define set_extent_endpoint(e, val, endp) \ | |
| 95 ((endp) ? set_extent_end (e, val) : set_extent_start (e, val)) | |
| 96 #define extent_detached_p(e) (extent_start (e) < 0) | |
| 97 | |
| 98 /* Additional information that may be present in an extent. The idea is | |
| 99 that fast access is provided to this information, but since (hopefully) | |
| 100 most extents won't have this set on them, we usually don't need to | |
| 101 have this structure around and thus the size of an extent is smaller. */ | |
| 102 | |
| 103 typedef struct extent_auxiliary extent_auxiliary; | |
| 104 struct extent_auxiliary | |
| 105 { | |
| 2720 | 106 #ifdef MC_ALLOC |
| 107 struct lrecord_header header; | |
| 108 #else /* MC_ALLOC */ | |
| 872 | 109 struct lcrecord_header header; |
| 2720 | 110 #endif /* MC_ALLOC */ |
| 872 | 111 |
| 112 Lisp_Object begin_glyph; | |
| 113 Lisp_Object end_glyph; | |
| 114 Lisp_Object parent; | |
| 115 /* We use a weak list here. Originally I didn't do this and | |
| 116 depended on having the extent's finalization method remove | |
| 117 itself from its parent's children list. This runs into | |
| 118 lots and lots of problems though because everything is in | |
| 119 a really really bizarre state when an extent's finalization | |
| 120 method is called (it happens in sweep_extents() by way of | |
| 121 ADDITIONAL_FREE_extent()) and it's extremely difficult to | |
| 122 avoid getting hosed by just-freed objects. */ | |
| 123 Lisp_Object children; | |
| 124 Lisp_Object invisible; | |
| 125 Lisp_Object read_only; | |
| 126 Lisp_Object mouse_face; | |
| 127 Lisp_Object initial_redisplay_function; | |
| 128 Lisp_Object before_change_functions, after_change_functions; | |
| 129 int priority; | |
| 130 }; | |
| 131 | |
| 132 extern struct extent_auxiliary extent_auxiliary_defaults; | |
| 133 | |
| 134 struct extent_info | |
| 135 { | |
| 2720 | 136 #ifdef MC_ALLOC |
| 137 struct lrecord_header header; | |
| 138 #else /* MC_ALLOC */ | |
| 872 | 139 struct lcrecord_header header; |
| 2720 | 140 #endif /* MC_ALLOC */ |
| 872 | 141 |
| 142 struct extent_list *extents; | |
| 143 struct stack_of_extents *soe; | |
| 144 }; | |
| 145 | |
| 146 /* A "normal" field is one that is stored in the `struct flags' structure | |
| 147 in an extent. an "aux" field is one that is stored in the extent's | |
| 148 auxiliary structure. | |
| 149 | |
| 150 The functions below that have `extent_no_chase' in their name operate | |
| 151 on an extent directly (ignoring its parent), and should normally | |
| 152 only be used on extents known not to have a parent. The other | |
| 153 versions chase down any parent links. */ | |
| 154 | |
| 155 #define extent_no_chase_normal_field(e, field) ((e)->flags.field) | |
| 156 | |
| 157 DECLARE_INLINE_HEADER ( | |
| 158 struct extent_auxiliary * | |
| 159 extent_aux_or_default (EXTENT e) | |
| 160 ) | |
| 161 { | |
| 162 return e->flags.has_aux ? | |
| 163 XEXTENT_AUXILIARY (XCAR (e->plist)) : | |
| 164 & extent_auxiliary_defaults; | |
| 165 } | |
| 166 | |
| 167 #define extent_no_chase_aux_field(e, field) (extent_aux_or_default(e)->field) | |
| 168 | |
| 169 #define extent_normal_field(e, field) \ | |
| 170 extent_no_chase_normal_field (extent_ancestor (e), field) | |
| 171 | |
| 172 #define extent_aux_field(e, field) \ | |
| 173 extent_no_chase_aux_field (extent_ancestor (e), field) | |
| 174 | |
| 175 #define set_extent_no_chase_aux_field(e, field, value) do { \ | |
| 176 EXTENT sencaf_e = (e); \ | |
| 177 if (! sencaf_e->flags.has_aux) \ | |
| 178 allocate_extent_auxiliary (sencaf_e); \ | |
| 179 XEXTENT_AUXILIARY (XCAR (sencaf_e->plist))->field = (value);\ | |
| 180 } while (0) | |
| 181 | |
| 182 #define set_extent_no_chase_normal_field(e, field, value) \ | |
| 183 extent_no_chase_normal_field (e, field) = (value) | |
| 184 | |
| 185 #define set_extent_aux_field(e, field, value) \ | |
| 186 set_extent_no_chase_aux_field (extent_ancestor (e), field, value) | |
| 187 | |
| 188 #define set_extent_normal_field(e, field, value) \ | |
| 189 set_extent_no_chase_normal_field (extent_ancestor (e), field, value) | |
| 190 | |
| 191 /* The `parent' and `children' fields are not affected by any | |
| 192 parent links. We don't provide any settors for these fields | |
| 193 because they need special handling and it's cleaner just to | |
| 194 do this in the particular functions that need to do this. */ | |
| 195 | |
| 196 #define extent_parent(e) extent_no_chase_aux_field (e, parent) | |
| 197 #define extent_children(e) extent_no_chase_aux_field (e, children) | |
| 198 | |
| 199 EXTENT extent_ancestor_1 (EXTENT e); | |
| 200 | |
| 201 /* extent_ancestor() chases all the parent links until there aren't any | |
| 202 more. extent_ancestor_1() does the same thing but it a function; | |
| 203 the following optimizes the most common case. */ | |
| 204 DECLARE_INLINE_HEADER ( | |
| 205 EXTENT | |
| 206 extent_ancestor (EXTENT e) | |
| 207 ) | |
| 208 { | |
| 209 return e->flags.has_parent ? extent_ancestor_1 (e) : e; | |
| 210 } | |
| 211 | |
| 212 #define extent_begin_glyph(e) extent_aux_field (e, begin_glyph) | |
| 213 #define extent_end_glyph(e) extent_aux_field (e, end_glyph) | |
| 214 #define extent_priority(e) extent_aux_field (e, priority) | |
| 215 #define extent_invisible(e) extent_aux_field (e, invisible) | |
| 216 #define extent_read_only(e) extent_aux_field (e, read_only) | |
| 217 #define extent_mouse_face(e) extent_aux_field (e, mouse_face) | |
| 218 #define extent_initial_redisplay_function(e) extent_aux_field (e, initial_redisplay_function) | |
| 219 #define extent_before_change_functions(e) extent_aux_field (e, before_change_functions) | |
| 220 #define extent_after_change_functions(e) extent_aux_field (e, after_change_functions) | |
| 221 | |
| 222 #define set_extent_begin_glyph(e, value) \ | |
| 223 set_extent_aux_field (e, begin_glyph, value) | |
| 224 #define set_extent_end_glyph(e, value) \ | |
| 225 set_extent_aux_field (e, end_glyph, value) | |
| 226 #define set_extent_priority(e, value) \ | |
| 227 set_extent_aux_field (e, priority, value) | |
| 228 #define set_extent_invisible_1(e, value) \ | |
| 229 set_extent_aux_field (e, invisible, value) | |
| 230 #define set_extent_read_only(e, value) \ | |
| 231 set_extent_aux_field (e, read_only, value) | |
| 232 #define set_extent_mouse_face(e, value) \ | |
| 233 set_extent_aux_field (e, mouse_face, value) | |
| 234 /* Use Fset_extent_initial_redisplay_function unless you know what you're doing */ | |
| 235 #define set_extent_initial_redisplay_function(e, value) \ | |
| 236 set_extent_aux_field (e, initial_redisplay_function, value) | |
| 237 #define set_extent_before_change_functions(e, value) \ | |
| 238 set_extent_aux_field (e, before_change_functions, value) | |
| 239 #define set_extent_after_change_functions(e, value) \ | |
| 240 set_extent_aux_field (e, after_change_functions, value) | |
| 241 | |
| 242 #define extent_face(e) extent_normal_field (e, face) | |
| 243 #define extent_begin_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, begin_glyph_layout)) | |
| 244 #define extent_end_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, end_glyph_layout)) | |
| 245 #define extent_start_open_p(e) extent_normal_field (e, start_open) | |
| 246 #define extent_end_open_p(e) extent_normal_field (e, end_open) | |
| 247 #define extent_unique_p(e) extent_normal_field (e, unique) | |
| 248 #define extent_duplicable_p(e) extent_normal_field (e, duplicable) | |
| 249 #define extent_detachable_p(e) extent_normal_field (e, detachable) | |
| 250 #define extent_internal_p(e) extent_normal_field (e, internal) | |
| 251 #define extent_in_red_event_p(e) extent_normal_field (e, in_red_event) | |
| 252 | |
| 253 #define set_extent_face(e, val) \ | |
| 254 set_extent_normal_field (e, face, val) | |
| 255 #define set_extent_begin_glyph_layout(e, val) \ | |
| 256 set_extent_normal_field (e, begin_glyph_layout, val) | |
| 257 #define set_extent_end_glyph_layout(e, val) \ | |
| 258 set_extent_normal_field (e, end_glyph_layout, val) | |
| 259 #define set_extent_start_open_p(e, val) \ | |
| 260 set_extent_normal_field (e, start_open, val) | |
| 261 #define set_extent_end_open_p(e, val) \ | |
| 262 set_extent_normal_field (e, end_open, val) | |
| 263 #define set_extent_unique_p(e, val) \ | |
| 264 set_extent_normal_field (e, unique, val) | |
| 265 #define set_extent_duplicable_p(e, val) \ | |
| 266 set_extent_normal_field (e, duplicable, val) | |
| 267 #define set_extent_detachable_p(e, val) \ | |
| 268 set_extent_normal_field (e, detachable, val) | |
| 269 #define set_extent_internal_p(e, val) \ | |
| 270 set_extent_normal_field (e, internal, val) | |
| 271 #define set_extent_in_red_event_p(e, val) \ | |
| 272 set_extent_normal_field (e, in_red_event, val) | |
| 273 | |
| 274 DECLARE_INLINE_HEADER ( | |
| 275 Lisp_Object * | |
| 276 extent_no_chase_plist_addr (EXTENT e) | |
| 277 ) | |
| 278 { | |
| 279 return e->flags.has_aux ? &XCDR (e->plist) : &e->plist; | |
| 280 } | |
| 281 | |
| 282 #define extent_no_chase_plist(e) (*extent_no_chase_plist_addr (e)) | |
| 283 | |
| 284 #define extent_plist_addr(e) extent_no_chase_plist_addr (extent_ancestor (e)) | |
| 285 #define extent_plist_slot(e) extent_no_chase_plist (extent_ancestor (e)) | |
| 286 | |
| 287 | |
| 288 #define EXTENT_LIVE_P(e) (!EQ (extent_object (e), Qt)) | |
| 289 | |
| 290 #define CHECK_LIVE_EXTENT(x) do { \ | |
| 291 CHECK_EXTENT (x); \ | |
| 292 if (!EXTENT_LIVE_P (XEXTENT (x))) \ | |
| 293 dead_wrong_type_argument (Qextent_live_p, (x)); \ | |
| 294 } while (0) | |
| 295 #define CONCHECK_LIVE_EXTENT(x) do { \ | |
| 296 CONCHECK_EXTENT (x); \ | |
| 297 if (!EXTENT_LIVE_P (XEXTENT (x))) \ | |
| 298 x = wrong_type_argument (Qextent_live_p, (x)); \ | |
| 299 } while (0) | |
| 300 | |
| 301 #endif /* INCLUDED_extents_impl_h_ */ |