Mercurial > hg > xemacs-beta
annotate lisp/lib-complete.el @ 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 | 37bdd24225ef |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; lib-complete.el --- Completion on the lisp search path |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 1123 | 4 ;; Copyright (C) 1991 Mike Williams <mike-w@cs.aukuni.ac.nz>. |
| 5 ;; Copyright (C) 2002 Ben Wing. | |
| 428 | 6 |
| 7 ;; Author: Mike Williams <mike-w@cs.aukuni.ac.nz> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: lisp, extensions, dumped | |
| 10 ;; Created: Sat Apr 20 17:47:21 1991 | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 15 ;; under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 22 ;; General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 27 ;; Boston, MA 02111-1307, USA. | |
| 28 | |
| 29 ;;; Synched up with: Not in FSF. | |
| 30 | |
| 31 ;;; Commentary: | |
| 32 | |
| 33 ;; This file is dumped with XEmacs. | |
| 34 | |
| 35 ;; Many thanks to Hallvard Furuseth <hallvard@ifi.uio.no> for his | |
| 36 ;; helpful suggestions. | |
| 37 | |
| 38 ;;; ChangeLog: | |
| 39 | |
| 40 ;; 4/26/97: sb Mule-ize. | |
| 41 ;; 6/24/1999 much rewriting from Bob Weiner | |
| 42 | |
| 43 ;;; Code: | |
| 44 | |
| 45 ;;=== Determine completions for filename in search path =================== | |
| 46 | |
| 47 (defun library-all-completions (FILE SEARCH-PATH &optional FULL FAST) | |
| 48 "Return all completions for FILE in any directory on SEARCH-PATH. | |
| 49 If optional third argument FULL is non-nil, returned pathnames should be | |
| 50 absolute rather than relative to some directory on the SEARCH-PATH. | |
| 51 If optional fourth argument FAST is non-nil, don't sort the completions, | |
| 52 or remove duplicates." | |
| 53 (setq FILE (or FILE "")) | |
| 54 (if (file-name-absolute-p FILE) | |
| 55 ;; It's an absolute file name, so don't need SEARCH-PATH | |
| 56 (progn | |
| 57 (setq FILE (expand-file-name FILE)) | |
| 58 (file-name-all-completions | |
| 59 (file-name-nondirectory FILE) (file-name-directory FILE))) | |
| 60 (let ((subdir (file-name-directory FILE)) | |
| 61 (file (file-name-nondirectory FILE)) | |
| 62 all-completions) | |
| 63 ;; Make list of completions in each directory on SEARCH-PATH | |
| 64 (while SEARCH-PATH | |
| 65 (let* ((dir (concat (file-name-as-directory | |
| 66 (expand-file-name (car SEARCH-PATH))) | |
| 67 subdir)) | |
| 68 (dir-prefix (if FULL dir subdir))) | |
| 69 (if (file-directory-p dir) | |
| 70 (let ((subdir-completions | |
| 71 (file-name-all-completions file dir))) | |
| 72 (while subdir-completions | |
| 73 (setq all-completions | |
| 74 (cons (concat dir-prefix (car subdir-completions)) | |
| 75 all-completions)) | |
| 76 (setq subdir-completions (cdr subdir-completions)))))) | |
| 77 (setq SEARCH-PATH (cdr SEARCH-PATH))) | |
| 78 (if FAST all-completions | |
| 79 (let ((sorted (nreverse (sort all-completions 'string<))) | |
| 80 compressed) | |
| 81 (while sorted | |
| 82 (if (equal (car sorted) (car compressed)) nil | |
| 83 (setq compressed (cons (car sorted) compressed))) | |
| 84 (setq sorted (cdr sorted))) | |
| 85 compressed))))) | |
| 86 | |
| 87 ;;=== Utilities =========================================================== | |
| 88 | |
| 89 (defmacro progn-with-message (message &rest forms) | |
| 90 "(progn-with-message MESSAGE FORMS ...) | |
| 91 Display MESSAGE and evaluate FORMS, returning value of the last one." | |
| 92 ;; based on Hallvard Furuseth's funcall-with-message | |
| 93 `(if (eq (selected-window) (minibuffer-window)) | |
| 94 (save-excursion | |
| 95 (goto-char (point-max)) | |
| 96 (let ((orig-pmax (point-max))) | |
| 97 (unwind-protect | |
| 98 (progn | |
| 99 (insert " " ,message) (goto-char orig-pmax) | |
| 100 (sit-for 0) ; Redisplay | |
| 101 ,@forms) | |
| 102 (delete-region orig-pmax (point-max))))) | |
| 103 (prog2 | |
| 104 (message "%s" ,message) | |
| 105 (progn ,@forms) | |
| 106 (message "")))) | |
| 107 | |
| 108 (put 'progn-with-message 'lisp-indent-hook 1) | |
| 109 | |
| 110 ;;=== Completion caching ================================================== | |
| 111 | |
| 112 (defconst lib-complete:cache nil | |
| 444 | 113 "Used within `read-library' and `read-library-internal' to prevent |
| 114 costly repeated calls to `library-all-completions'. | |
| 428 | 115 Format is a list of lists of the form |
| 116 | |
| 117 ([<path> <subdir>] <cache-record> <cache-record> ...) | |
| 118 | |
| 119 where each <cache-record> has the form | |
| 120 | |
| 121 (<root> <modtimes> <completion-table>)") | |
| 122 | |
| 123 (defun lib-complete:better-root (ROOT1 ROOT2) | |
| 124 "Return non-nil if ROOT1 is a superset of ROOT2." | |
| 125 (and (equal (file-name-directory ROOT1) (file-name-directory ROOT2)) | |
| 126 (string-match | |
| 127 (concat "^" (regexp-quote (file-name-nondirectory ROOT1))) | |
| 128 ROOT2))) | |
| 129 | |
| 130 (defun lib-complete:get-completion-table (FILE PATH FILTER) | |
| 131 (let* ((subdir (file-name-directory FILE)) | |
| 132 (root (file-name-nondirectory FILE)) | |
| 133 (PATH | |
| 134 (mapcar | |
| 135 (function (lambda (dir) (file-name-as-directory | |
| 136 (expand-file-name (or dir ""))))) | |
| 137 PATH)) | |
| 138 (key (vector PATH subdir FILTER)) | |
| 139 (real-dirs | |
| 140 (if subdir | |
| 141 (mapcar (function (lambda (dir) (concat dir subdir))) PATH) | |
| 142 PATH)) | |
| 143 (path-modtimes | |
| 144 (mapcar | |
| 145 (function (lambda (fn) (if fn (nth 5 (file-attributes fn))))) | |
| 146 real-dirs)) | |
| 147 (cache-entry (assoc key lib-complete:cache)) | |
| 148 (cache-records (cdr cache-entry))) | |
| 149 ;; Look for cached entry | |
| 150 (catch 'table | |
| 151 (while cache-records | |
| 152 (if (and | |
| 153 (lib-complete:better-root (nth 0 (car cache-records)) root) | |
| 154 (equal (nth 1 (car cache-records)) path-modtimes)) | |
| 155 (throw 'table (nth 2 (car cache-records)))) | |
| 156 (setq cache-records (cdr cache-records))) | |
| 157 ;; Otherwise build completions | |
| 158 (let ((completion-list | |
| 159 (progn-with-message "(building completion table...)" | |
| 160 (library-all-completions FILE PATH nil 'fast))) | |
| 161 (completion-table (make-vector 127 0))) | |
| 162 (while completion-list | |
| 163 (let ((completion | |
| 164 (if (or (not FILTER) | |
| 165 (file-directory-p (car completion-list))) | |
| 166 (car completion-list) | |
| 167 (funcall FILTER (car completion-list))))) | |
| 168 (if completion | |
| 169 (intern completion completion-table))) | |
| 170 (setq completion-list (cdr completion-list))) | |
| 171 ;; Cache the completions | |
| 172 (lib-complete:cache-completions key root | |
| 173 path-modtimes completion-table) | |
| 174 completion-table)))) | |
| 175 | |
| 176 (defvar lib-complete:max-cache-size 40 | |
| 177 "*Maximum number of search paths which are cached.") | |
| 178 | |
| 179 (defun lib-complete:cache-completions (key root modtimes table) | |
| 180 (let* ((cache-entry (assoc key lib-complete:cache)) | |
| 181 (cache-records (cdr cache-entry)) | |
| 182 (new-cache-records (list (list root modtimes table)))) | |
| 183 (if (not cache-entry) nil | |
| 184 ;; Remove old cache entry | |
| 185 (setq lib-complete:cache (delq cache-entry lib-complete:cache)) | |
| 186 ;; Copy non-redundant entries from old cache entry | |
| 187 (while cache-records | |
| 188 (if (or (equal root (nth 0 (car cache-records))) | |
| 189 (lib-complete:better-root root (nth 0 (car cache-records)))) | |
| 190 nil | |
| 191 (setq new-cache-records | |
| 192 (cons (car cache-records) new-cache-records))) | |
| 193 (setq cache-records (cdr cache-records)))) | |
| 194 ;; Add entry to front of cache | |
| 195 (setq lib-complete:cache | |
| 196 (cons (cons key (nreverse new-cache-records)) lib-complete:cache)) | |
| 197 ;; Trim cache | |
| 198 (let ((tail (nthcdr lib-complete:max-cache-size lib-complete:cache))) | |
| 199 (if tail (setcdr tail nil))))) | |
| 200 | |
| 201 ;;=== Read a filename, with completion in a search path =================== | |
| 202 | |
| 203 (defun read-library-internal (FILE FILTER FLAG) | |
| 204 "Don't call this." | |
| 205 ;; Relies on read-library-internal-search-path being let-bound | |
| 502 | 206 (declare (special read-library-internal-search-path)) |
| 428 | 207 (let ((completion-table |
| 208 (lib-complete:get-completion-table | |
| 209 FILE read-library-internal-search-path FILTER))) | |
| 210 (cond | |
| 211 ((not completion-table) nil) | |
| 212 ;; Completion table is filtered before use, so the PREDICATE | |
| 213 ;; argument is redundant. | |
| 214 ((eq FLAG nil) (try-completion FILE completion-table nil)) | |
| 215 ((eq FLAG t) (all-completions FILE completion-table nil)) | |
| 216 ((eq FLAG 'lambda) (and (intern-soft FILE completion-table) t)) | |
| 217 ))) | |
| 218 | |
| 219 (defun read-library (PROMPT SEARCH-PATH &optional DEFAULT MUST-MATCH | |
| 220 FULL FILTER) | |
| 221 "Read library name, prompting with PROMPT and completing in directories | |
| 222 from SEARCH-PATH. A nil in the search path represents the current | |
| 223 directory. Completions for a given search-path are cached, with the | |
| 224 cache being invalidated whenever one of the directories on the path changes. | |
| 225 Default to DEFAULT if user enters a null string. | |
| 226 Optional fourth arg MUST-MATCH non-nil means require existing file's name. | |
| 227 Non-nil and non-t means also require confirmation after completion. | |
| 228 Optional fifth argument FULL non-nil causes a full pathname, rather than a | |
| 229 relative pathname, to be returned. Note that FULL implies MUST-MATCH. | |
| 230 Optional sixth argument FILTER can be used to provide a function to | |
| 231 filter the completions. This function is passed the filename, and should | |
| 232 return a transformed filename (possibly a null transformation) or nil, | |
| 233 indicating that the filename should not be included in the completions." | |
| 502 | 234 (declare (special read-library-internal-search-path)) |
| 428 | 235 (let* ((read-library-internal-search-path SEARCH-PATH) |
| 236 (library (completing-read PROMPT 'read-library-internal | |
| 237 FILTER (or MUST-MATCH FULL) nil))) | |
| 238 (cond | |
| 239 ((equal library "") DEFAULT) | |
| 240 (FULL (locate-file library read-library-internal-search-path | |
| 241 '(".el" ".el.gz" ".elc"))) | |
| 242 (t library)))) | |
| 243 | |
| 244 (defun read-library-name (prompt) | |
| 502 | 245 "PROMPTs for and returns an existing Elisp library name (without any suffix) |
| 246 or the empty string." | |
| 428 | 247 (interactive) |
| 502 | 248 (declare (special read-library-internal-search-path)) |
| 428 | 249 (let ((read-library-internal-search-path load-path)) |
| 250 (completing-read prompt | |
| 251 'read-library-internal | |
| 252 (lambda (fn) | |
| 253 (cond | |
| 254 ((string-match "\\.el\\(\\.gz\\|\\.Z\\)?$" fn) | |
| 255 (substring fn 0 (match-beginning 0))))) | |
| 256 t nil))) | |
| 257 | |
| 258 ;; NOTE: as a special case, read-library may be used to read a filename | |
| 259 ;; relative to the current directory, returning a *relative* pathname | |
| 260 ;; (read-file-name returns a full pathname). | |
| 261 ;; | |
| 262 ;; eg. (read-library "Local header: " '(nil) nil) | |
| 263 | |
| 264 ;;=== Replacement for load-library with completion ======================== | |
| 265 | |
| 266 (defun load-library (library) | |
| 267 "Load the library named LIBRARY. | |
| 268 This is an interface to the function `load'." | |
| 269 (interactive | |
| 270 (list (read-library "Load library: " load-path nil nil nil | |
| 271 (function (lambda (fn) | |
| 272 (cond | |
| 273 ((string-match "\\.elc?$" fn) | |
| 274 (substring fn 0 (match-beginning 0)))))) | |
| 275 ))) | |
| 276 (load library)) | |
| 277 | |
| 278 ;;=== find-library with completion (Author: Bob Weiner) =================== | |
| 279 | |
| 1123 | 280 ;; should be called find-lisp-source-path! |
| 531 | 281 (defcustom find-library-source-path nil |
| 282 "The default list of directories where find-library searches. | |
| 283 | |
| 284 If this variable is `nil' then find-library searches `load-path' by | |
| 285 default. | |
| 286 | |
| 1123 | 287 If this is set to a function, it will be called the first time this value |
| 288 is needed, to compute the actual list, which will then be substituted into | |
| 289 the variable. | |
| 290 | |
| 531 | 291 A good way to set this variable is like this: |
| 292 | |
| 293 \(setq find-library-source-path | |
| 1123 | 294 #'(lambda () |
| 295 (paths-find-recursive-load-path | |
| 296 (list lisp-directory \"/src/xemacs/xemacs-packages-src/\")))) | |
| 531 | 297 " |
| 298 :type '(repeat directory) | |
| 299 :group 'find-function) | |
| 300 | |
| 428 | 301 (defun find-library (library &optional codesys display-function) |
| 302 "Find and display in the current window the source for the Elisp LIBRARY. | |
| 303 LIBRARY should be a name without any path information and may include or omit | |
| 304 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 305 specifies the coding system to use when decoding the file. Interactively, | |
| 306 with a prefix argument, this prompts for the coding system. Optional third | |
| 307 argument DISPLAY-FUNCTION must take two arguments, the filename to display | |
| 531 | 308 and CODESYS. The default for DISPLAY-FUNCTION is `find-file'. |
| 309 | |
| 310 This function searches `find-library-source-path' to find the library; | |
| 311 if this is nil (the default), then `load-path' is searched." | |
| 428 | 312 (interactive |
| 313 (list (read-library-name "Find library: ") | |
| 314 (if current-prefix-arg | |
| 315 (read-coding-system "Coding System: ")))) | |
| 316 (let ((path (if (or (null library) (equal library "")) | |
| 317 nil | |
| 1123 | 318 (when (functionp find-library-source-path) |
| 319 (message "Computing find-library-source-path...") | |
| 320 (setq find-library-source-path | |
| 321 (funcall find-library-source-path)) | |
| 322 (message "Computing find-library-source-path... done.")) | |
| 531 | 323 (locate-file library (or find-library-source-path load-path) |
| 953 | 324 ":.el:.el.gz:.el.Z:.elc")))) |
| 428 | 325 (if path (funcall (if (fboundp display-function) |
| 326 display-function 'find-file) | |
| 327 path codesys) | |
| 328 (error "(find-library): Cannot locate library `%s'" library)))) | |
| 329 | |
| 330 (defun find-library-other-window (library &optional codesys) | |
| 331 "Find and display in another window the source for the Elisp LIBRARY. | |
| 332 LIBRARY should be a name without any path information and may include or omit | |
| 333 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 334 specifies the coding system to use when decoding the file. Interactively, | |
| 335 with a prefix argument, this prompts for the coding system." | |
| 336 (interactive | |
| 337 (list (read-library-name "Find library in other window: ") | |
| 338 (if current-prefix-arg | |
| 339 (read-coding-system "Coding System: ")))) | |
| 340 (find-library library codesys 'find-file-other-window)) | |
| 341 | |
| 342 (defun find-library-other-frame (library &optional codesys) | |
| 343 "Find and display in another frame the source for the Elisp LIBRARY. | |
| 344 LIBRARY should be a name without any path information and may include or omit | |
| 345 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 346 specifies the coding system to use when decoding the file. Interactively, | |
| 347 with a prefix argument, this prompts for the coding system." | |
| 348 (interactive | |
| 349 (list (read-library-name "Find library in other frame: ") | |
| 350 (if current-prefix-arg | |
| 351 (read-coding-system "Coding System: ")))) | |
| 352 (find-library library codesys 'find-file-other-frame)) | |
| 353 | |
| 354 ;; This conflicts with an existing binding. | |
| 355 ;;(define-key global-map "\C-xl" 'find-library) | |
| 356 (define-key global-map "\C-x4l" 'find-library-other-window) | |
| 357 (define-key global-map "\C-x5l" 'find-library-other-frame) | |
| 358 | |
| 359 (provide 'lib-complete) | |
| 360 | |
| 361 ;;; lib-complete.el ends here |