Mercurial > hg > xemacs-beta
view src/select-msw.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 | 04bc9d2f42c7 |
| children | 304aebb79cd3 |
line wrap: on
line source
/* mswindows selection processing for XEmacs Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 2000, 2001, 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not synched with FSF. */ /* This file Mule-ized 7-00?? Needs some Unicode review. --ben */ /* Authorship: Written by Kevin Gallo for FSF Emacs. Rewritten for mswindows by Jonathan Harris, December 1997 for 21.0. Rewritten April 2000 by Ben Wing -- support device methods, Mule-ize. Hacked by Alastair Houghton, July 2000 for enhanced clipboard support. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "frame-impl.h" #include "select.h" #include "opaque.h" #include "file-coding.h" #include "console-msw-impl.h" static int in_own_selection; /* A list of handles that we must release. Not accessible from Lisp. */ static Lisp_Object Vhandle_alist; void mswindows_handle_destroyclipboard (void) { /* We also receive a destroy message when we call EmptyClipboard() and we already own it. In this case we don't want to call handle_selection_clear() because it will remove what we're trying to add! */ if (!in_own_selection) { /* We own the clipboard and someone else wants it. Delete our cached copy of the clipboard contents so we'll ask for it from Windows again when someone does a paste, and destroy any memory objects we hold on the clipboard that are not in the list of types that Windows will delete itself. */ mswindows_destroy_selection (QCLIPBOARD); handle_selection_clear (QCLIPBOARD); } } static int mswindows_empty_clipboard (void) { int retval; in_own_selection = 1; retval = EmptyClipboard (); in_own_selection = 0; return retval; } /* Test if this is an X symbol that we understand */ static int x_sym_p (Lisp_Object value) { if (NILP (value) || INTP (value)) return 0; /* Check for some of the X symbols */ if (EQ (value, QSTRING)) return 1; if (EQ (value, QTEXT)) return 1; if (EQ (value, QCOMPOUND_TEXT)) return 1; return 0; } /* This converts a Lisp symbol to an MS-Windows clipboard format. We have symbols for all predefined clipboard formats, but that doesn't mean we support them all ;-) The name of this function is actually a lie - it also knows about integers and strings... */ static UINT symbol_to_ms_cf (Lisp_Object value) { /* If it's NIL, we're in trouble. */ if (NILP (value)) return 0; /* If it's an integer, assume it's a format ID */ if (INTP (value)) return (UINT) (XINT (value)); /* If it's a string, register the format(!) */ if (STRINGP (value)) { Extbyte *valext; LISP_STRING_TO_TSTR (value, valext); return qxeRegisterClipboardFormat (valext); } /* Check for Windows clipboard format symbols */ if (EQ (value, QCF_TEXT)) return CF_TEXT; if (EQ (value, QCF_BITMAP)) return CF_BITMAP; if (EQ (value, QCF_METAFILEPICT)) return CF_METAFILEPICT; if (EQ (value, QCF_SYLK)) return CF_SYLK; if (EQ (value, QCF_DIF)) return CF_DIF; if (EQ (value, QCF_TIFF)) return CF_TIFF; if (EQ (value, QCF_OEMTEXT)) return CF_OEMTEXT; if (EQ (value, QCF_DIB)) return CF_DIB; #ifdef CF_DIBV5 if (EQ (value, QCF_DIBV5)) return CF_DIBV5; #endif if (EQ (value, QCF_PALETTE)) return CF_PALETTE; if (EQ (value, QCF_PENDATA)) return CF_PENDATA; if (EQ (value, QCF_RIFF)) return CF_RIFF; if (EQ (value, QCF_WAVE)) return CF_WAVE; if (EQ (value, QCF_UNICODETEXT)) return CF_UNICODETEXT; if (EQ (value, QCF_ENHMETAFILE)) return CF_ENHMETAFILE; if (EQ (value, QCF_HDROP)) return CF_HDROP; if (EQ (value, QCF_LOCALE)) return CF_LOCALE; if (EQ (value, QCF_OWNERDISPLAY)) return CF_OWNERDISPLAY; if (EQ (value, QCF_DSPTEXT)) return CF_DSPTEXT; if (EQ (value, QCF_DSPBITMAP)) return CF_DSPBITMAP; if (EQ (value, QCF_DSPMETAFILEPICT)) return CF_DSPMETAFILEPICT; if (EQ (value, QCF_DSPENHMETAFILE)) return CF_DSPENHMETAFILE; return 0; } /* This converts an MS-Windows clipboard format to its corresponding Lisp symbol, or a Lisp integer otherwise. */ static Lisp_Object ms_cf_to_symbol (UINT format) { switch (format) { case CF_TEXT: return QCF_TEXT; case CF_BITMAP: return QCF_BITMAP; case CF_METAFILEPICT: return QCF_METAFILEPICT; case CF_SYLK: return QCF_SYLK; case CF_DIF: return QCF_DIF; case CF_TIFF: return QCF_TIFF; case CF_OEMTEXT: return QCF_OEMTEXT; case CF_DIB: return QCF_DIB; #ifdef CF_DIBV5 case CF_DIBV5: return QCF_DIBV5; #endif case CF_PALETTE: return QCF_PALETTE; case CF_PENDATA: return QCF_PENDATA; case CF_RIFF: return QCF_RIFF; case CF_WAVE: return QCF_WAVE; case CF_UNICODETEXT: return QCF_UNICODETEXT; case CF_ENHMETAFILE: return QCF_ENHMETAFILE; case CF_HDROP: return QCF_HDROP; case CF_LOCALE: return QCF_LOCALE; case CF_OWNERDISPLAY: return QCF_OWNERDISPLAY; case CF_DSPTEXT: return QCF_DSPTEXT; case CF_DSPBITMAP: return QCF_DSPBITMAP; case CF_DSPMETAFILEPICT: return QCF_DSPMETAFILEPICT; case CF_DSPENHMETAFILE: return QCF_DSPENHMETAFILE; default: return make_int ((int) format); } } /* Test if the specified clipboard format is auto-released by the OS. If not, we must remember the handle on Vhandle_alist, and free it if the clipboard is emptied or if we set data with the same format. */ static int cf_is_autofreed (UINT format) { switch (format) { /* This list comes from the SDK documentation */ case CF_DSPENHMETAFILE: case CF_DSPMETAFILEPICT: case CF_ENHMETAFILE: case CF_METAFILEPICT: case CF_BITMAP: case CF_DSPBITMAP: case CF_PALETTE: case CF_DIB: #ifdef CF_DIBV5 case CF_DIBV5: #endif case CF_DSPTEXT: case CF_OEMTEXT: case CF_TEXT: case CF_UNICODETEXT: return TRUE; default: return FALSE; } } /* Do protocol to assert ourself as a selection owner. Under mswindows, we: * Only set the clipboard if (eq selection-name 'CLIPBOARD) * Check if an X atom name has been passed. If so, convert to CF_TEXT (or CF_UNICODETEXT) remembering to perform LF -> CR-LF conversion. * Otherwise assume the data is formatted appropriately for the data type that was passed. Then set the clipboard as necessary. */ static Lisp_Object mswindows_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, Lisp_Object how_to_add, Lisp_Object selection_type, int UNUSED (owned_p)) { HGLOBAL hValue = NULL; UINT cfType; int is_X_type = FALSE; Lisp_Object cfObject; Lisp_Object data = Qnil; int size; void *src, *dst; struct frame *f = NULL; /* Only continue if we're trying to set the clipboard - mswindows doesn't use the same selection model as X */ if (!EQ (selection_name, QCLIPBOARD)) return Qnil; /* If this is one of the X-style atom name symbols, or NIL, convert it as appropriate */ if (NILP (selection_type) || x_sym_p (selection_type)) { /* Should COMPOUND_TEXT map to CF_UNICODETEXT? */ if (XEUNICODE_P) { cfType = CF_UNICODETEXT; cfObject = QCF_UNICODETEXT; } else { cfType = CF_TEXT; cfObject = QCF_TEXT; } is_X_type = TRUE; } else { cfType = symbol_to_ms_cf (selection_type); /* Only continue if we can figure out a clipboard type */ if (!cfType) return Qnil; cfObject = selection_type; } /* Convert things appropriately */ data = select_convert_out (selection_name, cfObject, selection_value); if (NILP (data)) return Qnil; if (CONSP (data)) { if (!EQ (XCAR (data), cfObject)) cfType = symbol_to_ms_cf (XCAR (data)); if (!cfType) return Qnil; data = XCDR (data); } /* We support opaque or string values, but we only mention string values for now... #### where do the opaque objects come from? currently they're not allowed to be exported to the lisp level! */ if (!OPAQUEP (data) && !STRINGP (data)) return Qnil; /* Find the frame */ f = selected_frame (); /* Open the clipboard */ if (!OpenClipboard (FRAME_MSWINDOWS_HANDLE (f))) return Qnil; /* Obtain the data */ if (OPAQUEP (data)) { src = XOPAQUE_DATA (data); size = XOPAQUE_SIZE (data); } else /* we do NOT append a zero byte. we don't know whether we're dealing with regular text, unicode text, binary data, etc. */ TO_EXTERNAL_FORMAT (LISP_STRING, data, MALLOC, (src, size), Qbinary); /* Allocate memory */ hValue = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, size); if (!hValue) { CloseClipboard (); xfree (src, void *); return Qnil; } dst = GlobalLock (hValue); if (!dst) { GlobalFree (hValue); CloseClipboard (); xfree (src, void *); return Qnil; } memcpy (dst, src, size); xfree (src, void *); GlobalUnlock (hValue); /* Empty the clipboard if we're replacing everything */ if (NILP (how_to_add) || EQ (how_to_add, Qreplace_all)) { if (!mswindows_empty_clipboard ()) { CloseClipboard (); GlobalFree (hValue); return Qnil; } } /* Append is currently handled in select.el; perhaps this should change, but it only really makes sense for ordinary text in any case... */ SetClipboardData (cfType, hValue); if (!cf_is_autofreed (cfType)) { Lisp_Object alist_elt = Qnil, rest; Lisp_Object cfType_int = make_int (cfType); /* First check if there's an element in the alist for this type already. */ alist_elt = assq_no_quit (cfType_int, Vhandle_alist); /* Add an element to the alist */ Vhandle_alist = Fcons (Fcons (cfType_int, make_opaque_ptr (hValue)), Vhandle_alist); if (!NILP (alist_elt)) { /* Free the original handle */ GlobalFree ((HGLOBAL) get_opaque_ptr (XCDR (alist_elt))); /* Remove the original one (adding first makes life easier, because we don't have to special case this being the first element) */ for (rest = Vhandle_alist; !NILP (rest); rest = Fcdr (rest)) if (EQ (cfType_int, Fcar (XCDR (rest)))) { XCDR (rest) = Fcdr (XCDR (rest)); break; } } } CloseClipboard (); /* #### Should really return a time, though this is because of the X model (by the looks of things) */ return Qnil; } static Lisp_Object mswindows_available_selection_types (Lisp_Object selection_name) { Lisp_Object types = Qnil; UINT format = 0; struct frame *f = NULL; if (!EQ (selection_name, QCLIPBOARD)) return Qnil; /* Find the frame */ f = selected_frame (); /* Open the clipboard */ if (!OpenClipboard (FRAME_MSWINDOWS_HANDLE (f))) return Qnil; /* [[ ajh - Should there be an unwind-protect handler around this? It could (well it probably won't, but it's always better to be safe) run out of memory and leave the clipboard open... ]] -- xemacs in general makes no provisions for out-of-memory errors; we will probably just crash. fixing this is a huge amount of work, so don't bother protecting in this case. --ben */ while ((format = EnumClipboardFormats (format))) types = Fcons (ms_cf_to_symbol (format), types); /* Close it */ CloseClipboard (); return types; } static Lisp_Object mswindows_register_selection_data_type (Lisp_Object type_name) { /* Type already checked in select.c */ Extbyte *nameext; UINT format; LISP_STRING_TO_TSTR (type_name, nameext); format = qxeRegisterClipboardFormat (nameext); if (format) return make_int ((int) format); else return Qnil; } static Lisp_Object mswindows_selection_data_type_name (Lisp_Object type_id) { UINT format; Extbyte *namebuf; int numchars; /* If it's an integer, convert to a symbol if appropriate */ if (INTP (type_id)) type_id = ms_cf_to_symbol (XINT (type_id)); /* If this is a symbol, return it */ if (SYMBOLP (type_id)) return type_id; /* Find the format code */ format = symbol_to_ms_cf (type_id); if (!format) return Qnil; /* Microsoft, stupid Microsoft */ { int size = 64; do { size *= 2; namebuf = alloca_extbytes (size * XETCHAR_SIZE); numchars = qxeGetClipboardFormatName (format, namebuf, size); } while (numchars >= size - 1); } if (numchars) return build_tstr_string (namebuf); return Qnil; } static Lisp_Object mswindows_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type) { HGLOBAL hValue = NULL; UINT cfType; Lisp_Object cfObject = Qnil, ret = Qnil, value = Qnil; int is_X_type = FALSE; int size; void *data; struct frame *f = NULL; struct gcpro gcpro1; /* Only continue if we're trying to read the clipboard - mswindows doesn't use the same selection model as X */ if (!EQ (selection_symbol, QCLIPBOARD)) return Qnil; /* If this is one of the X-style atom name symbols, or NIL, convert it as appropriate */ if (NILP (target_type) || x_sym_p (target_type)) { /* Should COMPOUND_TEXT map to CF_UNICODETEXT? */ if (XEUNICODE_P) { cfType = CF_UNICODETEXT; cfObject = QCF_UNICODETEXT; } else { cfType = CF_TEXT; cfObject = QCF_TEXT; } is_X_type = TRUE; } else { cfType = symbol_to_ms_cf (target_type); /* Only continue if we can figure out a clipboard type */ if (!cfType) return Qnil; cfObject = ms_cf_to_symbol (cfType); } /* Find the frame */ f = selected_frame (); /* Open the clipboard */ if (!OpenClipboard (FRAME_MSWINDOWS_HANDLE (f))) return Qnil; /* Read the clipboard */ hValue = GetClipboardData (cfType); if (!hValue) { CloseClipboard (); return Qnil; } /* Find the data */ size = GlobalSize (hValue); data = GlobalLock (hValue); if (!data) { CloseClipboard (); return Qnil; } /* Place it in a Lisp string */ ret = make_ext_string ((Extbyte *) data, size, Qbinary); GlobalUnlock (data); CloseClipboard (); GCPRO1 (ret); /* Convert this to the appropriate type. If we can't find anything, then we return a cons of the form (DATA-TYPE . STRING), where the string contains the raw binary data. */ value = select_convert_in (selection_symbol, cfObject, ret); UNGCPRO; if (NILP (value)) return Fcons (cfObject, ret); else return value; } static void mswindows_disown_selection (Lisp_Object selection, Lisp_Object UNUSED (timeval)) { if (EQ (selection, QCLIPBOARD)) { BOOL success = OpenClipboard (NULL); if (success) { /* the caller calls handle_selection_clear(). */ success = mswindows_empty_clipboard (); /* Close it regardless of whether empty worked. */ if (!CloseClipboard ()) success = FALSE; } /* #### return success ? Qt : Qnil; */ } } void mswindows_destroy_selection (Lisp_Object selection) { /* Do nothing if this isn't for the clipboard. */ if (!EQ (selection, QCLIPBOARD)) return; /* Right. We need to delete everything in Vhandle_alist. */ { LIST_LOOP_2 (elt, Vhandle_alist) GlobalFree ((HGLOBAL) get_opaque_ptr (XCDR (elt))); } Vhandle_alist = Qnil; } static Lisp_Object mswindows_selection_exists_p (Lisp_Object selection, Lisp_Object selection_type) { /* We used to be picky about the format, but now we support anything. */ if (EQ (selection, QCLIPBOARD)) { if (NILP (selection_type)) return CountClipboardFormats () ? Qt : Qnil; else return IsClipboardFormatAvailable (symbol_to_ms_cf (selection_type)) ? Qt : Qnil; } else return Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_select_mswindows (void) { CONSOLE_HAS_METHOD (mswindows, own_selection); CONSOLE_HAS_METHOD (mswindows, disown_selection); CONSOLE_HAS_METHOD (mswindows, selection_exists_p); CONSOLE_HAS_METHOD (mswindows, get_foreign_selection); CONSOLE_HAS_METHOD (mswindows, available_selection_types); CONSOLE_HAS_METHOD (mswindows, register_selection_data_type); CONSOLE_HAS_METHOD (mswindows, selection_data_type_name); } void syms_of_select_mswindows (void) { } void vars_of_select_mswindows (void) { /* Initialise Vhandle_alist */ Vhandle_alist = Qnil; staticpro (&Vhandle_alist); } void init_select_mswindows (void) { /* Reinitialise Vhandle_alist */ /* #### Why do we need to do this? Somehow I added this. --ben */ Vhandle_alist = Qnil; }
