Mercurial > hg > xemacs-beta
diff src/mc-alloc.c @ 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 | |
| children | c474585a3460 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mc-alloc.c Fri Apr 08 23:11:35 2005 +0000 @@ -0,0 +1,1826 @@ +/* New size-based allocator for XEmacs. + Copyright (C) 2005 Marcus Crestani. + +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. */ + +#include <config.h> +#include "lisp.h" +#include "mc-alloc.h" + + +/*--- configurable values ----------------------------------------------*/ + +/* Valid page sizes are powers of 2. */ +#undef PAGE_SIZE /* for FreeBSD */ +#define PAGE_SIZE 2048 + + +/* Definition of size classes */ + +/* Heap used list constants: In the used heap, it is important to + quickly find a free spot for a new object. Therefore the size + classes of the used heap are defined by the size of the cells on + the pages. The size classes should match common object sizes, to + avoid wasting memory. */ + +/* Minimum object size in bytes. */ +#define USED_LIST_MIN_OBJECT_SIZE 8 + +/* The step size by which the size classes increase (up to upper + threshold). This many bytes are mapped to a single used list: */ +#define USED_LIST_LIN_STEP 4 + +/* The upper threshold should always be set to PAGE_SIZE/2, because if + a object is larger than PAGE_SIZE/2 there is no room for any other + object on this page. Objects this big are kept in the page list of + the multiple pages, since a quick search for free spots is not + needed for this kind of pages (because there are no free spots). + PAGE_SIZES_DIV_2 defines maximum size of a used space list. */ +#define USED_LIST_UPPER_THRESHOLD PAGE_SIZE_DIV_2 + + +/* Unmanaged memory used list constants: Like in the used heap, it is + important to quickly find a free spot for a new object. Therefore + the size classes of the unmanaged heap are defined by the size of + the cells on the pages. The size classes should match common object + sizes, to avoid wasting memory. */ +/* Minimum object size in bytes. */ +#define UNMANAGED_LIST_MIN_OBJECT_SIZE 8 +/* The step size by which the size classes increase (up to upper + threshold). This many bytes are mapped to a single unmanaged list: */ +#define UNMANAGED_LIST_LIN_STEP 4 +/* The upper threshold should always be set to PAGE_SIZE/2, because if + a object is larger than PAGE_SIZE/2 there is no room for any other + object on this page. Objects this big are kept in the page list of + the multiple pages, since a quick search for free spots is not + needed for this kind of pages (because there are no free spots). + PAGE_SIZES defines maximum size of a unmanaged space list. */ +#define UNMANAGED_LIST_UPPER_THRESHOLD PAGE_SIZE_DIV_2 + + +/* Heap free list constants: In the unused heap, the size of + consecutive memory tips the scales. A page is smallest entity which + is asked for. Therefore, the size classes of the unused heap are + defined by the number of consecutive pages. */ +/* Sizes up to this many pages each have their own free list. */ +#define FREE_LIST_LOWER_THRESHOLD 32 +/* The step size by which the size classes increase (up to upper + threshold). FREE_LIST_LIN_STEP number of sizes are mapped to a + single free list for sizes between FREE_LIST_LOWER_THRESHOLD and + FREE_LIST_UPPER_THRESHOLD. */ +#define FREE_LIST_LIN_STEP 8 +/* Sizes of at least this many pages are mapped to a single free + list. Blocks of memory larger than this number are all kept in a + single list, which makes searching this list slow. But objects that + big are really seldom. */ +#define FREE_LIST_UPPER_THRESHOLD 256 + + +/* Maximum number of separately added heap sections. */ +#if BITS_PER_EMACS_INT > 32 +# define MAX_HEAP_SECTS 2048 +#else +# define MAX_HEAP_SECTS 768 +#endif + + +/* Heap growth constants. Heap increases by any number between the + boundaries (unit is PAGE_SIZE). */ +#define MIN_HEAP_INCREASE 32 +#define MAX_HEAP_INCREASE 256 /* not used */ + +/* Every heap growth is calculated like this: + needed_pages + ( HEAP_SIZE / ( PAGE_SIZE * HEAP_GROWTH_DIVISOR )). + So the growth of the heap is influenced by the current size of the + heap, but kept between MIN_HEAP_INCREASE and MAX_HEAP_INCREASE + boundaries. + This reduces the number of heap sectors, the larger the heap grows + the larger are the newly allocated chunks. */ +#define HEAP_GROWTH_DIVISOR 3 + + +/* Zero memory before putting on free lists. */ +#define ZERO_MEM 1 + + + + +/*--- calculations done by macros --------------------------------------*/ + +#ifndef CHAR_BIT /* should be included by limits.h */ +# define CHAR_BIT BITS_PER_CHAR +#endif + +#if PAGE_SIZE == 512 +# define CPP_LOG_PAGE_SIZE 9 +#endif +#if PAGE_SIZE == 1024 +# define CPP_LOG_PAGE_SIZE 10 +#endif +#if PAGE_SIZE == 2048 +# define CPP_LOG_PAGE_SIZE 11 +#endif +#if PAGE_SIZE == 4096 +# define CPP_LOG_PAGE_SIZE 12 +#endif +#if PAGE_SIZE == 8192 +# define CPP_LOG_PAGE_SIZE 13 +#endif +#if PAGE_SIZE == 16384 +# define CPP_LOG_PAGE_SIZE 14 +#endif +#ifndef CPP_LOG_PAGE_SIZE +--> fix PAGE_SIZE +#endif +#undef PAGE_SIZE +#define CPP_PAGE_SIZE (1 << CPP_LOG_PAGE_SIZE) +#define LOG_PAGE_SIZE ((EMACS_INT) CPP_LOG_PAGE_SIZE) +#define PAGE_SIZE ((EMACS_INT) CPP_PAGE_SIZE) +#define PAGE_SIZE_DIV_2 (PAGE_SIZE >> 1) + + +/* NOT USED ANYMORE */ +#ifdef USE_EXPONENTIAL_USED_LIST_GROWTH +/* used heap list logarithms */ +#if USED_LIST_LOWER_THRESHOLD == 8 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 3 +#endif +#if USED_LIST_LOWER_THRESHOLD == 16 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 4 +#endif +#if USED_LIST_LOWER_THRESHOLD == 32 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 5 +#endif +#if USED_LIST_LOWER_THRESHOLD == 64 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 6 +#endif +#if USED_LIST_LOWER_THRESHOLD == 128 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 7 +#endif +#if USED_LIST_LOWER_THRESHOLD == 256 +# define CPP_LOG_USED_LIST_LOWER_THRESHOLD 8 +#endif +#ifndef CPP_LOG_USED_LIST_LOWER_THRESHOLD +--> fix USED_LIST_LOWER_THRESHOLD +#endif +#define LOG_USED_LIST_LOWER_THRESHOLD CPP_LOG_USED_LIST_LOWER_THRESHOLD +#endif /* USE_EXPONENTIAL_USED_LIST_GROWTH */ + +/* used heap list count */ +#define N_USED_PAGE_LISTS (((USED_LIST_UPPER_THRESHOLD \ + - USED_LIST_MIN_OBJECT_SIZE) \ + / USED_LIST_LIN_STEP) + 1 ) + 1 + +/* unmanaged memory list count */ +#define N_UNMANAGED_PAGE_LISTS (((UNMANAGED_LIST_UPPER_THRESHOLD \ + - UNMANAGED_LIST_MIN_OBJECT_SIZE) \ + / UNMANAGED_LIST_LIN_STEP) + 1 ) + 1 + +/* NOT USED ANYMORE */ +#ifdef USE_EXPONENTIAL_USED_LIST_GROWTH +#define N_USED_PAGE_LISTS_LIN (((USED_LIST_LOWER_THRESHOLD \ + - USED_LIST_MIN_OBJECT_SIZE) \ + / USED_LIST_LIN_STEP) + 1 ) +#define N_USED_PAGE_LISTS_EXP \ + (LOG_PAGE_SIZE - LOG_USED_LIST_LOWER_THRESHOLD) + +#define N_USED_PAGE_LISTS \ + (N_USED_PAGE_LISTS_LIN + N_USED_PAGE_LISTS_EXP + 1) +#endif /* USE_EXPONENTIAL_USED_LIST_GROWTH */ + +/* free heap list count */ +#define N_FREE_PAGE_LISTS (((FREE_LIST_UPPER_THRESHOLD \ + - FREE_LIST_LOWER_THRESHOLD) \ + / FREE_LIST_LIN_STEP) \ + + FREE_LIST_LOWER_THRESHOLD) + + +/* Constants for heap address to page header mapping. */ +#define LOG_LEVEL2_SIZE 10 +#define LEVEL2_SIZE (1 << LOG_LEVEL2_SIZE) +#if BITS_PER_EMACS_INT > 32 +# define USE_HASH_TABLE 1 +# define LOG_LEVEL1_SIZE 11 +#else +# define LOG_LEVEL1_SIZE \ + (BITS_PER_EMACS_INT - LOG_LEVEL2_SIZE - LOG_PAGE_SIZE) +#endif +#define LEVEL1_SIZE (1 << LOG_LEVEL1_SIZE) + +#ifdef USE_HASH_TABLE +# define HASH(hi) ((hi) & (LEVEL1_SIZE - 1)) +# define L1_INDEX(p) HASH ((EMACS_INT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) +#else +# define L1_INDEX(p) ((EMACS_INT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) +#endif +#define L2_INDEX(p) (((EMACS_INT) p >> LOG_PAGE_SIZE) & (LEVEL2_SIZE - 1)) + + + + +/*--- structs and typedefs ---------------------------------------------*/ + +/* Links the free lists (mark_bit_free_list, page_header_free_list, + cell free list). */ +typedef struct free_link +{ + struct lrecord_header lheader; + struct free_link *next_free; +} free_link; + + +/* Header for pages. They are hold in a doubly linked list. */ +typedef struct page_header +{ + struct page_header *next; /* next page_header */ + struct page_header *prev; /* previous page_header */ + /* Field plh holds pointer to the according header of the page list.*/ + struct page_list_header *plh; /* page list header */ + free_link *free_list; /* links free cells on page */ + EMACS_INT n_pages; /* number of pages */ + EMACS_INT cell_size; /* size of cells on page */ + EMACS_INT cells_on_page; /* total number of cells on page */ + EMACS_INT cells_used; /* number of used cells on page */ + /* If the number of objects on page is bigger than BITS_PER_EMACS_INT, + the mark bits are put in an extra memory area. Then the field + mark_bits holds the pointer to this area. Is the number of + objects smaller than BITS_PER_EMACS_INT, the mark bits are held in the + mark_bit EMACS_INT directly, without an additional indirection. */ + char *mark_bits; /* pointer to mark bits */ + void *heap_space; /* pointer to heap, where objects + are stored */ +} page_header; + + +/* Different list types. */ +enum list_type_enum { + USED_LIST, + UNMANAGED_LIST, + FREE_LIST +}; + + +/* Header for page lists. Field list_type holds the type of the list. */ +typedef struct page_list_header +{ + enum list_type_enum list_type; /* the type of the list */ + /* Size holds the size of one cell (in bytes) in a used heap list, or the + size of the heap sector (in number of pages). */ + size_t size; /* size of one cell / heap sector */ + page_header *first; /* first of page_header list */ + page_header *last; /* last of page_header list */ + /* If the number of objects on page is bigger than + BITS_PER_EMACS_INT, the mark bits are put in an extra memory + area, which is linked in this free list, if not used. Is the + number of objects smaller than BITS_PER_EMACS_INT, the mark bits + are hold in the mark bit EMACS_INT directly, without an + additional indirection. */ + free_link *mark_bit_free_list; + +#ifdef MEMORY_USAGE_STATS + EMACS_INT page_count; /* number if pages in list */ + EMACS_INT used_cells; /* number of objects in list */ + EMACS_INT used_space; /* used space */ + EMACS_INT total_cells; /* number of available cells */ + EMACS_INT total_space; /* available space */ +#endif +} page_list_header; + + +/* The heap sectors are stored with their real start pointer and their + real size. Not aligned to PAGE_SIZE. Needed for freeing heap sectors. */ +typedef struct heap_sect { + void *real_start; /* real start pointer (NOT aligned) */ + size_t real_size; /* NOT multiple of PAGE_SIZE */ + void *start; /* aligned start pointer */ + EMACS_INT n_pages; /* multiple of PAGE_SIZE */ +} heap_sect; + + +/* 2nd tree level for mapping of heap addresses to page headers. */ +typedef struct level_2_lookup_tree { + page_header *index[LEVEL2_SIZE]; /* link to page header */ + EMACS_INT key; /* high order address bits */ +#ifdef USE_HASH_TABLE + struct level_2_lookup_tree *hash_link; /* hash chain link */ +#endif +} level_2_lookup_tree; + + + +/*--- global variable definitions --------------------------------------*/ + +/* All global allocator variables are kept in this struct. */ +typedef struct mc_allocator_globals_type { + + /* heap size */ + EMACS_INT heap_size; + + /* list of all separatly allocated chunks of heap */ + heap_sect heap_sections[MAX_HEAP_SECTS]; + EMACS_INT n_heap_sections; + + /* Holds all allocated pages, each object size class in its separate list, + to guarantee fast allocation on partially filled pages. */ + page_list_header used_heap_pages[N_USED_PAGE_LISTS]; + + /* Holds all unmanaged pages. */ + page_list_header unmanaged_heap_pages[N_UNMANAGED_PAGE_LISTS]; + + /* Holds all free pages in the heap. N multiples of PAGE_SIZE are + kept on the Nth free list. Contiguos pages are coalesced. */ + page_list_header free_heap_pages[N_FREE_PAGE_LISTS]; + + /* ptr lookup table */ + level_2_lookup_tree *ptr_lookup_table[LEVEL1_SIZE]; + + /* page header free list */ + free_link *page_header_free_list; + +#ifdef MEMORY_USAGE_STATS + EMACS_INT malloced_bytes; +#endif +} mc_allocator_globals_type; + +mc_allocator_globals_type mc_allocator_globals; + + + + +/*--- macro accessors --------------------------------------------------*/ + +#define USED_HEAP_PAGES(i) \ + ((page_list_header*) &mc_allocator_globals.used_heap_pages[i]) + +#define UNMANAGED_HEAP_PAGES(i) \ + ((page_list_header*) &mc_allocator_globals.unmanaged_heap_pages[i]) + +#define FREE_HEAP_PAGES(i) \ + ((page_list_header*) &mc_allocator_globals.free_heap_pages[i]) + +#define PLH(plh) plh +# define PLH_LIST_TYPE(plh) PLH (plh)->list_type +# define PLH_SIZE(plh) PLH (plh)->size +# define PLH_FIRST(plh) PLH (plh)->first +# define PLH_LAST(plh) PLH (plh)->last +# define PLH_MARK_BIT_FREE_LIST(plh) PLH (plh)->mark_bit_free_list +#ifdef MEMORY_USAGE_STATS +# define PLH_PAGE_COUNT(plh) PLH (plh)->page_count +# define PLH_USED_CELLS(plh) PLH (plh)->used_cells +# define PLH_USED_SPACE(plh) PLH (plh)->used_space +# define PLH_TOTAL_CELLS(plh) PLH (plh)->total_cells +# define PLH_TOTAL_SPACE(plh) PLH (plh)->total_space +#endif + +#define PH(ph) ph +# define PH_NEXT(ph) PH (ph)->next +# define PH_PREV(ph) PH (ph)->prev +# define PH_PLH(ph) PH (ph)->plh +# define PH_FREE_LIST(ph) PH (ph)->free_list +# define PH_N_PAGES(ph) PH (ph)->n_pages +# define PH_CELL_SIZE(ph) PH (ph)->cell_size +# define PH_CELLS_ON_PAGE(ph) PH (ph)->cells_on_page +# define PH_CELLS_USED(ph) PH (ph)->cells_used +# define PH_MARK_BITS(ph) PH (ph)->mark_bits +# define PH_HEAP_SPACE(ph) PH (ph)->heap_space +#define PH_LIST_TYPE(ph) PLH_LIST_TYPE (PH_PLH (ph)) +#define PH_MARK_BIT_FREE_LIST(ph) PLH_MARK_BIT_FREE_LIST (PH_PLH (ph)) + +#define HEAP_SIZE mc_allocator_globals.heap_size + +#ifdef MEMORY_USAGE_STATS +# define MC_MALLOCED_BYTES mc_allocator_globals.malloced_bytes +#endif + +#define HEAP_SECTION(index) mc_allocator_globals.heap_sections[index] +#define N_HEAP_SECTIONS mc_allocator_globals.n_heap_sections + +#define PAGE_HEADER_FREE_LIST mc_allocator_globals.page_header_free_list + +#define NEXT_FREE(free_list) ((free_link*) free_list)->next_free +#define FREE_LIST(free_list) (free_link*) (free_list) + +#define PTR_LOOKUP_TABLE(i) mc_allocator_globals.ptr_lookup_table[i] +#define LEVEL2(l2, i) l2->index[i] +# define LEVEL2_KEY(l2) l2->key +#ifdef USE_HASH_TABLE +# define LEVEL2_HASH_LINK(l2) l2->hash_link +#endif + +#if ZERO_MEM +# define ZERO_HEAP_SPACE(ph) \ + memset (PH_HEAP_SPACE (ph), '\0', PH_N_PAGES (ph) * PAGE_SIZE) +# define ZERO_PAGE_HEADER(ph) memset (ph, '\0', sizeof (page_header)) +#endif + +#define div_PAGE_SIZE(x) (x >> LOG_PAGE_SIZE) +#define mult_PAGE_SIZE(x) (x << LOG_PAGE_SIZE) + +#define BYTES_TO_PAGES(bytes) (div_PAGE_SIZE ((bytes + (PAGE_SIZE - 1)))) + +#define PAGE_SIZE_ALIGNMENT(address) \ + (void *) ((((EMACS_INT) (address)) + PAGE_SIZE) & ~(PAGE_SIZE - 1)) + +#define PH_ON_FREE_LIST_P(ph) \ + (ph && PH_PLH (ph) && (PLH_LIST_TYPE (PH_PLH (ph)) == FREE_LIST)) + +#define PH_ON_USED_LIST_P(ph) \ + (ph && PH_PLH (ph) && (PLH_LIST_TYPE (PH_PLH (ph)) == USED_LIST)) + +#define PH_ON_UNMANAGED_LIST_P(ph) \ + (ph && PH_PLH (ph) && (PLH_LIST_TYPE (PH_PLH (ph)) == UNMANAGED_LIST)) + + + + +/************************************************************************/ +/* MC Allocator */ +/************************************************************************/ + + +/* ###TODO### */ +#if 1 +# define ALLOC_MB_UNMANAGED 1 +#endif + + +/*--- misc functions ---------------------------------------------------*/ + +/* moved here from alloc.c */ +#ifdef ERROR_CHECK_GC +static void +deadbeef_memory (void *ptr, Bytecount size) +{ + UINT_32_BIT *ptr4 = (UINT_32_BIT *) ptr; + Bytecount beefs = size >> 2; + + /* In practice, size will always be a multiple of four. */ + while (beefs--) + (*ptr4++) = 0xDEADBEEF; /* -559038737 base 10 */ +} +#endif /* ERROR_CHECK_GC */ + +/* Visits all pages (page_headers) hooked into the used heap pages + list and executes f with the current page header as + argument. Needed for sweep. */ +static void +visit_all_used_page_headers (void (*f) (page_header *ph)) +{ + int i; + for (i = 0; i < N_USED_PAGE_LISTS; i++) + if (PLH_FIRST (USED_HEAP_PAGES (i))) + { + page_header *ph = PLH_FIRST (USED_HEAP_PAGES (i)); + while (PH_NEXT (ph)) + { + page_header *next = PH_NEXT (ph); /* in case f removes the page */ + f (ph); + ph = next; + } + f (ph); + } +} + + + + +/*--- mapping of heap addresses to page headers and mark bits ----------*/ + +/* Sets a heap pointer and page header pair into the lookup table. */ +static void +set_lookup_table (void *ptr, page_header *ph) +{ + int l1_index = L1_INDEX (ptr); + level_2_lookup_tree *l2 = PTR_LOOKUP_TABLE (l1_index); +#ifdef USE_HASH_TABLE + while ((l2) && (LEVEL2_KEY (l2) != l1_index)) + l2 = LEVEL2_HASH_LINK (l2); +#endif + if (!l2) + { + l2 = (level_2_lookup_tree*) + xmalloc_and_zero (sizeof (level_2_lookup_tree)); +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES += + malloced_storage_size (0, sizeof (level_2_lookup_tree), 0); +#endif + memset (l2, 0, sizeof (level_2_lookup_tree)); +#ifdef USE_HASH_TABLE + LEVEL2_HASH_LINK (l2) = PTR_LOOKUP_TABLE (l1_index); +#endif + PTR_LOOKUP_TABLE (l1_index) = l2; + LEVEL2_KEY (l2) = l1_index; + } + LEVEL2 (l2, L2_INDEX (ptr)) = ph; +} + + +#ifdef UNSET_LOOKUP_TABLE +/* Set the lookup table to 0 for given heap address. */ +static void +unset_lookup_table (void *ptr) +{ + int l1_index = L1_INDEX (ptr); + level_2_lookup_tree *l2 = PTR_LOOKUP_TABLE (l1_index); +#ifdef USE_HASH_TABLE + while ((l2) && (LEVEL2_KEY (l2) != l1_index)) + l2 = LEVEL2_HASH_LINK (l2); +#endif + if (l2) { + LEVEL2 (l2, L2_INDEX (ptr)) = 0; + } +} +#endif + +/* Returns the page header of a given heap address, or 0 if not in table. + For internal use, no error checking. */ +static page_header * +get_page_header_internal (void *ptr) +{ + int l1_index = L1_INDEX (ptr); + level_2_lookup_tree *l2 = PTR_LOOKUP_TABLE (l1_index); +#ifdef USE_HASH_TABLE + while ((l2) && (LEVEL2_KEY (l2) != l1_index)) + l2 = LEVEL2_HASH_LINK (l2); +#endif + if (!l2) + return 0; + return LEVEL2 (l2, L2_INDEX (ptr)); +} + +/* Returns the page header of a given heap address, or 0 if not in table. */ +static page_header * +get_page_header (void *ptr) +{ + int l1_index = L1_INDEX (ptr); + level_2_lookup_tree *l2 = PTR_LOOKUP_TABLE (l1_index); +#ifdef USE_HASH_TABLE + while ((l2) && (LEVEL2_KEY (l2) != l1_index)) + l2 = LEVEL2_HASH_LINK (l2); +#endif + assert (l2 && LEVEL2 (l2, L2_INDEX (ptr))); + return LEVEL2 (l2, L2_INDEX (ptr)); +} + + +/* Returns the mark bit index of a given heap address. */ +static EMACS_INT +get_mark_bit_index (void *ptr, page_header *ph) +{ + EMACS_INT cell_size = PH_CELL_SIZE (ph); + if (cell_size) + return (((EMACS_INT) ptr - (EMACS_INT)(PH_HEAP_SPACE (ph))) / cell_size); + else /* only one object on page */ + return 0; +} + + +/* Adds addresses of pages to lookup table. */ +static void +add_pages_to_lookup_table (page_header *ph, EMACS_INT n_pages) +{ + char *p = (char*) PH_HEAP_SPACE (ph); + EMACS_INT end_of_section = (EMACS_INT) p + (PAGE_SIZE * n_pages); + for (p = (char*) PH_HEAP_SPACE (ph); + (EMACS_INT) p < end_of_section; p += PAGE_SIZE) + set_lookup_table (p, ph); +} + + +/* Initializes lookup table. */ +static void +init_lookup_table (void) +{ + int i; + for (i = 0; i < LEVEL1_SIZE; i++) + PTR_LOOKUP_TABLE (i) = 0; +} + + + + +/*--- mark bits --------------------------------------------------------*/ + +/* Number of mark bits: minimum 1, maximum 8. */ +#define N_MARK_BITS 1 + +/*--- bit operations --- */ + +/* Allocates a bit array of length bits. */ +static char * +alloc_bit_array(size_t bits) +{ +#ifdef ALLOC_MB_UNMANAGED + size_t size = ((bits + CHAR_BIT - 1) / CHAR_BIT) * sizeof(char); + if (size < sizeof (free_link)) size = sizeof (free_link); + return (char *) mc_alloc_unmanaged (size); +#else /* not ALLOC_MB_UNMANAGED */ + size_t size = ((bits + CHAR_BIT - 1) / CHAR_BIT) * sizeof(char); + char *bit_array; + if (size < sizeof (free_link)) size = sizeof (free_link); + bit_array = (char*) xmalloc_and_zero (size); +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES += malloced_storage_size (0, size, 0); +#endif + return bit_array; +#endif /* not ALLOC_MB_UNMANAGED */ +} + + +/* Returns the bit value at pos. */ +static EMACS_INT +get_bit (char *bit_array, EMACS_INT pos) +{ +#if N_MARK_BITS > 1 + EMACS_INT result = 0; + EMACS_INT i; +#endif + bit_array += pos / CHAR_BIT; +#if N_MARK_BITS > 1 + for (i = 0; i < N_MARK_BITS; i++) + result |= (*bit_array & (1 << ((pos + i) % CHAR_BIT))); + return result >> pos; +#else + return (*bit_array & (1 << (pos % CHAR_BIT))) != 0; +#endif +} + + +/* Bit_Arrays bit at pos to val. */ +static void +set_bit(char *bit_array, EMACS_INT pos, EMACS_INT val) +{ +#if N_MARK_BITS > 1 + EMACS_INT result = 0; + EMACS_INT i; +#endif + bit_array += pos / CHAR_BIT; +#if N_MARK_BITS > 1 + for (i = 0; i < N_MARK_BITS; i++) + if ((val >> i) & 1) + *bit_array |= 1 << ((pos + i) % CHAR_BIT); + else + *bit_array &= ~(1 << ((pos + i) % CHAR_BIT)); +#else + if (val) + *bit_array |= 1 << (pos % CHAR_BIT); + else + *bit_array &= ~(1 << (pos % CHAR_BIT)); +#endif +} + + +/*--- mark bit functions ---*/ +#define USE_PNTR_MARK_BITS(ph) (PH_CELLS_ON_PAGE (ph) > BITS_PER_EMACS_INT) +#define USE_WORD_MARK_BITS(ph) (PH_CELLS_ON_PAGE (ph) <= BITS_PER_EMACS_INT) + +#define GET_BIT_WORD(b, p) get_bit ((char*) &b, p) +#define GET_BIT_PNTR(b, p) get_bit (b, p) + +#define SET_BIT_WORD(b, p, v) set_bit ((char*) &b, p, v) +#define SET_BIT_PNTR(b, p, v) set_bit (b, p, v) + +#define ZERO_MARK_BITS_WORD(ph) PH_MARK_BITS (ph) = 0 +#define ZERO_MARK_BITS_PNTR(ph) \ +do { \ + memset (PH_MARK_BITS (ph), '\0', \ + (PH_CELLS_ON_PAGE (ph) + CHAR_BIT - 1) \ + / CHAR_BIT * sizeof(char)); \ +} while (0) + +#define GET_BIT(bit, ph, p) \ +do { \ + if (USE_PNTR_MARK_BITS (ph)) \ + bit = GET_BIT_PNTR (PH_MARK_BITS (ph), p); \ + else \ + bit = GET_BIT_WORD (PH_MARK_BITS (ph), p); \ +} while (0) + +#define SET_BIT(ph, p, v) \ +do { \ + if (USE_PNTR_MARK_BITS (ph)) \ + SET_BIT_PNTR (PH_MARK_BITS (ph), p, v); \ + else \ + SET_BIT_WORD (PH_MARK_BITS (ph), p, v); \ +} while (0) + +#define ZERO_MARK_BITS(ph) \ +do { \ + if (USE_PNTR_MARK_BITS (ph)) \ + ZERO_MARK_BITS_PNTR (ph); \ + else \ + ZERO_MARK_BITS_WORD (ph); \ +} while (0) + + +/* Allocates mark-bit space either from a free list or from the OS + for the given page header. */ +static char * +alloc_mark_bits (page_header *ph) +{ + char *result; + if (PH_MARK_BIT_FREE_LIST (ph) == 0) + result = (char*) alloc_bit_array (PH_CELLS_ON_PAGE (ph) * N_MARK_BITS); + else + { + result = (char*) PH_MARK_BIT_FREE_LIST (ph); + PH_MARK_BIT_FREE_LIST (ph) = NEXT_FREE (result); + } + return result; +} + + +/* Frees by maintaining a free list. */ +static void +free_mark_bits (page_header *ph) +{ +#ifdef ALLOC_MB_UNMANAGED + if (PH_MARK_BITS (ph)) + mc_free (PH_MARK_BITS (ph)); +#else /* not ALLOC_MB_UNMANAGED */ + if (PH_MARK_BITS (ph)) { + NEXT_FREE (PH_MARK_BITS (ph)) = PH_MARK_BIT_FREE_LIST (ph); + PH_MARK_BIT_FREE_LIST (ph) = FREE_LIST (PH_MARK_BITS (ph)); + } +#endif /* not ALLOC_MB_UNMANAGED */ +} + + +/* Installs mark bits and zeros bits. */ +static void +install_mark_bits (page_header *ph) +{ + if (USE_PNTR_MARK_BITS (ph)) + { + PH_MARK_BITS (ph) = alloc_mark_bits (ph); + ZERO_MARK_BITS_PNTR (ph); + } + else + ZERO_MARK_BITS_WORD (ph); +} + + +/* Cleans and frees the mark bits of the given page_header. */ +static void +remove_mark_bits (page_header *ph) +{ + if (USE_PNTR_MARK_BITS (ph)) + free_mark_bits (ph); +} + + +/* Zeros all mark bits in given header. */ +static void +zero_mark_bits (page_header *ph) +{ + ZERO_MARK_BITS (ph); +} + + +/* Returns mark bit for given heap pointer. */ +EMACS_INT +get_mark_bit (void *ptr) +{ + EMACS_INT bit = 0; + page_header *ph = get_page_header (ptr); + gc_checking_assert (ph && PH_ON_USED_LIST_P (ph)); + if (ph) + { + GET_BIT (bit, ph, get_mark_bit_index (ptr, ph)); + } + return bit; +} + + +/* Sets mark bit for given heap pointer. */ +void +set_mark_bit (void *ptr, EMACS_INT value) +{ + page_header *ph = get_page_header (ptr); + assert (ph && PH_ON_USED_LIST_P (ph)); + if (ph) + { + SET_BIT (ph, get_mark_bit_index (ptr, ph), value); + } +} + + + + +/*--- page header functions --------------------------------------------*/ + +/* Allocates a page header either from a free list or from the OS. */ +static page_header * +alloc_page_header (void) +{ + page_header *result; + if (PAGE_HEADER_FREE_LIST == 0) + { + result = + (page_header *) xmalloc_and_zero ((EMACS_INT) (sizeof (page_header))); +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES += malloced_storage_size (0, sizeof (page_header), 0); +#endif + + } + else + { + result = (page_header*) PAGE_HEADER_FREE_LIST; + PAGE_HEADER_FREE_LIST = NEXT_FREE (result); + } + return result; +} + + +/* Frees given page header by maintaining a free list. */ +static void +free_page_header (page_header *ph) +{ +#if ZERO_MEM + ZERO_PAGE_HEADER (ph); +#endif + NEXT_FREE (ph) = PAGE_HEADER_FREE_LIST; + PAGE_HEADER_FREE_LIST = FREE_LIST (ph); +} + + +/* Adds given page header to given page list header's list. */ +static void +add_page_header_to_plh (page_header *ph, page_list_header *plh) +{ + /* insert at the front of the list */ + PH_PREV (ph) = 0; + PH_NEXT (ph) = PLH_FIRST (plh); + PH_PLH (ph) = plh; + /* if list is not empty, set prev in the first element */ + if (PLH_FIRST (plh)) + PH_PREV (PLH_FIRST (plh)) = ph; + /* one element in list is first and last at the same time */ + PLH_FIRST (plh) = ph; + if (!PLH_LAST (plh)) + PLH_LAST (plh) = ph; + +#ifdef MEMORY_USAGE_STATS + /* bump page count */ + PLH_PAGE_COUNT (plh)++; +#endif + +} + + +/* Removes given page header from given page list header's list. */ +static void +remove_page_header_from_plh (page_header *ph, page_list_header *plh) +{ + if (PLH_FIRST (plh) == ph) + PLH_FIRST (plh) = PH_NEXT (ph); + if (PLH_LAST (plh) == ph) + PLH_LAST (plh) = PH_PREV (ph); + if (PH_NEXT (ph)) + PH_PREV (PH_NEXT (ph)) = PH_PREV (ph); + if (PH_PREV (ph)) + PH_NEXT (PH_PREV (ph)) = PH_NEXT (ph); + +#ifdef MEMORY_USAGE_STATS + /* decrease page count */ + PLH_PAGE_COUNT (plh)--; +#endif +} + + +/* Moves a page header to the front of its the page header list. + This is used during sweep: Pages with some alive objects are moved to + the front. This makes allocation faster, all pages with free slots + can be found at the front of the list. */ +static void +move_page_header_to_front (page_header *ph) +{ + page_list_header *plh = PH_PLH (ph); + /* is page already first? */ + if (ph == PLH_FIRST (plh)) return; + /* remove from list */ + if (PLH_LAST (plh) == ph) + PLH_LAST (plh) = PH_PREV (ph); + if (PH_NEXT (ph)) + PH_PREV (PH_NEXT (ph)) = PH_PREV (ph); + if (PH_PREV (ph)) + PH_NEXT (PH_PREV (ph)) = PH_NEXT (ph); + /* insert at the front */ + PH_NEXT (ph) = PLH_FIRST (plh); + PH_PREV (ph) = 0; + PH_PREV (PH_NEXT (ph)) = ph; + PLH_FIRST (plh) = ph; +} + + + + +/*--- page list functions ----------------------------------------------*/ + +/* Returns the index of the used heap list according to given size. */ +static int +get_used_list_index (size_t size) +{ + if (size <= USED_LIST_MIN_OBJECT_SIZE) + return 0; + if (size <= USED_LIST_UPPER_THRESHOLD) + return ((size - USED_LIST_MIN_OBJECT_SIZE - 1) + / USED_LIST_LIN_STEP) + 1; + return N_USED_PAGE_LISTS - 1; +} + + +/* Returns the size of the used heap list according to given index. */ +static size_t +get_used_list_size_value (int used_index) +{ + if (used_index < N_USED_PAGE_LISTS - 1) + return (used_index * USED_LIST_LIN_STEP) + USED_LIST_MIN_OBJECT_SIZE; + return 0; +} + + +/* Returns the index of the used heap list according to given size. */ +static int +get_unmanaged_list_index (size_t size) +{ + if (size <= UNMANAGED_LIST_MIN_OBJECT_SIZE) + return 0; + if (size <= UNMANAGED_LIST_UPPER_THRESHOLD) + return ((size - UNMANAGED_LIST_MIN_OBJECT_SIZE - 1) + / UNMANAGED_LIST_LIN_STEP) + 1; + return N_UNMANAGED_PAGE_LISTS - 1; +} + + +/* Returns the size of the unmanaged heap list according to given index. */ +static size_t +get_unmanaged_list_size_value (int unmanaged_index) +{ + if (unmanaged_index < N_UNMANAGED_PAGE_LISTS - 1) + return (unmanaged_index * UNMANAGED_LIST_LIN_STEP) + + UNMANAGED_LIST_MIN_OBJECT_SIZE; + return 0; +} + + +/* Returns the index of the free heap list according to given size. */ +static int +get_free_list_index (EMACS_INT n_pages) +{ + if (n_pages == 0) + return 0; + if (n_pages <= FREE_LIST_LOWER_THRESHOLD) + return n_pages - 1; + if (n_pages >= FREE_LIST_UPPER_THRESHOLD - 1) + return N_FREE_PAGE_LISTS - 1; + return ((n_pages - FREE_LIST_LOWER_THRESHOLD - 1) + / FREE_LIST_LIN_STEP) + FREE_LIST_LOWER_THRESHOLD; + +} + + +/* Returns the size in number of pages of the given free list at index. */ +static size_t +get_free_list_size_value (int free_index) +{ + if (free_index < FREE_LIST_LOWER_THRESHOLD) + return free_index + 1; + if (free_index >= N_FREE_PAGE_LISTS) + return FREE_LIST_UPPER_THRESHOLD; + return ((free_index + 1 - FREE_LIST_LOWER_THRESHOLD) + * FREE_LIST_LIN_STEP) + FREE_LIST_LOWER_THRESHOLD; +} + + +#ifdef MEMORY_USAGE_STATS +Bytecount +mc_alloced_storage_size (Bytecount claimed_size, struct overhead_stats *stats) +{ + size_t used_size = + get_used_list_size_value (get_used_list_index (claimed_size)); + if (used_size == 0) + used_size = mult_PAGE_SIZE (BYTES_TO_PAGES (claimed_size)); + + if (stats) + { + stats->was_requested += claimed_size; + stats->malloc_overhead += used_size - claimed_size; + } + + return used_size; +} +#endif /* not MEMORY_USAGE_STATS */ + + + +/*--- free heap functions ----------------------------------------------*/ + +/* Frees a heap section, if the heap_section is completly free */ +static EMACS_INT +free_heap_section (page_header *ph) +{ + int i; + int removed = 0; + for (i = 0; i < N_HEAP_SECTIONS; i++) + if (!removed) + { + if ((PH_HEAP_SPACE (ph) == HEAP_SECTION(i).start) + && (PH_N_PAGES (ph) == HEAP_SECTION(i).n_pages)) + { + xfree_1 (HEAP_SECTION(i).real_start); +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES + -= malloced_storage_size (0, HEAP_SECTION(i).real_size, 0); +#endif + + HEAP_SIZE -= PH_N_PAGES (ph) * PAGE_SIZE; + + removed = 1; + } + } + else + { + HEAP_SECTION(i-1).real_start = HEAP_SECTION(i).real_start; + HEAP_SECTION(i-1).real_size = HEAP_SECTION(i).real_size; + HEAP_SECTION(i-1).start = HEAP_SECTION(i).start; + HEAP_SECTION(i-1).n_pages = HEAP_SECTION(i).n_pages; + } + + N_HEAP_SECTIONS = N_HEAP_SECTIONS - removed; + + return removed; +} + +/* Removes page from free list. */ +static void +remove_page_from_free_list (page_header *ph) +{ + remove_page_header_from_plh (ph, PH_PLH (ph)); + PH_PLH (ph) = 0; +} + + +/* Adds page to according free list. */ +static void +add_page_to_free_list (page_header *ph) +{ + PH_PLH (ph) = FREE_HEAP_PAGES (get_free_list_index (PH_N_PAGES (ph))); + add_page_header_to_plh (ph, PH_PLH (ph)); +} + + +/* Merges two adjacent pages. */ +static page_header * +merge_pages (page_header *first_ph, page_header *second_ph) +{ + /* merge */ + PH_N_PAGES (first_ph) += PH_N_PAGES (second_ph); + /* clean up left over page header */ + free_page_header (second_ph); + /* update lookup table */ + add_pages_to_lookup_table (first_ph, PH_N_PAGES (first_ph)); + + return first_ph; +} + + +/* Checks if pages are adjacent, merges them, and adds merged page to + free list */ +static void +merge_into_free_list (page_header *ph) +{ + /* check if you can coalesce adjacent pages */ + page_header *prev_ph = + get_page_header_internal ((void*) (((EMACS_INT) PH_HEAP_SPACE (ph)) + - PAGE_SIZE)); + page_header *succ_ph = + get_page_header_internal ((void*) (((EMACS_INT) PH_HEAP_SPACE (ph)) + + (PH_N_PAGES (ph) * PAGE_SIZE))); + if (PH_ON_FREE_LIST_P (prev_ph)) + { + remove_page_from_free_list (prev_ph); + ph = merge_pages (prev_ph, ph); + } + if (PH_ON_FREE_LIST_P (succ_ph)) + { + remove_page_from_free_list (succ_ph); + ph = merge_pages (ph, succ_ph); + } + /* try to free heap_section, if the section is complete */ + if (!free_heap_section (ph)) + /* else add merged page to free list */ + add_page_to_free_list (ph); +} + + +/* Cuts given page header after n_pages, returns the first (cut) part, and + puts the rest on the free list. */ +static page_header * +split_page (page_header *ph, EMACS_INT n_pages) +{ + page_header *new_ph; + EMACS_INT rem_pages = PH_N_PAGES (ph) - n_pages; + + /* remove the page from the free list if already hooked in */ + if (PH_PLH (ph)) + remove_page_from_free_list (ph); + /* set new number of pages */ + PH_N_PAGES (ph) = n_pages; + /* add new page to lookup table */ + add_pages_to_lookup_table (ph, n_pages); + + if (rem_pages) + { + /* build new page with reminder */ + new_ph = alloc_page_header (); + PH_N_PAGES (new_ph) = rem_pages; + PH_HEAP_SPACE (new_ph) = + (void*) ((EMACS_INT) (PH_HEAP_SPACE (ph)) + (n_pages * PAGE_SIZE)); + /* add new page to lookup table */ + add_pages_to_lookup_table (new_ph, rem_pages); + /* hook the rest into free list */ + add_page_to_free_list (new_ph); + } + return ph; +} + + +/* Expands the heap by given number of pages. */ +static page_header * +expand_heap (EMACS_INT needed_pages) +{ + page_header *ph; + EMACS_INT n_pages; + size_t real_size; + void *real_start; + + /* determine number of pages the heap should grow */ + n_pages = needed_pages + (HEAP_SIZE / (PAGE_SIZE * HEAP_GROWTH_DIVISOR)); + if (n_pages < MIN_HEAP_INCREASE) + n_pages = MIN_HEAP_INCREASE; + + /* get the real values */ + real_size = (n_pages * PAGE_SIZE) + PAGE_SIZE; + real_start = xmalloc_and_zero (real_size); +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES += malloced_storage_size (0, real_size, 0); +#endif + + /* maintain heap section count */ + if (N_HEAP_SECTIONS >= MAX_HEAP_SECTS) + { + stderr_out ("Increase number of MAX_HEAP_SECTS"); + ABORT (); + } + HEAP_SECTION(N_HEAP_SECTIONS).real_start = real_start; + HEAP_SECTION(N_HEAP_SECTIONS).real_size = real_size; + HEAP_SECTION(N_HEAP_SECTIONS).start = PAGE_SIZE_ALIGNMENT (real_start); + HEAP_SECTION(N_HEAP_SECTIONS).n_pages = n_pages; + N_HEAP_SECTIONS ++; + + /* get page header */ + ph = alloc_page_header (); + + /* setup page header */ + PH_N_PAGES (ph) = n_pages; + PH_HEAP_SPACE (ph) = PAGE_SIZE_ALIGNMENT (real_start); + assert (((EMACS_INT) (PH_HEAP_SPACE (ph)) % PAGE_SIZE) == 0); + HEAP_SIZE += n_pages * PAGE_SIZE; + + /* this was also done by allocate_lisp_storage */ + if (need_to_check_c_alloca) + xemacs_c_alloca (0); + + /* return needed size, put rest on free list */ + return split_page (ph, needed_pages); +} + + + + +/*--- used heap functions ----------------------------------------------*/ +/* Installs initial free list. */ +static void +install_cell_free_list (page_header *ph) +{ + char *p; + int i; + EMACS_INT cell_size = PH_CELL_SIZE (ph); + /* write initial free list if cell_size is < PAGE_SIZE */ + p = (char *) PH_HEAP_SPACE (ph); + for (i = 0; i < PH_CELLS_ON_PAGE (ph) - 1; i++) + { +#ifdef ERROR_CHECK_GC + assert (!LRECORD_FREE_P (p)); + MARK_LRECORD_AS_FREE (p); +#endif + NEXT_FREE (p) = FREE_LIST (p + cell_size); + set_lookup_table (p, ph); + p += cell_size; + } +#ifdef ERROR_CHECK_GC + assert (!LRECORD_FREE_P (p)); + MARK_LRECORD_AS_FREE (p); +#endif + NEXT_FREE (p) = 0; + set_lookup_table (p, ph); + + /* hook free list into header */ + PH_FREE_LIST (ph) = FREE_LIST (PH_HEAP_SPACE (ph)); +} + + +/* Cleans the object space of the given page_header. */ +static void +remove_cell_free_list (page_header *ph) +{ +#if ZERO_MEM + ZERO_HEAP_SPACE (ph); +#endif + PH_FREE_LIST (ph) = 0; +} + + +/* Installs a new page and hooks it into given page_list_header. */ +static page_header * +install_page_in_used_list (page_header *ph, page_list_header *plh, + size_t size, int managed) +{ + /* add to list */ + add_page_header_to_plh (ph, plh); + + /* determine cell size */ + if (PLH_SIZE (plh)) + PH_CELL_SIZE (ph) = PLH_SIZE (plh); + else + PH_CELL_SIZE (ph) = size; + PH_CELLS_ON_PAGE (ph) = (PAGE_SIZE * PH_N_PAGES (ph)) / PH_CELL_SIZE (ph); + + /* init cell count */ + PH_CELLS_USED (ph) = 0; + + /* install mark bits and initialize cell free list */ + if (managed) + install_mark_bits (ph); + + install_cell_free_list (ph); + +#ifdef MEMORY_USAGE_STATS + PLH_TOTAL_CELLS (plh) += PH_CELLS_ON_PAGE (ph); + PLH_TOTAL_SPACE (plh) += PAGE_SIZE * PH_N_PAGES (ph); +#endif + + return ph; +} + + +/* Cleans and frees a page, identified by the given page_header. */ +static void +remove_page_from_used_list (page_header *ph) +{ + page_list_header *plh = PH_PLH (ph); + +#ifdef MEMORY_USAGE_STATS + PLH_TOTAL_CELLS (plh) -= PH_CELLS_ON_PAGE (ph); + PLH_TOTAL_SPACE (plh) -= PAGE_SIZE * PH_N_PAGES (ph); +#endif + + /* clean up mark bits and cell free list */ + remove_cell_free_list (ph); + if (PH_ON_USED_LIST_P (ph)) + remove_mark_bits (ph); + + /* clean up page header */ + PH_CELL_SIZE (ph) = 0; + PH_CELLS_ON_PAGE (ph) = 0; + PH_CELLS_USED (ph) = 0; + + /* remove from used list */ + remove_page_header_from_plh (ph, plh); + + /* move to free list */ + merge_into_free_list (ph); +} + + + + +/*--- allocation -------------------------------------------------------*/ + +/* Allocates from cell free list on already allocated pages. */ +static page_header * +allocate_cell (page_list_header *plh) +{ + page_header *ph = PLH_FIRST (plh); + if (ph) + { + if (PH_FREE_LIST (ph)) + /* elements free on first page */ + return ph; + else if ((PH_NEXT (ph)) + && (PH_FREE_LIST (PH_NEXT (ph)))) + /* elements free on second page */ + { + page_header *temp = PH_NEXT (ph); + /* move full page (first page) to end of list */ + PH_NEXT (PLH_LAST (plh)) = ph; + PH_PREV (ph) = PLH_LAST (plh); + PLH_LAST (plh) = ph; + PH_NEXT (ph) = 0; + /* install second page as first page */ + ph = temp; + PH_PREV (ph) = 0; + PLH_FIRST (plh) = ph; + return ph; + } + } + return 0; +} + + +/* Finds a page which has at least the needed number of pages. + Algorithm: FIRST FIT. */ +static page_header * +find_free_page_first_fit (EMACS_INT needed_pages, page_header *ph) +{ + while (ph) + { + if (PH_N_PAGES (ph) >= needed_pages) + return ph; + ph = PH_NEXT (ph); + } + return 0; +} + + +/* Allocates a page from the free list. */ +static page_header * +allocate_page_from_free_list (EMACS_INT needed_pages) +{ + page_header *ph = 0; + int i; + for (i = get_free_list_index (needed_pages); i < N_FREE_PAGE_LISTS; i++) + if ((ph = find_free_page_first_fit (needed_pages, + PLH_FIRST (FREE_HEAP_PAGES (i)))) != 0) + { + if (PH_N_PAGES (ph) > needed_pages) + return split_page (ph, needed_pages); + else + { + remove_page_from_free_list (ph); + return ph; + } + } + return 0; +} + + +/* Allocates a new page, either from free list or by expanding the heap. */ +static page_header * +allocate_new_page (page_list_header *plh, size_t size, int managed) +{ + EMACS_INT needed_pages = BYTES_TO_PAGES (size); + /* first check free list */ + page_header *result = allocate_page_from_free_list (needed_pages); + if (!result) + /* expand heap */ + result = expand_heap (needed_pages); + install_page_in_used_list (result, plh, size, managed); + return result; +} + + +/* Selects the correct size class, tries to allocate a cell of this size + from the free list, if this fails, a new page is allocated. */ +static void * +mc_alloc_1 (size_t size, int managed) +{ + page_list_header *plh = 0; + if (managed) + plh = USED_HEAP_PAGES (get_used_list_index (size)); + else + plh = UNMANAGED_HEAP_PAGES (get_unmanaged_list_index (size)); + + page_header *ph = 0; + void *result = 0; + if (size == 0) + return 0; + if (size < PAGE_SIZE_DIV_2) + /* first check any free cells */ + ph = allocate_cell (plh); + if (!ph) + /* allocate a new page */ + ph = allocate_new_page (plh, size, managed); + + /* return first element of free list and remove it from the list */ + result = (void*) PH_FREE_LIST (ph); + PH_FREE_LIST (ph) = + NEXT_FREE (PH_FREE_LIST (ph)); + + memset (result, '\0', size); + if (managed) + MARK_LRECORD_AS_FREE (result); + + /* bump used cells counter */ + PH_CELLS_USED (ph)++; + +#ifdef MEMORY_USAGE_STATS + PLH_USED_CELLS (plh)++; + if (managed) + PLH_USED_SPACE (plh) += size; + else + PLH_USED_SPACE (plh) += PLH_SIZE (plh); +#endif + + return result; +} + +void * +mc_alloc (size_t size) +{ + return mc_alloc_1 (size, 1); +} + +void * +mc_alloc_unmanaged (size_t size) +{ + return mc_alloc_1 (size, 0); +} + + + + +/*--- sweep & free & finalize-------------------------------------------*/ + +/* Frees a heap pointer. */ +static void +remove_cell (void *ptr, page_header *ph) +{ +#ifdef MEMORY_USAGE_STATS + PLH_USED_CELLS (PH_PLH (ph))--; + if (PH_ON_USED_LIST_P (ph)) + PLH_USED_SPACE (PH_PLH (ph)) -= + detagged_lisp_object_size ((const struct lrecord_header *) ptr); + else + PLH_USED_SPACE (PH_PLH (ph)) -= PH_CELL_SIZE (ph); +#endif +#ifdef ERROR_CHECK_GC + if (PH_ON_USED_LIST_P (ph)) { +#ifdef MC_ALLOC_TYPE_STATS + dec_lrecord_stats (PH_CELL_SIZE (ph), + (const struct lrecord_header *) ptr); +#endif /* MC_ALLOC_TYPE_STATS */ + assert (!LRECORD_FREE_P (ptr)); + deadbeef_memory (ptr, PH_CELL_SIZE (ph)); + MARK_LRECORD_AS_FREE (ptr); + } +#endif + + /* hooks cell into free list */ + NEXT_FREE (ptr) = PH_FREE_LIST (ph); + PH_FREE_LIST (ph) = FREE_LIST (ptr); + /* decrease cells used */ + PH_CELLS_USED (ph)--; +} + + +/* Mark free list marks all free list entries. */ +static void +mark_free_list (page_header *ph) +{ + free_link *fl = PH_FREE_LIST (ph); + while (fl) + { + SET_BIT (ph, get_mark_bit_index (fl, ph), 1); + fl = NEXT_FREE (fl); + } +} + +/* Finalize a page. You have to tell mc-alloc how to call your + object's finalizer. Therefore, you have to define the macro + MC_ALLOC_CALL_FINALIZER(ptr). This macro should do nothing else + then test if there is a finalizer and call it on the given + argument, which is the heap address of the object. */ +static void +finalize_page (page_header *ph) +{ + EMACS_INT heap_space = (EMACS_INT) PH_HEAP_SPACE (ph); + EMACS_INT heap_space_step = PH_CELL_SIZE (ph); + EMACS_INT mark_bit = 0; + EMACS_INT mark_bit_max_index = PH_CELLS_ON_PAGE (ph); + int bit = 0; + + mark_free_list (ph); + + for (mark_bit = 0; mark_bit < mark_bit_max_index; mark_bit++) + { + GET_BIT (bit, ph, mark_bit); + if (!bit) + { + EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit)); + MC_ALLOC_CALL_FINALIZER ((void *) ptr); + } + } +} + + +/* Finalize a page for disksave. XEmacs calls this routine before it + dumps the heap image. You have to tell mc-alloc how to call your + object's finalizer for disksave. Therefore, you have to define the + macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE(ptr). This macro should + do nothing else then test if there is a finalizer and call it on + the given argument, which is the heap address of the object. */ +static void +finalize_page_for_disksave (page_header *ph) +{ + EMACS_INT heap_space = (EMACS_INT) PH_HEAP_SPACE (ph); + EMACS_INT heap_space_step = PH_CELL_SIZE (ph); + EMACS_INT mark_bit = 0; + EMACS_INT mark_bit_max_index = PH_CELLS_ON_PAGE (ph); + + mark_free_list (ph); + + for (mark_bit = 0; mark_bit < mark_bit_max_index; mark_bit++) + { + EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit)); + MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE ((void *) ptr); + } +} + + +/* Finalizes the heap. */ +void +mc_finalize (void) +{ + visit_all_used_page_headers (finalize_page); +} + + +/* Finalizes the heap for disksave. */ +void +mc_finalize_for_disksave (void) +{ + visit_all_used_page_headers (finalize_page_for_disksave); +} + + +/* Sweeps a page: all the non-marked cells are freed. If the page is empty + in the end, it is removed. If some cells are free, it is moved to the + front of its page header list. Full pages stay where they are. */ +static void +sweep_page (page_header *ph) +{ + char *heap_space = (char *) PH_HEAP_SPACE (ph); + EMACS_INT heap_space_step = PH_CELL_SIZE (ph); + EMACS_INT mark_bit = 0; + EMACS_INT mark_bit_max_index = PH_CELLS_ON_PAGE (ph); + int bit = 0; + + mark_free_list (ph); + + for (mark_bit = 0; mark_bit < mark_bit_max_index; mark_bit++) + { + GET_BIT (bit, ph, mark_bit); + if (!bit) + { + remove_cell (heap_space + (heap_space_step * mark_bit), ph); + } + } + zero_mark_bits (ph); + if (PH_CELLS_USED (ph) == 0) + remove_page_from_used_list (ph); + else if (PH_CELLS_USED (ph) < PH_CELLS_ON_PAGE (ph)) + move_page_header_to_front (ph); +} + + +/* Sweeps the heap. */ +void +mc_sweep (void) +{ + visit_all_used_page_headers (sweep_page); +} + + +/* Frees the cell pointed to by ptr. */ +void +mc_free (void *ptr) +{ + page_header *ph = get_page_header (ptr); + assert (!PH_ON_FREE_LIST_P (ph)); + + remove_cell (ptr, ph); + + if (PH_CELLS_USED (ph) == 0) + remove_page_from_used_list (ph); + else if (PH_CELLS_USED (ph) < PH_CELLS_ON_PAGE (ph)) + move_page_header_to_front (ph); +} + + +/* Changes the size of the cell pointed to by ptr. + Returns the new address of the new cell with new size. */ +void * +mc_realloc_1 (void *ptr, size_t size, int managed) +{ + if (ptr) + { + if (size) + { + void *result = mc_alloc_1 (size, managed); + size_t from_size = PH_CELL_SIZE (get_page_header (ptr)); + size_t cpy_size = size; + if (size > from_size) + cpy_size = from_size; + memcpy (result, ptr, cpy_size); + mc_free (ptr); + return result; + } + else + { + mc_free (ptr); + return 0; + } + } + else + return mc_alloc_1 (size, managed); +} + +void * +mc_realloc (void *ptr, size_t size) +{ + return mc_realloc_1 (ptr, size, 1); +} + +void * +mc_realloc_unmanaged (void *ptr, size_t size) +{ + return mc_realloc_1 (ptr, size, 0); +} + + + + +/*--- initialization ---------------------------------------------------*/ + +/* Call once at the very beginning. */ +void +init_mc_allocator (void) +{ + int i; + + for (i = 0; i < N_USED_PAGE_LISTS; i++) + { + page_list_header *plh = USED_HEAP_PAGES (i); + PLH_LIST_TYPE (plh) = USED_LIST; + PLH_SIZE (plh) = get_used_list_size_value (i); + PLH_FIRST (plh) = 0; + PLH_LAST (plh) = 0; + PLH_MARK_BIT_FREE_LIST (plh) = 0; +#ifdef MEMORY_USAGE_STATS + PLH_PAGE_COUNT (plh) = 0; + PLH_USED_CELLS (plh) = 0; + PLH_USED_SPACE (plh) = 0; + PLH_TOTAL_CELLS (plh) = 0; + PLH_TOTAL_SPACE (plh) = 0; +#endif + } + + for (i = 0; i < N_UNMANAGED_PAGE_LISTS; i++) + { + page_list_header *plh = UNMANAGED_HEAP_PAGES (i); + PLH_LIST_TYPE (plh) = UNMANAGED_LIST; + PLH_SIZE (plh) = get_unmanaged_list_size_value (i); + PLH_FIRST (plh) = 0; + PLH_LAST (plh) = 0; + PLH_MARK_BIT_FREE_LIST (plh) = 0; +#ifdef MEMORY_USAGE_STATS + PLH_PAGE_COUNT (plh) = 0; + PLH_USED_CELLS (plh) = 0; + PLH_USED_SPACE (plh) = 0; + PLH_TOTAL_CELLS (plh) = 0; + PLH_TOTAL_SPACE (plh) = 0; +#endif + } + + for (i = 0; i < N_FREE_PAGE_LISTS; i++) + { + page_list_header *plh = FREE_HEAP_PAGES (i); + PLH_LIST_TYPE (plh) = FREE_LIST; + PLH_SIZE (plh) = get_free_list_size_value (i); + PLH_FIRST (plh) = 0; + PLH_LAST (plh) = 0; + PLH_MARK_BIT_FREE_LIST (plh) = 0; +#ifdef MEMORY_USAGE_STATS + PLH_PAGE_COUNT (plh) = 0; + PLH_USED_CELLS (plh) = 0; + PLH_USED_SPACE (plh) = 0; + PLH_TOTAL_CELLS (plh) = 0; + PLH_TOTAL_SPACE (plh) = 0; +#endif + } + + PAGE_HEADER_FREE_LIST = 0; + +#ifdef MEMORY_USAGE_STATS + MC_MALLOCED_BYTES = sizeof (mc_allocator_globals); +#endif + + init_lookup_table (); +} + + + + +/*--- lisp function for statistics -------------------------------------*/ + +#ifdef MEMORY_USAGE_STATS +DEFUN ("mc-alloc-memory-usage", Fmc_alloc_memory_usage, 0, 0, 0, /* +Returns stats about the mc-alloc memory usage. See diagnose.el. +*/ + ()) +{ + Lisp_Object free_plhs = Qnil; + Lisp_Object used_plhs = Qnil; + Lisp_Object unmanaged_plhs = Qnil; + Lisp_Object heap_sects = Qnil; + int used_size = 0; + int real_size = 0; + + int i; + + for (i = 0; i < N_FREE_PAGE_LISTS; i++) + if (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)) > 0) + free_plhs = + acons (make_int (PLH_SIZE (FREE_HEAP_PAGES(i))), + list1 (make_int (PLH_PAGE_COUNT (FREE_HEAP_PAGES(i)))), + free_plhs); + + for (i = 0; i < N_UNMANAGED_PAGE_LISTS; i++) + if (PLH_PAGE_COUNT (UNMANAGED_HEAP_PAGES(i)) > 0) + unmanaged_plhs = + acons (make_int (PLH_SIZE (UNMANAGED_HEAP_PAGES(i))), + list5 (make_int (PLH_PAGE_COUNT (UNMANAGED_HEAP_PAGES(i))), + make_int (PLH_USED_CELLS (UNMANAGED_HEAP_PAGES(i))), + make_int (PLH_USED_SPACE (UNMANAGED_HEAP_PAGES(i))), + make_int (PLH_TOTAL_CELLS (UNMANAGED_HEAP_PAGES(i))), + make_int (PLH_TOTAL_SPACE (UNMANAGED_HEAP_PAGES(i)))), + unmanaged_plhs); + + for (i = 0; i < N_USED_PAGE_LISTS; i++) + if (PLH_PAGE_COUNT (USED_HEAP_PAGES(i)) > 0) + used_plhs = + acons (make_int (PLH_SIZE (USED_HEAP_PAGES(i))), + list5 (make_int (PLH_PAGE_COUNT (USED_HEAP_PAGES(i))), + make_int (PLH_USED_CELLS (USED_HEAP_PAGES(i))), + make_int (PLH_USED_SPACE (USED_HEAP_PAGES(i))), + make_int (PLH_TOTAL_CELLS (USED_HEAP_PAGES(i))), + make_int (PLH_TOTAL_SPACE (USED_HEAP_PAGES(i)))), + used_plhs); + + for (i = 0; i < N_HEAP_SECTIONS; i++) { + used_size += HEAP_SECTION(i).n_pages * PAGE_SIZE; + real_size += + malloced_storage_size (0, HEAP_SECTION(i).real_size, 0); + } + + heap_sects = + list3 (make_int (N_HEAP_SECTIONS), + make_int (used_size), + make_int (real_size)); + + return Fcons (make_int (PAGE_SIZE), + list6 (heap_sects, + Fnreverse (used_plhs), + Fnreverse (unmanaged_plhs), + Fnreverse (free_plhs), + make_int (sizeof (mc_allocator_globals)), + make_int (MC_MALLOCED_BYTES))); +} +#endif /* MEMORY_USAGE_STATS */ + +void +syms_of_mc_alloc (void) +{ +#ifdef MEMORY_USAGE_STATS + DEFSUBR (Fmc_alloc_memory_usage); +#endif /* MEMORY_USAGE_STATS */ +}