Mercurial > hg > xemacs-beta
annotate src/tests.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 | d674024a8674 |
| rev | line source |
|---|---|
| 398 | 1 /* C support for testing XEmacs - see tests/automated/c-tests.el |
| 2 Copyright (C) 2000 Martin Buchholz | |
| 771 | 3 Copyright (C) 2001, 2002 Ben Wing. |
| 398 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Author: Martin Buchholz | |
| 23 | |
| 24 This file provides support for running tests for XEmacs that cannot | |
| 25 be written entirely in Lisp. These tests are run automatically via | |
| 26 tests/automated/c-tests.el, or can be run by hand using M-x */ | |
| 27 | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 #include "buffer.h" | |
| 32 #include "lstream.h" | |
| 489 | 33 #include "elhash.h" |
| 398 | 34 #include "opaque.h" |
| 35 | |
| 36 static Lisp_Object Vtest_function_list; | |
| 37 | |
| 38 | |
| 39 DEFUN ("test-data-format-conversion", Ftest_data_format_conversion, 0, 0, "", /* | |
| 40 Test TO_EXTERNAL_FORMAT() and TO_INTERNAL_FORMAT() | |
| 41 */ | |
| 42 ()) | |
| 43 { | |
| 665 | 44 void *ptr; Bytecount len; |
| 398 | 45 Lisp_Object string, opaque; |
| 46 | |
| 867 | 47 Ibyte int_foo[] = "\n\nfoo\nbar"; |
| 398 | 48 Extbyte ext_unix[]= "\n\nfoo\nbar"; |
| 49 | |
| 50 Extbyte ext_dos[] = "\r\n\r\nfoo\r\nbar"; | |
| 51 Extbyte ext_mac[] = "\r\rfoo\rbar"; | |
| 52 Lisp_Object opaque_dos = make_opaque (ext_dos, sizeof (ext_dos) - 1); | |
| 53 Lisp_Object string_foo = make_string (int_foo, sizeof (int_foo) - 1); | |
| 54 | |
| 55 Extbyte ext_latin[] = "f\372b\343\340"; | |
| 867 | 56 Ibyte int_latin1[] = "f\200\372b\200\343\200\340"; |
| 57 Ibyte int_latin2[] = "f\201\372b\201\343\201\340"; | |
| 398 | 58 #ifdef MULE |
| 59 Extbyte ext_latin12[]= "f\033-A\372b\343\340\033-B"; | |
| 60 Extbyte ext_tilde[] = "f~b~~"; | |
| 61 Lisp_Object string_latin2 = make_string (int_latin2, sizeof (int_latin2) - 1); | |
| 62 #endif | |
| 63 Lisp_Object opaque_latin = make_opaque (ext_latin, sizeof (ext_latin) - 1); | |
| 64 Lisp_Object opaque0_latin = make_opaque (ext_latin, sizeof (ext_latin)); | |
| 65 Lisp_Object string_latin1 = make_string (int_latin1, sizeof (int_latin1) - 1); | |
| 66 | |
| 67 /* Check for expected strings before and after conversion. | |
| 771 | 68 Conversions depend on whether MULE is defined. */ |
| 398 | 69 #ifdef MULE |
| 70 #define DFC_CHECK_DATA_COND_MULE(ptr,len, \ | |
| 71 constant_string_mule, \ | |
| 72 constant_string_non_mule) \ | |
| 73 DFC_CHECK_DATA (ptr, len, constant_string_mule) | |
| 74 #define DFC_CHECK_DATA_COND_MULE_NUL(ptr,len, \ | |
| 75 constant_string_mule, \ | |
| 76 constant_string_non_mule) \ | |
| 77 DFC_CHECK_DATA_NUL (ptr, len, constant_string_mule) | |
| 78 #else | |
| 79 #define DFC_CHECK_DATA_COND_MULE(ptr,len, \ | |
| 80 constant_string_mule, \ | |
| 81 constant_string_non_mule) \ | |
| 82 DFC_CHECK_DATA (ptr, len, constant_string_non_mule) | |
| 83 #define DFC_CHECK_DATA_COND_MULE_NUL(ptr,len, \ | |
| 84 constant_string_mule, \ | |
| 85 constant_string_non_mule) \ | |
| 86 DFC_CHECK_DATA_NUL (ptr, len, constant_string_non_mule) | |
| 87 #endif | |
| 88 | |
| 89 #define DFC_CHECK_DATA_COND_EOL(ptr,len, \ | |
| 90 constant_string_eol, \ | |
| 91 constant_string_non_eol) \ | |
| 92 DFC_CHECK_DATA (ptr, len, constant_string_eol) | |
| 93 #define DFC_CHECK_DATA_COND_EOL_NUL(ptr,len, \ | |
| 94 constant_string_eol, \ | |
| 95 constant_string_non_eol) \ | |
| 96 DFC_CHECK_DATA_NUL (ptr, len, constant_string_eol) | |
| 97 | |
| 98 /* Check for expected strings before and after conversion. */ | |
| 99 #define DFC_CHECK_DATA(ptr,len, constant_string) do { \ | |
| 100 assert ((len) == sizeof (constant_string) - 1); \ | |
| 101 assert (!memcmp (ptr, constant_string, len)); \ | |
| 102 } while (0) | |
| 103 | |
| 104 /* Macro version that includes the trailing NULL byte. */ | |
| 105 #define DFC_CHECK_DATA_NUL(ptr,len,constant_string) do {\ | |
| 106 assert ((len) == sizeof (constant_string)); \ | |
| 107 assert (!memcmp (ptr, constant_string, len)); \ | |
| 108 } while (0) | |
| 109 | |
| 110 #ifdef MULE | |
| 111 ptr = NULL, len = rand(); | |
| 112 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
| 113 ALLOCA, (ptr, len), | |
| 771 | 114 intern ("iso-8859-2")); |
| 398 | 115 DFC_CHECK_DATA_NUL (ptr, len, ext_latin); |
| 116 | |
| 117 ptr = NULL, len = rand(); | |
| 118 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin2, | |
| 119 ALLOCA, (ptr, len), | |
| 771 | 120 intern ("iso-8859-2")); |
| 398 | 121 DFC_CHECK_DATA (ptr, len, ext_latin); |
| 122 | |
| 123 ptr = NULL, len = rand(); | |
| 124 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
| 125 ALLOCA, (ptr, len), | |
| 771 | 126 intern ("iso-8859-2")); |
| 398 | 127 DFC_CHECK_DATA (ptr, len, ext_latin12); |
| 128 | |
| 129 ptr = NULL, len = rand(); | |
| 130 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
| 131 MALLOC, (ptr, len), | |
| 771 | 132 intern ("iso-8859-2")); |
| 398 | 133 DFC_CHECK_DATA (ptr, len, ext_latin); |
| 1726 | 134 xfree (ptr, void *); |
| 398 | 135 |
| 136 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
| 137 LISP_OPAQUE, opaque, | |
| 771 | 138 intern ("iso-8859-2")); |
| 398 | 139 DFC_CHECK_DATA (XOPAQUE_DATA (opaque), XOPAQUE_SIZE (opaque), ext_latin); |
| 140 | |
| 141 ptr = NULL, len = rand(); | |
| 142 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
| 143 ALLOCA, (ptr, len), | |
| 144 intern ("iso-8859-2")); | |
| 145 DFC_CHECK_DATA (ptr, len, int_latin2); | |
| 146 | |
| 147 ptr = NULL, len = rand(); | |
| 148 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
| 149 MALLOC, (ptr, len), | |
| 150 intern ("iso-8859-2")); | |
| 151 DFC_CHECK_DATA (ptr, len, int_latin2); | |
| 1726 | 152 xfree (ptr, void *); |
| 398 | 153 |
| 154 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
| 155 LISP_STRING, string, | |
| 156 intern ("iso-8859-2")); | |
| 157 DFC_CHECK_DATA (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
| 158 | |
| 159 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
| 160 LISP_STRING, string, | |
| 161 intern ("iso-8859-2")); | |
| 162 DFC_CHECK_DATA (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
| 163 | |
| 164 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
| 165 LISP_STRING, string, | |
| 166 intern ("iso-8859-2")); | |
| 167 DFC_CHECK_DATA_NUL (XSTRING_DATA (string), XSTRING_LENGTH (string), int_latin2); | |
| 168 | |
| 169 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
| 170 LISP_BUFFER, Fcurrent_buffer(), | |
| 171 intern ("iso-8859-2")); | |
| 172 DFC_CHECK_DATA_NUL (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), | |
| 173 sizeof (int_latin2), int_latin2); | |
| 174 | |
| 175 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
| 176 LISP_BUFFER, Fcurrent_buffer(), | |
| 177 intern ("iso-8859-1")); | |
| 178 DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), | |
| 179 sizeof (int_latin1) - 1, int_latin1); | |
| 180 | |
| 181 TO_INTERNAL_FORMAT (DATA, (ext_latin12, sizeof (ext_latin12) - 1), | |
| 182 ALLOCA, (ptr, len), | |
| 183 intern ("iso-8859-2")); | |
| 184 DFC_CHECK_DATA (ptr, len, int_latin1); | |
| 185 | |
| 186 #endif /* MULE */ | |
| 187 | |
| 188 ptr = NULL, len = rand(); | |
| 189 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 190 ALLOCA, (ptr, len), | |
| 191 Qbinary); | |
| 192 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 193 | |
| 194 ptr = NULL, len = rand(); | |
| 195 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1)), | |
| 196 ALLOCA, (ptr, len), | |
| 197 Qbinary); | |
| 198 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, ext_latin, int_latin1); | |
| 199 | |
| 200 ptr = NULL, len = rand(); | |
| 201 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2) - 1), | |
| 202 ALLOCA, (ptr, len), | |
| 771 | 203 Qbinary); |
| 398 | 204 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_tilde, int_latin2); |
| 205 | |
| 206 ptr = NULL, len = rand(); | |
| 207 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 208 ALLOCA, (ptr, len), | |
| 209 intern ("iso-8859-1")); | |
| 210 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 211 | |
| 212 | |
| 213 ptr = NULL, len = rand(); | |
| 214 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
| 215 ALLOCA, (ptr, len), | |
| 216 Qbinary); | |
| 217 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 218 | |
| 219 ptr = NULL, len = rand(); | |
| 220 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
| 221 ALLOCA, (ptr, len), | |
| 771 | 222 Qbinary); |
| 398 | 223 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); |
| 224 | |
| 225 ptr = NULL, len = rand(); | |
| 226 TO_EXTERNAL_FORMAT (LISP_STRING, string_latin1, | |
| 227 ALLOCA, (ptr, len), | |
| 228 intern ("iso-8859-1")); | |
| 229 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 230 | |
| 231 ptr = NULL, len = rand(); | |
| 232 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 233 MALLOC, (ptr, len), | |
| 234 Qbinary); | |
| 235 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 1726 | 236 xfree (ptr, void *); |
| 398 | 237 |
| 238 ptr = NULL, len = rand(); | |
| 239 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
| 240 MALLOC, (ptr, len), | |
| 771 | 241 Qbinary); |
| 398 | 242 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, ext_tilde, int_latin2); |
| 1726 | 243 xfree (ptr, void *); |
| 398 | 244 |
| 245 ptr = NULL, len = rand(); | |
| 246 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 247 MALLOC, (ptr, len), | |
| 248 intern ("iso-8859-1")); | |
| 249 DFC_CHECK_DATA_COND_MULE (ptr, len, ext_latin, int_latin1); | |
| 1726 | 250 xfree (ptr, void *); |
| 398 | 251 |
| 252 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 253 LISP_OPAQUE, opaque, | |
| 254 Qbinary); | |
| 255 DFC_CHECK_DATA_COND_MULE (XOPAQUE_DATA (opaque), | |
| 256 XOPAQUE_SIZE (opaque), ext_latin, int_latin1); | |
| 257 | |
| 258 TO_EXTERNAL_FORMAT (DATA, (int_latin2, sizeof (int_latin2)), | |
| 259 LISP_OPAQUE, opaque, | |
| 771 | 260 Qbinary); |
| 398 | 261 DFC_CHECK_DATA_COND_MULE_NUL (XOPAQUE_DATA (opaque), |
| 262 XOPAQUE_SIZE (opaque), ext_tilde, int_latin2); | |
| 263 | |
| 264 TO_EXTERNAL_FORMAT (DATA, (int_latin1, sizeof (int_latin1) - 1), | |
| 265 LISP_OPAQUE, opaque, | |
| 266 intern ("iso-8859-1")); | |
| 267 DFC_CHECK_DATA_COND_MULE (XOPAQUE_DATA (opaque), | |
| 268 XOPAQUE_SIZE (opaque), ext_latin, int_latin1); | |
| 269 | |
| 270 ptr = NULL, len = rand(); | |
| 271 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
| 272 ALLOCA, (ptr, len), | |
| 273 Qbinary); | |
| 274 DFC_CHECK_DATA_COND_MULE (ptr, len, int_latin1, ext_latin); | |
| 275 | |
| 276 ptr = NULL, len = rand(); | |
| 277 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
| 278 ALLOCA, (ptr, len), | |
| 279 intern ("iso-8859-1")); | |
| 280 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
| 281 | |
| 282 ptr = NULL, len = rand(); | |
| 283 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
| 284 MALLOC, (ptr, len), | |
| 285 intern ("iso-8859-1")); | |
| 286 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
| 1726 | 287 xfree (ptr, void *); |
| 398 | 288 |
| 289 ptr = NULL, len = rand(); | |
| 290 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin)), | |
| 291 MALLOC, (ptr, len), | |
| 292 Qnil); | |
| 293 DFC_CHECK_DATA_COND_MULE_NUL (ptr, len, int_latin1, ext_latin); | |
| 1726 | 294 xfree (ptr, void *); |
| 398 | 295 |
| 296 TO_INTERNAL_FORMAT (DATA, (ext_latin, sizeof (ext_latin) - 1), | |
| 297 LISP_STRING, string, | |
| 298 intern ("iso-8859-1")); | |
| 299 DFC_CHECK_DATA_COND_MULE (XSTRING_DATA (string), | |
| 300 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
| 301 | |
| 302 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_latin, | |
| 303 LISP_STRING, string, | |
| 304 intern ("iso-8859-1")); | |
| 305 DFC_CHECK_DATA_COND_MULE (XSTRING_DATA (string), | |
| 306 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
| 307 | |
| 308 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque0_latin, | |
| 309 LISP_STRING, string, | |
| 310 intern ("iso-8859-1")); | |
| 311 DFC_CHECK_DATA_COND_MULE_NUL (XSTRING_DATA (string), | |
| 312 XSTRING_LENGTH (string), int_latin1, ext_latin); | |
| 313 | |
| 314 | |
| 315 ptr = NULL, len = rand(); | |
| 316 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)), | |
| 317 MALLOC, (ptr, len), | |
| 771 | 318 Qbinary); |
| 398 | 319 DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo); |
| 1726 | 320 xfree (ptr, void *); |
| 398 | 321 |
| 322 ptr = NULL, len = rand(); | |
| 323 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
| 324 LISP_OPAQUE, opaque, | |
| 325 intern ("raw-text-mac")); | |
| 326 DFC_CHECK_DATA_COND_EOL (XOPAQUE_DATA (opaque), | |
| 327 XOPAQUE_SIZE (opaque), ext_mac, int_foo); | |
| 328 | |
| 329 ptr = NULL, len = rand(); | |
| 330 TO_EXTERNAL_FORMAT (LISP_STRING, string_foo, | |
| 331 ALLOCA, (ptr, len), | |
| 332 intern ("raw-text-dos")); | |
| 333 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo); | |
| 334 | |
| 335 ptr = NULL, len = rand(); | |
| 336 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
| 337 ALLOCA, (ptr, len), | |
| 338 intern ("raw-text-unix")); | |
| 339 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_unix, int_foo); | |
| 340 | |
| 341 ptr = NULL, len = rand(); | |
| 342 TO_EXTERNAL_FORMAT (LISP_STRING, string_foo, | |
| 343 MALLOC, (ptr, len), | |
| 344 intern ("no-conversion-mac")); | |
| 345 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_mac, int_foo); | |
| 1726 | 346 xfree (ptr, void *); |
| 398 | 347 |
| 348 ptr = NULL, len = rand(); | |
| 349 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo) - 1), | |
| 350 ALLOCA, (ptr, len), | |
| 771 | 351 intern ("no-conversion-dos")); |
| 398 | 352 DFC_CHECK_DATA_COND_EOL (ptr, len, ext_dos, int_foo); |
| 353 | |
| 354 ptr = NULL, len = rand(); | |
| 355 TO_EXTERNAL_FORMAT (DATA, (int_foo, sizeof (int_foo)), | |
| 356 ALLOCA, (ptr, len), | |
| 357 intern ("no-conversion-unix")); | |
| 358 DFC_CHECK_DATA_COND_EOL_NUL (ptr, len, ext_unix, int_foo); | |
| 359 | |
| 360 TO_INTERNAL_FORMAT (LISP_OPAQUE, opaque_dos, | |
| 361 LISP_BUFFER, Fcurrent_buffer(), | |
| 362 intern ("undecided")); | |
| 826 | 363 /* &&#### needs some 8-bit work here */ |
| 398 | 364 DFC_CHECK_DATA (BUF_BYTE_ADDRESS (current_buffer, BUF_PT (current_buffer)), |
| 365 sizeof (int_foo) - 1, int_foo); | |
| 366 | |
| 367 TO_INTERNAL_FORMAT (DATA, (ext_mac, sizeof (ext_mac) - 1), | |
| 368 LISP_STRING, string, | |
| 369 intern ("iso-8859-1")); | |
| 370 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
| 371 XSTRING_LENGTH (string), int_foo, ext_mac); | |
| 372 | |
| 373 { | |
| 374 Lisp_Object stream = | |
| 375 make_fixed_buffer_input_stream (ext_dos, sizeof (ext_dos) - 1); | |
| 376 TO_INTERNAL_FORMAT (LISP_LSTREAM, stream, | |
| 377 LISP_STRING, string, | |
| 378 intern ("iso-8859-1")); | |
| 379 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
| 380 XSTRING_LENGTH (string), int_foo, ext_dos); | |
| 381 } | |
| 382 | |
| 383 TO_INTERNAL_FORMAT (DATA, (ext_unix, sizeof (ext_unix) - 1), | |
| 384 LISP_STRING, string, | |
| 385 intern ("no-conversion")); | |
| 386 DFC_CHECK_DATA_COND_EOL (XSTRING_DATA (string), | |
| 387 XSTRING_LENGTH (string), int_foo, ext_unix); | |
| 388 | |
| 389 | |
| 390 ptr = NULL, len = rand(); | |
| 391 TO_EXTERNAL_FORMAT (LISP_OPAQUE, opaque_dos, | |
| 392 ALLOCA, (ptr, len), | |
| 393 Qbinary); | |
| 394 DFC_CHECK_DATA (ptr, len, ext_dos); | |
| 395 | |
| 396 return intern ("PASS"); | |
| 397 } | |
| 398 | |
| 399 | |
| 489 | 400 /* Hash Table testing */ |
| 401 | |
| 402 typedef struct | |
| 403 { | |
| 404 Lisp_Object hash_table; | |
| 405 EMACS_INT sum; | |
| 406 } test_hash_tables_data; | |
| 407 | |
| 408 | |
| 409 static int | |
| 2286 | 410 test_hash_tables_mapper (Lisp_Object UNUSED (key), Lisp_Object value, |
| 489 | 411 void *extra_arg) |
| 412 { | |
| 413 test_hash_tables_data *p = (test_hash_tables_data *) extra_arg; | |
| 414 p->sum += XINT (value); | |
| 415 return 0; | |
| 416 } | |
| 417 | |
| 418 static int | |
| 419 test_hash_tables_modifying_mapper (Lisp_Object key, Lisp_Object value, | |
| 420 void *extra_arg) | |
| 421 { | |
| 422 test_hash_tables_data *p = (test_hash_tables_data *) extra_arg; | |
| 423 Fputhash (make_int (- XINT (key)), | |
| 424 make_int (2 * XINT (value)), | |
| 425 p->hash_table); | |
| 426 p->sum += XINT (value); | |
| 427 return 0; | |
| 428 } | |
| 429 | |
| 430 static int | |
| 2286 | 431 test_hash_tables_predicate (Lisp_Object key, |
| 432 Lisp_Object UNUSED (value), | |
| 433 void *UNUSED (extra_arg)) | |
| 489 | 434 { |
| 435 return XINT (key) < 0; | |
| 436 } | |
| 437 | |
| 438 | |
| 439 DEFUN ("test-hash-tables", Ftest_hash_tables, 0, 0, "", /* | |
| 440 Test C interface to hash tables. | |
| 441 */ | |
| 442 ()) | |
| 443 { | |
| 444 test_hash_tables_data data; | |
| 445 data.hash_table = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, | |
| 446 HASH_TABLE_EQUAL); | |
| 447 | |
| 448 Fputhash (make_int (1), make_int (2), data.hash_table); | |
| 449 Fputhash (make_int (3), make_int (4), data.hash_table); | |
| 450 | |
| 451 data.sum = 0; | |
| 452 elisp_maphash_unsafe (test_hash_tables_mapper, | |
| 453 data.hash_table, (void *) &data); | |
| 454 assert (data.sum == 2 + 4); | |
| 455 | |
| 456 data.sum = 0; | |
| 457 elisp_maphash (test_hash_tables_modifying_mapper, | |
| 458 data.hash_table, (void *) &data); | |
| 459 assert (data.sum == 2 + 4); | |
| 460 | |
| 461 /* hash table now contains: (1, 2) (3, 4) (-1, 2*2) (-3, 2*4) */ | |
| 462 | |
| 463 data.sum = 0; | |
| 464 elisp_maphash_unsafe (test_hash_tables_mapper, | |
| 465 data.hash_table, (void *) &data); | |
| 466 assert (data.sum == 3 * (2 + 4)); | |
| 467 | |
| 468 /* Remove entries with negative keys, added by modifying mapper */ | |
| 469 elisp_map_remhash (test_hash_tables_predicate, | |
| 470 data.hash_table, 0); | |
| 471 | |
| 472 data.sum = 0; | |
| 473 elisp_maphash_unsafe (test_hash_tables_mapper, | |
| 474 data.hash_table, (void *) &data); | |
| 475 assert (data.sum == 2 + 4); | |
| 476 | |
| 477 return intern ("PASS"); | |
| 478 } | |
| 479 | |
| 480 | |
| 398 | 481 |
| 2720 | 482 #ifdef MC_ALLOC |
| 483 #define TESTS_DEFSUBR(Fname) do { \ | |
| 484 DEFSUBR_MC_ALLOC (Fname); \ | |
| 485 defsubr (S##Fname); \ | |
| 486 Vtest_function_list = \ | |
| 487 Fcons (intern (subr_name (S##Fname)), \ | |
| 488 Vtest_function_list); \ | |
| 489 } while (0) | |
| 490 #else /* not MC_ALLOC */ | |
| 398 | 491 #define TESTS_DEFSUBR(Fname) do { \ |
| 492 DEFSUBR (Fname); \ | |
| 493 Vtest_function_list = \ | |
| 494 Fcons (intern (subr_name (&S##Fname)), \ | |
| 495 Vtest_function_list); \ | |
| 496 } while (0) | |
| 2720 | 497 #endif /* not MC_ALLOC */ |
| 398 | 498 |
| 499 void | |
| 500 syms_of_tests (void) | |
| 501 { | |
| 502 Vtest_function_list = Qnil; | |
| 503 | |
| 504 TESTS_DEFSUBR (Ftest_data_format_conversion); | |
| 489 | 505 TESTS_DEFSUBR (Ftest_hash_tables); |
| 398 | 506 /* Add other test functions here with TESTS_DEFSUBR */ |
| 507 } | |
| 508 | |
| 509 void | |
| 510 vars_of_tests (void) | |
| 511 { | |
| 512 DEFVAR_LISP ("test-function-list", &Vtest_function_list /* | |
| 513 List of all test functions defined in tests.c. | |
| 514 For use by the automated test suite. See tests/automated/c-tests. | |
| 515 */ ); | |
| 516 } |