Mercurial > hg > xemacs-beta
annotate src/event-unixoid.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 | fffe735e63ee |
| children | 0cc7794d231e |
| rev | line source |
|---|---|
| 428 | 1 /* Code shared between all event loops that use select() and have a |
| 2 different input descriptor for each device. | |
| 3 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
| 4 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 5 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 1268 | 6 Copyright (C) 1995, 1996, 2001, 2002, 2003 Ben Wing. |
| 428 | 7 |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: Not in FSF. */ | |
| 26 | |
| 27 /* This file has been Mule-ized. */ | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 | |
| 872 | 32 #include "console-stream-impl.h" |
| 33 #include "console-tty-impl.h" | |
| 1204 | 34 #include "device-impl.h" |
| 428 | 35 #include "events.h" |
| 36 #include "lstream.h" | |
| 37 #include "process.h" | |
| 38 | |
| 39 #include "sysdep.h" | |
| 40 #include "sysfile.h" | |
| 41 #include "sysproc.h" /* select stuff */ | |
| 42 #include "systime.h" | |
| 43 | |
| 44 /* Mask of bits indicating the descriptors that we wait for input on. | |
| 45 These work as follows: | |
| 46 | |
| 1268 | 47 In event-tty.c we call select() directly on this |
| 48 to retrieve an event. In event-Xt.c we use | |
| 49 XtAppAddInput() and the call to select() is down in | |
| 50 the guts of Xt, but we still use the masks when checking for pending input, even in event-Xt.c. (We can't use XtAppPending() because of the presence of the signal event pipe.) | |
| 51 | |
| 428 | 52 input_wait_mask == mask of all file descriptors we select() on, |
| 53 including TTY/stream console descriptors, | |
| 54 process descriptors, and the signal event pipe. | |
| 55 | |
| 56 non_fake_input_wait_mask == same as input_wait_mask but minus the | |
| 57 signal event pipe. Also only used in | |
| 58 event-tty.c. | |
| 59 | |
| 60 process_only_mask == only the process descriptors. | |
| 61 | |
| 62 tty_only_mask == only the TTY/stream console descriptors. | |
| 63 */ | |
| 64 SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; | |
| 65 SELECT_TYPE process_only_mask, tty_only_mask; | |
| 66 | |
| 67 /* This is used to terminate the select(), when an event came in | |
| 68 through a signal (e.g. window-change or C-g on controlling TTY). */ | |
| 69 int signal_event_pipe[2]; | |
| 70 | |
| 71 int signal_event_pipe_initialized; | |
| 72 | |
| 73 int fake_event_occurred; | |
| 74 | |
| 1204 | 75 struct console * |
| 76 find_tty_or_stream_console_from_fd (int fd) | |
| 77 { | |
| 78 Lisp_Object concons; | |
| 79 | |
| 80 CONSOLE_LOOP (concons) | |
| 81 { | |
| 82 struct console *c; | |
| 83 | |
| 84 c = XCONSOLE (XCAR (concons)); | |
| 85 if ((CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) || | |
| 86 (CONSOLE_STREAM_P (c) && fileno (CONSOLE_STREAM_DATA (c)->in) == fd)) | |
| 87 return c; | |
| 88 } | |
| 89 | |
| 90 return 0; | |
| 91 } | |
| 92 | |
| 428 | 93 int |
| 771 | 94 read_event_from_tty_or_stream_desc (Lisp_Event *event, struct console *con) |
| 428 | 95 { |
| 867 | 96 Ichar ch; |
| 793 | 97 Lisp_Object console = wrap_console (con); |
| 428 | 98 |
| 771 | 99 if (CONSOLE_TTY_P (con)) |
| 867 | 100 ch = Lstream_get_ichar (XLSTREAM (CONSOLE_TTY_DATA (con)->instream)); |
| 771 | 101 else |
| 102 { | |
| 103 /* #### Definitely something strange here. We should be setting | |
| 104 the stdio handle unbuffered and reading from it instead of mixing | |
| 105 stdio and raw io calls. */ | |
| 106 int nread = retry_read (fileno (CONSOLE_STREAM_DATA (con)->in), &ch, 1); | |
| 107 if (nread <= 0) | |
| 108 ch = -1; | |
| 109 } | |
| 110 | |
| 111 if (ch < 0) | |
| 428 | 112 { |
| 113 /* deleting the console might not be safe right now ... */ | |
| 114 enqueue_magic_eval_event (io_error_delete_console, console); | |
| 115 /* but we definitely need to unselect it to avoid infinite | |
| 116 loops reading EOF's */ | |
| 117 Fconsole_disable_input (console); | |
| 118 } | |
| 119 else | |
| 120 { | |
| 1204 | 121 /* Here we really do want to set the use_console_meta_flag because |
| 122 the char is from the TTY. */ | |
| 428 | 123 character_to_event (ch, event, con, 1, 1); |
| 124 event->channel = console; | |
| 125 return 1; | |
| 126 } | |
| 127 return 0; | |
| 128 } | |
| 129 | |
| 130 void | |
| 131 signal_fake_event (void) | |
| 132 { | |
| 133 char byte = 0; | |
| 134 /* We do the write always. Formerly I tried to "optimize" this | |
| 135 by setting a flag indicating whether we're blocking and only | |
| 136 doing the write in that case, but there is a race condition | |
| 137 if the signal occurs after we've checked for the signal | |
| 138 occurrence (which could occur in many places throughout | |
| 139 an iteration of the command loop, e.g. in status_notify()), | |
| 140 but before we set the blocking flag. | |
| 141 | |
| 771 | 142 This should be OK as long as write() is reentrant, which I'm fairly |
| 143 sure it is since it's a system call. */ | |
| 428 | 144 |
| 145 if (signal_event_pipe_initialized) | |
| 146 /* In case a signal comes through while we're dumping */ | |
| 147 { | |
| 148 int old_errno = errno; | |
| 771 | 149 retry_write (signal_event_pipe[1], &byte, 1); |
| 428 | 150 errno = old_errno; |
| 151 } | |
| 152 } | |
| 153 | |
| 154 void | |
| 155 drain_signal_event_pipe (void) | |
| 156 { | |
| 157 char chars[128]; | |
| 158 /* The input end of the pipe has been set to non-blocking. */ | |
| 771 | 159 while (retry_read (signal_event_pipe[0], chars, sizeof (chars)) > 0) |
| 428 | 160 ; |
| 161 } | |
| 162 | |
| 1204 | 163 void |
| 164 drain_tty_devices (void) | |
| 165 { | |
| 166 Lisp_Object devcons, concons; | |
| 167 CONSOLE_LOOP (concons) | |
| 168 { | |
| 169 struct console *con = XCONSOLE (XCAR (concons)); | |
| 170 if (!con->input_enabled) | |
| 171 continue; | |
| 172 | |
| 173 CONSOLE_DEVICE_LOOP (devcons, con) | |
| 174 { | |
| 175 struct device *d = XDEVICE (XCAR (devcons)); | |
| 176 if (DEVICE_TTY_P (d)) | |
| 177 { | |
| 178 SELECT_TYPE temp_mask; | |
| 179 int infd = DEVICE_INFD (d); | |
| 180 | |
| 181 FD_ZERO (&temp_mask); | |
| 182 FD_SET (infd, &temp_mask); | |
| 183 | |
| 184 while (1) | |
| 185 { | |
| 186 Lisp_Object event; | |
| 187 | |
| 188 if (!poll_fds_for_input (temp_mask)) | |
| 189 break; | |
| 190 | |
| 191 event = Fmake_event (Qnil, Qnil); | |
| 192 if (!read_event_from_tty_or_stream_desc (XEVENT (event), | |
| 193 con)) | |
| 194 /* EOF, or something ... */ | |
| 195 break; | |
| 196 | |
| 197 /* queue the read event to be read for real later. */ | |
| 198 enqueue_dispatch_event (event); | |
| 199 } | |
| 200 } | |
| 201 } | |
| 202 } | |
| 203 } | |
| 204 | |
| 428 | 205 int |
| 206 event_stream_unixoid_select_console (struct console *con) | |
| 207 { | |
| 208 int infd; | |
| 209 | |
| 210 if (CONSOLE_STREAM_P (con)) | |
| 211 infd = fileno (CONSOLE_STREAM_DATA (con)->in); | |
| 212 else | |
| 213 { | |
| 214 assert (CONSOLE_TTY_P (con)); | |
| 215 infd = CONSOLE_TTY_DATA (con)->infd; | |
| 216 } | |
| 217 | |
| 218 assert (infd >= 0); | |
| 219 | |
| 220 FD_SET (infd, &input_wait_mask); | |
| 221 FD_SET (infd, &non_fake_input_wait_mask); | |
| 222 FD_SET (infd, &tty_only_mask); | |
| 223 return infd; | |
| 224 } | |
| 225 | |
| 226 int | |
| 227 event_stream_unixoid_unselect_console (struct console *con) | |
| 228 { | |
| 229 int infd; | |
| 230 | |
| 231 if (CONSOLE_STREAM_P (con)) | |
| 232 infd = fileno (CONSOLE_STREAM_DATA (con)->in); | |
| 233 else | |
| 234 { | |
| 235 assert (CONSOLE_TTY_P (con)); | |
| 236 infd = CONSOLE_TTY_DATA (con)->infd; | |
| 237 } | |
| 238 | |
| 239 assert (infd >= 0); | |
| 240 | |
| 241 FD_CLR (infd, &input_wait_mask); | |
| 242 FD_CLR (infd, &non_fake_input_wait_mask); | |
| 243 FD_CLR (infd, &tty_only_mask); | |
| 244 return infd; | |
| 245 } | |
| 246 | |
| 247 static int | |
| 440 | 248 get_process_infd (Lisp_Process *p) |
| 428 | 249 { |
| 853 | 250 Lisp_Object instr, outstr, errstr; |
| 251 get_process_streams (p, &instr, &outstr, &errstr); | |
| 428 | 252 assert (!NILP (instr)); |
| 253 return filedesc_stream_fd (XLSTREAM (instr)); | |
| 254 } | |
| 255 | |
| 853 | 256 static int |
| 257 get_process_errfd (Lisp_Process *p) | |
| 428 | 258 { |
| 853 | 259 Lisp_Object instr, outstr, errstr; |
| 260 get_process_streams (p, &instr, &outstr, &errstr); | |
| 261 if (!NILP (errstr)) | |
| 262 return filedesc_stream_fd (XLSTREAM (errstr)); | |
| 263 else | |
| 264 return -1; | |
| 428 | 265 } |
| 266 | |
| 853 | 267 void |
| 268 event_stream_unixoid_select_process (Lisp_Process *proc, int doin, int doerr, | |
| 269 int *infd, int *errfd) | |
| 428 | 270 { |
| 853 | 271 if (doin) |
| 272 { | |
| 273 *infd = get_process_infd (proc); | |
| 274 FD_SET (*infd, &input_wait_mask); | |
| 275 FD_SET (*infd, &non_fake_input_wait_mask); | |
| 276 FD_SET (*infd, &process_only_mask); | |
| 277 } | |
| 278 | |
| 279 if (doerr) | |
| 280 { | |
| 281 *errfd = get_process_errfd (proc); | |
| 428 | 282 |
| 853 | 283 if (*errfd >= 0) |
| 284 { | |
| 285 FD_SET (*errfd, &input_wait_mask); | |
| 286 FD_SET (*errfd, &non_fake_input_wait_mask); | |
| 287 FD_SET (*errfd, &process_only_mask); | |
| 288 } | |
| 289 } | |
| 290 } | |
| 291 | |
| 292 void | |
| 293 event_stream_unixoid_unselect_process (Lisp_Process *proc, int doin, int doerr, | |
| 294 int *infd, int *errfd) | |
| 295 { | |
| 296 if (doin) | |
| 297 { | |
| 298 *infd = get_process_infd (proc); | |
| 299 FD_CLR (*infd, &input_wait_mask); | |
| 300 FD_CLR (*infd, &non_fake_input_wait_mask); | |
| 301 FD_CLR (*infd, &process_only_mask); | |
| 302 } | |
| 303 | |
| 304 if (doerr) | |
| 305 { | |
| 306 *errfd = get_process_errfd (proc); | |
| 307 | |
| 308 if (*errfd >= 0) | |
| 309 { | |
| 310 FD_CLR (*errfd, &input_wait_mask); | |
| 311 FD_CLR (*errfd, &non_fake_input_wait_mask); | |
| 312 FD_CLR (*errfd, &process_only_mask); | |
| 313 } | |
| 314 } | |
| 428 | 315 } |
| 316 | |
| 317 int | |
| 318 poll_fds_for_input (SELECT_TYPE mask) | |
| 319 { | |
| 320 EMACS_TIME sometime; | |
| 321 EMACS_SELECT_TIME select_time; | |
| 322 SELECT_TYPE temp_mask; | |
| 323 int retval; | |
| 324 | |
| 325 while (1) | |
| 326 { | |
| 327 EMACS_SET_SECS_USECS (sometime, 0, 0); | |
| 328 EMACS_TIME_TO_SELECT_TIME (sometime, select_time); | |
| 329 temp_mask = mask; | |
| 330 /* To effect a poll, tell select() to block for zero seconds. */ | |
| 331 retval = select (MAXDESC, &temp_mask, 0, 0, &select_time); | |
| 332 if (retval >= 0) | |
| 333 return retval; | |
| 334 if (errno != EINTR) | |
| 335 { | |
| 336 /* Something went seriously wrong; don't abort since maybe | |
| 337 the TTY just died at the wrong time. */ | |
| 442 | 338 stderr_out ("xemacs: select failed: errno = %d\n", errno); |
| 428 | 339 return 0; |
| 340 } | |
| 341 /* else, we got interrupted by a signal, so try again. */ | |
| 342 } | |
| 343 | |
| 1204 | 344 RETURN_NOT_REACHED (0); |
| 428 | 345 } |
| 346 | |
| 347 /****************************************************************************/ | |
| 348 /* Unixoid (file descriptors based) process I/O streams routines */ | |
| 349 /****************************************************************************/ | |
| 350 | |
| 853 | 351 void |
| 352 event_stream_unixoid_create_io_streams (void* inhandle, void* outhandle, | |
| 353 void *errhandle, Lisp_Object* instream, | |
| 354 Lisp_Object* outstream, | |
| 355 Lisp_Object* errstream, | |
| 356 USID* in_usid, | |
| 357 USID* err_usid, | |
| 358 int flags) | |
| 428 | 359 { |
| 853 | 360 int infd, outfd, errfd; |
| 428 | 361 /* Decode inhandle and outhandle. Their meaning depends on |
| 362 the process implementation being used. */ | |
| 363 /* We are passed plain old file descs */ | |
| 853 | 364 infd = (int) inhandle; |
| 365 outfd = (int) outhandle; | |
| 366 errfd = (int) errhandle; | |
| 428 | 367 |
| 368 *instream = (infd >= 0 | |
| 369 ? make_filedesc_input_stream (infd, 0, -1, 0) | |
| 370 : Qnil); | |
| 371 | |
| 372 *outstream = (outfd >= 0 | |
| 373 ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK) | |
| 374 : Qnil); | |
| 375 | |
| 853 | 376 *errstream = (errfd >= 0 |
| 377 ? make_filedesc_input_stream (errfd, 0, -1, 0) | |
| 378 : Qnil); | |
| 379 | |
| 428 | 380 /* FLAGS is process->pty_flag for UNIX_PROCESSES */ |
| 381 if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0) | |
| 382 { | |
| 867 | 383 Ibyte eof_char = get_eof_char (outfd); |
| 428 | 384 int pty_max_bytes = get_pty_max_bytes (outfd); |
| 853 | 385 filedesc_stream_set_pty_flushing (XLSTREAM (*outstream), pty_max_bytes, |
| 386 eof_char); | |
| 428 | 387 } |
| 388 | |
| 853 | 389 *in_usid = FD_TO_USID (infd); |
| 390 *err_usid = FD_TO_USID (errfd); | |
| 428 | 391 } |
| 392 | |
| 853 | 393 void |
| 394 event_stream_unixoid_delete_io_streams (Lisp_Object instream, | |
| 395 Lisp_Object outstream, | |
| 396 Lisp_Object errstream, | |
| 397 USID *in_usid, | |
| 398 USID *err_usid) | |
| 428 | 399 { |
| 853 | 400 int in = (NILP (instream) ? -1 |
| 428 | 401 : filedesc_stream_fd (XLSTREAM (instream))); |
| 853 | 402 int out = (NILP (outstream) ? -1 |
| 428 | 403 : filedesc_stream_fd (XLSTREAM (outstream))); |
| 853 | 404 int err = (NILP (errstream) ? -1 |
| 405 : filedesc_stream_fd (XLSTREAM (errstream))); | |
| 428 | 406 |
| 407 if (in >= 0) | |
| 771 | 408 retry_close (in); |
| 428 | 409 if (out != in && out >= 0) |
| 771 | 410 retry_close (out); |
| 853 | 411 if (err != in && err != out && err >= 0) |
| 412 retry_close (err); | |
| 428 | 413 |
| 853 | 414 *in_usid = FD_TO_USID (in); |
| 415 *err_usid = FD_TO_USID (err); | |
| 428 | 416 } |
| 417 | |
| 418 | |
| 419 void | |
| 420 init_event_unixoid (void) | |
| 421 { | |
| 422 /* Do this first; the init_event_*_late() functions | |
| 423 pay attention to it. */ | |
| 424 if (pipe (signal_event_pipe) < 0) | |
| 425 { | |
| 426 perror ("XEmacs: can't open pipe"); | |
| 427 exit (-1); | |
| 428 } | |
| 429 signal_event_pipe_initialized = 1; | |
| 430 | |
| 431 /* Set it non-blocking so we can drain its output. */ | |
| 432 set_descriptor_non_blocking (signal_event_pipe[0]); | |
| 433 | |
| 434 /* Also set the write descriptor non-blocking so we don't | |
| 435 hang in case a long time passes between times when | |
| 436 we drain the pipe. */ | |
| 437 set_descriptor_non_blocking (signal_event_pipe[1]); | |
| 438 | |
| 439 /* WARNING: In order for the signal-event pipe to work correctly | |
| 440 and not cause lockups, the following need to be followed: | |
| 441 | |
| 442 1) event_pending_p() must ignore input on the signal-event pipe. | |
| 443 2) As soon as next_event() notices input on the signal-event | |
| 444 pipe, it must drain it. */ | |
| 445 FD_ZERO (&input_wait_mask); | |
| 446 FD_ZERO (&non_fake_input_wait_mask); | |
| 447 FD_ZERO (&process_only_mask); | |
| 448 FD_ZERO (&tty_only_mask); | |
| 449 | |
| 450 FD_SET (signal_event_pipe[0], &input_wait_mask); | |
| 451 } |