Mercurial > hg > xemacs-beta
annotate src/device-impl.h @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | e22b0213b713 |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 872 | 1 /* Define device-object for XEmacs. |
| 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995, 2002 Ben Wing | |
| 4 Copyright (C) 1995 Sun Microsystems | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 /* Written by Chuck Thompson and Ben Wing. */ | |
| 26 | |
| 27 #ifndef INCLUDED_device_impl_h_ | |
| 28 #define INCLUDED_device_impl_h_ | |
| 29 | |
| 30 #include "console-impl.h" | |
| 31 #include "device.h" | |
| 32 | |
| 33 /* This should really be in redisplay.h but by putting it here we | |
| 34 won't have to ensure that redisplay.h is always included before | |
| 35 this file. */ | |
| 36 struct pixel_to_glyph_translation_cache | |
| 37 { | |
| 38 unsigned int valid :1; | |
| 39 struct frame *frame; | |
| 40 int low_x_coord, high_x_coord, col, obj_x; | |
| 41 int low_y_coord, high_y_coord, row, obj_y; | |
| 42 struct window *w; | |
| 43 Charbpos charpos; | |
| 44 Charbpos closest; | |
| 45 Charcount modeline_closest; | |
| 46 Lisp_Object obj1, obj2; | |
| 47 int retval; | |
| 48 }; | |
| 49 | |
| 50 /* Less public: */ | |
| 51 #define DEVICE_TYPE_NAME(d) ((d)->devmeths->name) | |
| 52 #define DEVICE_IMPL_FLAG(d, f) CONMETH_IMPL_FLAG ((d)->devmeths, (f)) | |
| 53 #define DEVICE_SPECIFIC_FRAME_PROPS(d) \ | |
| 54 ((d)->devmeths->device_specific_frame_props) | |
| 55 | |
| 56 /* More public: */ | |
| 57 #define DEVICE_TYPE(d) ((d)->devmeths->symbol) | |
| 58 #define XDEVICE_TYPE(d) DEVICE_TYPE (XDEVICE (d)) | |
| 59 | |
| 60 /******** Accessing / calling a device method *********/ | |
| 61 | |
| 62 #define HAS_DEVMETH_P(d, m) HAS_CONTYPE_METH_P ((d)->devmeths, m) | |
| 63 #define DEVMETH(d, m, args) CONTYPE_METH ((d)->devmeths, m, args) | |
| 64 #define MAYBE_DEVMETH(d, m, args) MAYBE_CONTYPE_METH ((d)->devmeths, m, args) | |
| 65 #define DEVMETH_OR_GIVEN(d, m, args, given) \ | |
| 66 CONTYPE_METH_OR_GIVEN((d)->devmeths, m, args, given) | |
| 67 #define MAYBE_INT_DEVMETH(d, m, args) \ | |
| 68 MAYBE_INT_CONTYPE_METH ((d)->devmeths, m, args) | |
| 69 #define MAYBE_LISP_DEVMETH(d, m, args) \ | |
| 70 MAYBE_LISP_CONTYPE_METH ((d)->devmeths, m, args) | |
| 71 | |
| 72 struct device | |
| 73 { | |
| 2720 | 74 #ifdef MC_ALLOC |
| 75 struct lrecord_header header; | |
| 76 #else /* MC_ALLOC */ | |
| 872 | 77 struct lcrecord_header header; |
| 2720 | 78 #endif /* MC_ALLOC */ |
| 872 | 79 |
| 80 /* Methods for this device's console. This can also be retrieved | |
| 81 through device->console, but it's faster this way. */ | |
| 82 struct console_methods *devmeths; | |
| 83 | |
| 1204 | 84 /* Duplicates devmeths->symbol. See comment in struct console. */ |
| 934 | 85 enum console_variant devtype; |
| 86 | |
| 872 | 87 /* A structure of auxiliary data specific to the device type. |
| 88 struct x_device is used for X window frames; defined in console-x.h | |
| 89 struct tty_device is used to TTY's; defined in console-tty.h */ | |
| 90 void *device_data; | |
| 91 | |
| 92 /* redisplay flags */ | |
| 93 unsigned int buffers_changed :1; | |
| 94 unsigned int clip_changed :1; | |
| 95 unsigned int extents_changed :1; | |
| 96 unsigned int faces_changed :1; | |
| 97 unsigned int frame_changed :1; | |
| 905 | 98 unsigned int frame_layout_changed :1; /* The layout of frame |
| 99 elements has changed. */ | |
| 872 | 100 unsigned int glyphs_changed :1; |
| 101 unsigned int subwindows_changed :1; | |
| 102 unsigned int subwindows_state_changed :1; | |
| 103 unsigned int icon_changed :1; | |
| 104 unsigned int menubar_changed :1; | |
| 105 unsigned int modeline_changed :1; | |
| 106 unsigned int point_changed :1; | |
| 107 unsigned int size_changed :1; | |
| 108 unsigned int gutter_changed :1; | |
| 109 unsigned int toolbar_changed :1; | |
| 110 unsigned int windows_changed :1; | |
| 111 unsigned int windows_structure_changed :1; | |
| 112 | |
| 113 unsigned int locked :1; | |
| 114 | |
| 115 /* Cache information about last pixel position translated to a | |
| 116 glyph. The law of locality applies very heavily here so caching | |
| 117 the value leads to a significant win. At the moment this is | |
| 118 really X specific but once we have generic mouse support it won't | |
| 119 be. */ | |
| 120 struct pixel_to_glyph_translation_cache pixel_to_glyph_cache; | |
| 121 | |
| 122 /* Output baud rate of device; used for redisplay decisions. */ | |
| 123 int baud_rate; | |
| 124 | |
| 125 /* sound flags */ | |
| 126 unsigned int on_console_p :1; | |
| 127 unsigned int connected_to_nas_p :1; | |
| 128 | |
| 1204 | 129 #define MARKED_SLOT(x) Lisp_Object x; |
| 872 | 130 #include "devslots.h" |
| 131 | |
| 132 /* File descriptors for input and output. Much of the time | |
| 133 (but not always) these will be the same. For an X device, | |
| 134 these both hold the file descriptor of the socket used | |
| 135 to communicate with the X server. For a TTY device, these | |
| 136 may or may not be the same and point to the terminal that | |
| 137 is used for I/O. */ | |
| 138 int infd, outfd; | |
| 139 | |
| 140 /* infd and outfd are moved outside HAVE_UNIXOID_EVENT_LOOP conditionals, | |
| 141 because Win32, presumably the first port which does not use select() | |
| 142 polling, DOES have handles for a console device. -- kkm */ | |
| 143 | |
| 144 #ifdef HAVE_UNIXOID_EVENT_LOOP | |
| 145 /* holds some data necessary for SIGIO control. Perhaps this should | |
| 146 be inside of device_data; but it is used for both TTY's and X | |
| 147 device. Perhaps it should be conditionalized on SIGIO; but | |
| 148 this requires including syssignal.h. */ | |
| 149 int old_fcntl_owner; | |
| 150 #endif | |
| 151 }; | |
| 152 | |
| 153 /* Redefine basic properties more efficiently */ | |
| 154 | |
| 155 #undef DEVICE_LIVE_P | |
| 156 #define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE (d), Qdead)) | |
| 157 #undef DEVICE_CONSOLE | |
| 158 #define DEVICE_CONSOLE(d) ((d)->console) | |
| 159 #undef DEVICE_FRAME_LIST | |
| 160 #define DEVICE_FRAME_LIST(d) ((d)->frame_list) | |
| 161 | |
| 162 #define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) | |
| 163 | |
| 164 #ifdef ERROR_CHECK_TYPES | |
| 165 DECLARE_INLINE_HEADER ( | |
| 166 struct device * | |
| 167 error_check_device_type (struct device *d, Lisp_Object sym) | |
| 168 ) | |
| 169 { | |
| 170 assert (EQ (DEVICE_TYPE (d), sym)); | |
| 171 return d; | |
| 172 } | |
| 173 # define DEVICE_TYPE_DATA(d, type) \ | |
| 174 ((struct type##_device *) error_check_device_type (d, Q##type)->device_data) | |
| 175 #else | |
| 176 # define DEVICE_TYPE_DATA(d, type) \ | |
| 177 ((struct type##_device *) (d)->device_data) | |
| 178 #endif | |
| 179 | |
| 180 #define CHECK_DEVICE_TYPE(x, type) \ | |
| 181 do { \ | |
| 182 CHECK_DEVICE (x); \ | |
| 183 if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ | |
| 184 type))) \ | |
| 185 dead_wrong_type_argument \ | |
| 186 (type##_console_methods->predicate_symbol, x); \ | |
| 187 } while (0) | |
| 188 #define CONCHECK_DEVICE_TYPE(x, type) \ | |
| 189 do { \ | |
| 190 CONCHECK_DEVICE (x); \ | |
| 191 if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ | |
| 192 type))) \ | |
| 193 x = wrong_type_argument \ | |
| 194 (type##_console_methods->predicate_symbol, x); \ | |
| 195 } while (0) | |
| 196 | |
| 197 #define DEVICE_DISPLAY_P(dev) \ | |
| 198 (DEVICE_LIVE_P (dev) && \ | |
| 199 !DEVICE_IMPL_FLAG (dev, XDEVIMPF_IS_A_PRINTER)) | |
| 200 | |
| 201 #define CHECK_DISPLAY_DEVICE(dev) \ | |
| 202 do { \ | |
| 203 CHECK_DEVICE (dev); \ | |
| 204 if (!(DEVICEP (dev) \ | |
| 205 && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ | |
| 206 dead_wrong_type_argument (Qdisplay, dev); \ | |
| 207 } while (0) | |
| 208 | |
| 209 #define CONCHECK_DISPLAY_DEVICE(dev) \ | |
| 210 do { \ | |
| 211 CONCHECK_DEVICE (dev); \ | |
| 212 if (!(DEVICEP (dev) \ | |
| 213 && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ | |
| 214 wrong_type_argument (Qdisplay, dev); \ | |
| 215 } while (0) | |
| 216 | |
| 217 #define DEVICE_PRINTER_P(dev) \ | |
| 218 (DEVICE_LIVE_P (dev) && !DEVICE_DISPLAY_P (dev)) | |
| 219 | |
| 220 #define CHECK_PRINTER_DEVICE(dev) \ | |
| 221 do { \ | |
| 222 CHECK_DEVICE (dev); \ | |
| 223 if (!(DEVICEP (dev) \ | |
| 224 && DEVICE_PRINTER_P (XDEVICE (dev)))) \ | |
| 225 dead_wrong_type_argument (Qprinter, dev); \ | |
| 226 } while (0) | |
| 227 | |
| 228 #define CONCHECK_PRINTER_DEVICE(dev) \ | |
| 229 do { \ | |
| 230 CONCHECK_DEVICE (dev); \ | |
| 231 if (!(DEVICEP (dev) \ | |
| 232 && DEVICE_PRINTER_P (XDEVICE (dev)))) \ | |
| 233 wrong_type_argument (Qprinter, dev); \ | |
| 234 } while (0) | |
| 235 | |
| 236 /* #### These should be in the device-*.h files but there are | |
| 237 too many places where the abstraction is broken. Need to | |
| 238 fix. */ | |
| 239 | |
| 240 #define DEVICE_X_P(dev) CONSOLE_TYPESYM_X_P (DEVICE_TYPE (dev)) | |
| 241 #define CHECK_X_DEVICE(z) CHECK_DEVICE_TYPE (z, x) | |
| 242 #define CONCHECK_X_DEVICE(z) CONCHECK_DEVICE_TYPE (z, x) | |
| 243 | |
| 244 #define DEVICE_GTK_P(dev) CONSOLE_TYPESYM_GTK_P (DEVICE_TYPE (dev)) | |
| 245 #define CHECK_GTK_DEVICE(z) CHECK_DEVICE_TYPE (z, gtk) | |
| 246 #define CONCHECK_GTK_DEVICE(z) CONCHECK_DEVICE_TYPE (z, gtk) | |
| 247 | |
| 248 #define DEVICE_MSWINDOWS_P(dev) CONSOLE_TYPESYM_MSWINDOWS_P (DEVICE_TYPE (dev)) | |
| 249 #define CHECK_MSWINDOWS_DEVICE(z) CHECK_DEVICE_TYPE (z, mswindows) | |
| 250 #define CONCHECK_MSWINDOWS_DEVICE(z) CONCHECK_DEVICE_TYPE (z, mswindows) | |
| 251 | |
| 252 #define DEVICE_TTY_P(dev) CONSOLE_TYPESYM_TTY_P (DEVICE_TYPE (dev)) | |
| 253 #define CHECK_TTY_DEVICE(z) CHECK_DEVICE_TYPE (z, tty) | |
| 254 #define CONCHECK_TTY_DEVICE(z) CONCHECK_DEVICE_TYPE (z, tty) | |
| 255 | |
| 256 #define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE (dev)) | |
| 257 #define CHECK_STREAM_DEVICE(z) CHECK_DEVICE_TYPE (z, stream) | |
| 258 #define CONCHECK_STREAM_DEVICE(z) CONCHECK_DEVICE_TYPE (z, stream) | |
| 259 | |
| 260 #define DEVICE_WIN_P(dev) CONSOLE_TYPESYM_WIN_P (DEVICE_TYPE (dev)) | |
| 261 | |
| 262 #define DEVICE_REDISPLAY_INFO(d) ((d)->redisplay_info) | |
| 263 | |
| 264 #define DEVICE_NAME(d) ((d)->name) | |
| 265 #define DEVICE_CLASS(d) ((d)->device_class) | |
| 266 /* Catch people attempting to set this. */ | |
| 267 #define DEVICE_SELECTED_FRAME(d) NON_LVALUE ((d)->selected_frame) | |
| 268 #define DEVICE_FRAME_WITH_FOCUS_REAL(d) ((d)->frame_with_focus_real) | |
| 269 #define DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS(d) ((d)->frame_with_focus_for_hooks) | |
| 270 #define DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS(d) \ | |
| 271 ((d)->frame_that_ought_to_have_focus) | |
| 272 #define DEVICE_USER_DEFINED_TAGS(d) ((d)->user_defined_tags) | |
| 273 #define DEVICE_CONNECTION(d) ((d)->connection) | |
| 274 #define DEVICE_CANON_CONNECTION(d) ((d)->canon_connection) | |
| 275 #define DEVICE_BAUD_RATE(d) ((d)->baud_rate) | |
| 276 #define DEVICE_INFD(d) ((d)->infd) | |
| 277 #define DEVICE_OUTFD(d) ((d)->outfd) | |
| 278 #define DEVICE_OLD_FCNTL_OWNER(d) ((d)->old_fcntl_owner) | |
| 279 #define DEVICE_ON_CONSOLE_P(d) ((d)->on_console_p) | |
| 280 #define DEVICE_CONNECTED_TO_NAS_P(d) ((d)->connected_to_nas_p) | |
| 281 | |
| 282 #define LOCK_DEVICE(d) ((void) ((d)->locked = 1)) | |
| 283 #define UNLOCK_DEVICE(d) ((void) ((d)->locked = 0)) | |
| 284 | |
| 285 #define INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE(d) \ | |
| 286 ((void) ((d)->pixel_to_glyph_cache.valid = 0)) | |
| 287 | |
| 288 #define INVALIDATE_PIXEL_TO_GLYPH_CACHE do { \ | |
| 289 Lisp_Object IPTGC_devcons, IPTGC_concons; \ | |
| 290 DEVICE_LOOP_NO_BREAK (IPTGC_devcons, IPTGC_concons) \ | |
| 291 INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (XDEVICE (XCAR (IPTGC_devcons))); \ | |
| 292 } while (0) | |
| 293 | |
| 294 #define MARK_DEVICE_FACES_CHANGED(d) \ | |
| 295 ((void) (faces_changed = (d)->faces_changed = 1)) | |
| 296 | |
| 297 #define MARK_DEVICE_GLYPHS_CHANGED(d) \ | |
| 298 ((void) (glyphs_changed = (d)->glyphs_changed = 1)) | |
| 299 | |
| 300 #define MARK_DEVICE_SUBWINDOWS_CHANGED(d) \ | |
| 301 ((void) (subwindows_changed = (d)->subwindows_changed = 1)) | |
| 302 | |
| 303 #define MARK_DEVICE_SUBWINDOWS_STATE_CHANGED(d) \ | |
| 304 ((void) (subwindows_state_changed = (d)->subwindows_state_changed = 1)) | |
| 305 | |
| 306 #define MARK_DEVICE_TOOLBARS_CHANGED(d) \ | |
| 307 ((void) (toolbar_changed = (d)->toolbar_changed = 1)) | |
| 308 | |
| 309 #define MARK_DEVICE_GUTTERS_CHANGED(d) \ | |
| 310 ((void) (gutter_changed = (d)->gutter_changed = 1)) | |
| 311 | |
| 312 #define MARK_DEVICE_SIZE_CHANGED(d) \ | |
| 313 ((void) (size_changed = (d)->size_changed = 1)) | |
| 314 | |
| 315 #define MARK_DEVICE_FRAMES_FACES_CHANGED(d) do { \ | |
| 316 struct device *mdffc_d = (d); \ | |
| 317 Lisp_Object frmcons; \ | |
| 318 DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ | |
| 319 XFRAME (XCAR (frmcons))->faces_changed = 1; \ | |
| 320 MARK_DEVICE_FACES_CHANGED (mdffc_d); \ | |
| 321 } while (0) | |
| 322 | |
| 323 #define MARK_DEVICE_FRAMES_GLYPHS_CHANGED(d) do { \ | |
| 324 struct device *mdffc_d = (d); \ | |
| 325 Lisp_Object frmcons; \ | |
| 326 DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ | |
| 327 XFRAME (XCAR (frmcons))->glyphs_changed = 1; \ | |
| 328 MARK_DEVICE_GLYPHS_CHANGED (mdffc_d); \ | |
| 329 } while (0) | |
| 330 | |
| 331 #define MARK_DEVICE_FRAME_CHANGED(d) \ | |
| 332 ((void) (frame_changed = (d)->frame_changed = 1)) | |
| 333 | |
| 905 | 334 #define MARK_DEVICE_FRAME_LAYOUT_CHANGED(d) \ |
| 335 ((void) (frame_layout_changed = (d)->frame_layout_changed = 1)) | |
| 336 | |
| 872 | 337 #define MARK_DEVICE_WINDOWS_CHANGED(d) \ |
| 338 ((void) (windows_changed = (d)->windows_changed = 1)) | |
| 339 | |
| 340 #define MARK_DEVICE_WINDOWS_STRUCTURE_CHANGED(d) \ | |
| 341 ((void) (windows_structure_changed = (d)->windows_structure_changed = 1)) | |
| 342 | |
| 343 #endif /* INCLUDED_device_impl_h_ */ |