Mercurial > hg > xemacs-beta
annotate netinstall/install.cc @ 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 | 6504113e7c2d |
children |
rev | line source |
---|---|
448 | 1 /* |
2 * Copyright (c) 2000, Red Hat, Inc. | |
3 * | |
4 * This program is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * A copy of the GNU General Public License can be found at | |
10 * http://www.gnu.org/ | |
11 * | |
12 * Written by DJ Delorie <dj@cygnus.com> | |
13 * | |
14 */ | |
15 | |
16 /* The purpose of this file is to intall all the packages selected in | |
17 the install list (in ini.h). Note that we use a separate thread to | |
18 maintain the progress dialog, so we avoid the complexity of | |
19 handling two tasks in one thread. We also create or update all the | |
20 files in /etc/setup and create the mount points. */ | |
21 | |
22 #include <io.h> | |
23 #include <stdio.h> | |
24 #include <stdlib.h> | |
25 #ifndef WIN32_NATIVE | |
26 #include <unistd.h> | |
27 #endif | |
28 #include <sys/types.h> | |
29 #include <sys/stat.h> | |
30 #include <errno.h> | |
31 #include <zlib.h> | |
32 | |
33 #include "win32.h" | |
34 #include "commctrl.h" | |
35 | |
36 #include "resource.h" | |
37 #include "ini.h" | |
38 #include "dialog.h" | |
39 #include "concat.h" | |
40 #include "geturl.h" | |
41 #include "mkdir.h" | |
42 #include "state.h" | |
43 #include "tar.h" | |
44 #include "diskfull.h" | |
45 #include "msg.h" | |
46 #include "regedit.h" | |
47 #include "reginfo.h" | |
48 #include "log.h" | |
49 #include "hash.h" | |
707 | 50 #include "desktop.h" |
448 | 51 #include "port.h" |
52 | |
53 static HWND ins_dialog = 0; | |
54 static HWND ins_action = 0; | |
55 static HWND ins_pkgname = 0; | |
56 static HWND ins_filename = 0; | |
57 static HWND ins_pprogress = 0; | |
58 static HWND ins_iprogress = 0; | |
59 static HWND ins_diskfull = 0; | |
60 static HANDLE init_event; | |
61 | |
62 static int total_bytes = 0; | |
63 static int total_bytes_sofar = 0; | |
64 static int package_bytes = 0; | |
65 | |
66 static BOOL | |
67 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
68 { | |
69 switch (id) | |
70 { | |
71 case IDCANCEL: | |
72 exit_setup (1); | |
73 } | |
74 return FALSE; | |
75 } | |
76 | |
77 static BOOL CALLBACK | |
78 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
79 { | |
80 switch (message) | |
81 { | |
82 case WM_INITDIALOG: | |
83 ins_dialog = h; | |
84 ins_action = GetDlgItem (h, IDC_INS_ACTION); | |
85 ins_pkgname = GetDlgItem (h, IDC_INS_PKG); | |
86 ins_filename = GetDlgItem (h, IDC_INS_FILE); | |
87 ins_pprogress = GetDlgItem (h, IDC_INS_PPROGRESS); | |
88 ins_iprogress = GetDlgItem (h, IDC_INS_IPROGRESS); | |
89 ins_diskfull = GetDlgItem (h, IDC_INS_DISKFULL); | |
90 SetEvent (init_event); | |
91 return FALSE; | |
92 case WM_COMMAND: | |
93 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
94 } | |
95 return FALSE; | |
96 } | |
97 | |
98 static DWORD WINAPI | |
99 dialog (void *) | |
100 { | |
101 MSG m; | |
102 HWND new_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_INSTATUS), | |
103 0, dialog_proc); | |
104 if (new_dialog == 0) | |
105 fatal ("create dialog"); | |
106 ShowWindow (new_dialog, SW_SHOWNORMAL); | |
107 UpdateWindow (new_dialog); | |
108 while (GetMessage (&m, 0, 0, 0) > 0) { | |
109 TranslateMessage (&m); | |
110 DispatchMessage (&m); | |
111 } | |
112 return FALSE; | |
113 } | |
114 | |
115 static void | |
116 init_dialog () | |
117 { | |
118 if (ins_dialog == 0) | |
119 { | |
120 DWORD tid; | |
121 HANDLE thread; | |
122 init_event = CreateEvent (0, 0, 0, 0); | |
123 thread = CreateThread (0, 0, dialog, 0, 0, &tid); | |
124 WaitForSingleObject (init_event, 10000); | |
125 CloseHandle (init_event); | |
126 SendMessage (ins_pprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); | |
127 SendMessage (ins_iprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); | |
128 SendMessage (ins_diskfull, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); | |
129 } | |
130 | |
131 SetWindowText (ins_pkgname, ""); | |
132 SetWindowText (ins_filename, ""); | |
133 SendMessage (ins_pprogress, PBM_SETPOS, (WPARAM) 0, 0); | |
134 SendMessage (ins_iprogress, PBM_SETPOS, (WPARAM) 0, 0); | |
135 SendMessage (ins_diskfull, PBM_SETPOS, (WPARAM) 0, 0); | |
136 ShowWindow (ins_dialog, SW_SHOWNORMAL); | |
137 SetForegroundWindow (ins_dialog); | |
138 } | |
139 | |
140 static void | |
141 progress (int bytes) | |
142 { | |
143 int perc; | |
144 | |
145 if (package_bytes > 100) | |
146 { | |
147 perc = bytes / (package_bytes / 100); | |
148 SendMessage (ins_pprogress, PBM_SETPOS, (WPARAM) perc, 0); | |
149 } | |
150 | |
151 if (total_bytes > 100) | |
152 { | |
153 perc = (total_bytes_sofar + bytes) / (total_bytes / 100); | |
154 SendMessage (ins_iprogress, PBM_SETPOS, (WPARAM) perc, 0); | |
155 } | |
156 } | |
157 | |
158 static void | |
159 badrename (char *o, char *n) | |
160 { | |
161 char *err = strerror (errno); | |
162 if (!err) | |
163 err = "(unknown error)"; | |
164 note (IDS_ERR_RENAME, o, n, err); | |
165 } | |
166 | |
167 static char *standard_dirs[] = { | |
168 0 | |
169 }; | |
170 | |
171 void | |
172 hash::add_subdirs (char *path) | |
173 { | |
174 char *nonp, *pp; | |
175 for (nonp = path; *nonp == '\\' || *nonp == '/'; nonp++); | |
176 for (pp = path + strlen(path) - 1; pp>nonp; pp--) | |
177 if (*pp == '/' || *pp == '\\') | |
178 { | |
179 int i, s=0; | |
180 char c = *pp; | |
181 *pp = 0; | |
182 for (i=0; standard_dirs[i]; i++) | |
183 if (strcmp (standard_dirs[i]+1, path) == 0) | |
184 { | |
185 s = 1; | |
186 break; | |
187 } | |
188 if (s == 0) | |
189 add (path); | |
190 *pp = c; | |
191 } | |
192 } | |
193 | |
194 char * | |
195 map_filename (char *fn, int type) | |
196 { | |
197 char *dest_file; | |
198 while (*fn == '/' || *fn == '\\') | |
199 fn++; | |
200 if (type == TY_GENERIC) | |
201 dest_file = concat (root_dir, XEMACS_PACKAGE_DIR, fn, 0); | |
202 else // TY_CYGWIN | TY_NATIVE | |
203 dest_file = concat (root_dir, "/", fn, 0); | |
204 return dest_file; | |
205 } | |
206 | |
207 static int | |
208 exists (char *file) | |
209 { | |
210 if (_access (file, 0) == 0) | |
211 return 1; | |
212 return 0; | |
213 } | |
214 | |
215 | |
216 static int num_installs, num_uninstalls; | |
217 | |
218 static void | |
219 uninstall_one (char *name, int action, int type) | |
220 { | |
221 hash dirs; | |
222 char line[_MAX_PATH]; | |
223 char* fname = (type == TY_GENERIC ? | |
224 concat (root_dir, XEMACS_PACKAGE_DIR, "pkginfo/MANIFEST.", | |
225 name, 0) : | |
226 concat (root_dir, XEMACS_SETUP_DIR, "MANIFEST.", name, 0)); | |
227 | |
228 FILE* lst = fopen (fname, "rb"); | |
229 | |
230 if (lst) | |
231 { | |
232 SetWindowText (ins_pkgname, name); | |
233 SetWindowText (ins_action, "Uninstalling..."); | |
707 | 234 // remove shortcuts and registry entries |
235 if (type != TY_GENERIC) | |
236 remove_xemacs_setup(); | |
237 | |
448 | 238 if (action == ACTION_UPGRADE) |
239 log (0, "Uninstalling old %s", name); | |
240 else | |
241 log (0, "Uninstalling %s", name); | |
242 | |
243 while (fgets (line, sizeof (line), lst)) | |
244 { | |
245 if (line[strlen(line)-1] == '\n') | |
246 line[strlen(line)-1] = 0; | |
247 | |
248 dirs.add_subdirs (line); | |
249 | |
250 char *d = map_filename (line, type); | |
251 DWORD dw = GetFileAttributes (d); | |
252 if (dw != 0xffffffff && !(dw & FILE_ATTRIBUTE_DIRECTORY)) | |
253 { | |
254 log (LOG_BABBLE, "unlink %s", d); | |
255 DeleteFile (d); | |
256 } | |
257 } | |
258 fclose (lst); | |
259 | |
260 remove (fname); | |
261 | |
262 dirs.reverse_sort (); | |
263 char *subdir = 0; | |
264 while ((subdir = dirs.enumerate (subdir)) != 0) | |
265 { | |
266 char *d = map_filename (subdir, type); | |
267 if (RemoveDirectory (d)) | |
268 log (LOG_BABBLE, "rmdir %s", d); | |
269 } | |
270 num_uninstalls ++; | |
271 } | |
272 } | |
273 | |
274 | |
275 static int | |
276 install_one (char *name, char *file, int file_size, int action, int type) | |
277 { | |
278 int errors = 0; | |
279 char *local = file, *cp, *fn, *base; | |
280 | |
281 base = local; | |
282 for (cp=local; *cp; cp++) | |
283 if (*cp == '/' || *cp == '\\' || *cp == ':') | |
284 base = cp+1; | |
819 | 285 |
448 | 286 SetWindowText (ins_pkgname, base); |
287 | |
288 if (!exists (local) && exists (base)) | |
289 local = base; | |
290 if (!exists (local)) | |
291 { | |
292 note (IDS_ERR_OPEN_READ, local, "No such file"); | |
293 return 1; | |
294 } | |
295 | |
296 char* fname = (type == TY_GENERIC ? | |
297 concat (root_dir, XEMACS_PACKAGE_DIR, "pkginfo/MANIFEST.", | |
298 name, 0) : | |
299 concat (root_dir, XEMACS_SETUP_DIR, "MANIFEST.", name, 0)); | |
300 | |
301 FILE* lst = fopen (fname, "wb"); | |
302 | |
303 package_bytes = file_size; | |
304 | |
305 switch (action) | |
306 { | |
307 case ACTION_NEW: | |
308 SetWindowText (ins_action, "Installing..."); | |
309 break; | |
310 case ACTION_UPGRADE: | |
311 SetWindowText (ins_action, "Upgrading..."); | |
312 break; | |
313 } | |
314 | |
315 log (0, "Installing %s", local); | |
316 tar_open (local); | |
317 while ((fn = tar_next_file ())) | |
318 { | |
819 | 319 char *dest_file, *disp_file; |
320 int len; | |
448 | 321 |
322 if (lst) | |
323 fprintf (lst, "%s\n", fn); | |
324 | |
325 dest_file = map_filename (fn, type); | |
819 | 326 |
327 // The installer uses a variable width font. Assume roughly 32 chars | |
328 // will fit and munge the file accordingly. | |
329 #define MAX_DISP_SIZE 50 | |
330 disp_file = strdup(dest_file); | |
331 if ((len = strlen(dest_file)) > MAX_DISP_SIZE) { | |
332 disp_file += (len - MAX_DISP_SIZE); | |
333 disp_file[0] = '.'; | |
334 disp_file[1] = '.'; | |
335 disp_file[2] = '.'; | |
336 } | |
337 #undef MAX_DISP_SIZE | |
338 SetWindowText (ins_filename, disp_file); | |
448 | 339 |
340 log (LOG_BABBLE, "Installing file %s", dest_file); | |
341 if (tar_read_file (dest_file) != 0) | |
342 { | |
343 log (0, "Unable to install file %s", dest_file); | |
344 errors ++; | |
345 } | |
346 | |
347 progress (tar_ftell ()); | |
348 num_installs ++; | |
349 } | |
350 tar_close (); | |
351 | |
352 total_bytes_sofar += file_size; | |
353 progress (0); | |
354 | |
355 int df = diskfull (root_dir); | |
356 SendMessage (ins_diskfull, PBM_SETPOS, (WPARAM) df, 0); | |
357 | |
358 if (lst) | |
359 fclose (lst); | |
360 | |
361 return errors; | |
362 } | |
363 | |
364 void | |
365 do_install (HINSTANCE h) | |
366 { | |
367 int i; | |
368 int errors = 0; | |
369 | |
370 num_installs = 0, num_uninstalls = 0; | |
371 | |
372 next_dialog = IDD_DESKTOP; | |
373 | |
374 mkdir_p (1, root_dir); | |
375 | |
376 for (i=0; standard_dirs[i]; i++) | |
377 { | |
378 char *p = concat (root_dir, standard_dirs[i], 0); | |
379 mkdir_p (1, p); | |
380 free (p); | |
381 } | |
382 | |
383 dismiss_url_status_dialog (); | |
384 | |
385 init_dialog (); | |
386 | |
387 total_bytes = 0; | |
388 total_bytes_sofar = 0; | |
389 | |
390 int df = diskfull (root_dir); | |
391 SendMessage (ins_diskfull, PBM_SETPOS, (WPARAM) df, 0); | |
392 | |
393 LOOP_PACKAGES | |
394 { | |
395 total_bytes += pi.install_size; | |
396 } | |
397 | |
398 for (i=0; i<npackages; i++) | |
399 { | |
400 if (package[i].action == ACTION_UNINSTALL | |
401 || (package[i].action == ACTION_UPGRADE && pi.install)) | |
402 { | |
403 uninstall_one (package[i].name, package[i].action, | |
404 package[i].type); | |
405 uninstall_one (concat (package[i].name, "-src", 0), package[i].action, | |
406 package[i].type); | |
407 } | |
408 | |
409 if ((package[i].action == ACTION_NEW | |
410 || package[i].action == ACTION_UPGRADE) | |
411 && pi.install) | |
412 { | |
413 int e = install_one (package[i].name, pi.install, pi.install_size, package[i].action, | |
414 package[i].type); | |
415 if (package[i].srcaction == SRCACTION_YES && pi.source) | |
416 e += install_one (concat (package[i].name, "-src", 0), pi.source, pi.source_size, | |
417 package[i].action, package[i].type); | |
418 if (e) | |
419 { | |
420 package[i].action = ACTION_ERROR; | |
421 errors++; | |
422 } | |
423 } | |
424 } // end of big package loop | |
425 | |
426 ShowWindow (ins_dialog, SW_HIDE); | |
427 | |
428 char *odbn = concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0); | |
429 char *ndbn = concat (root_dir, XEMACS_SETUP_DIR, "installed.db.new", 0); | |
430 char *sdbn = concat (root_dir, XEMACS_SETUP_DIR, "installed.db.old", 0); | |
431 | |
432 mkdir_p (0, ndbn); | |
433 | |
434 FILE *odb = fopen (odbn, "rt"); | |
435 FILE *ndb = fopen (ndbn, "wb"); | |
436 | |
437 if (!ndb) | |
438 { | |
439 char *err = strerror (errno); | |
440 if (!err) | |
441 err = "(unknown error)"; | |
442 fatal (IDS_ERR_OPEN_WRITE, ndb, err); | |
443 } | |
444 | |
445 if (odb) | |
446 { | |
447 char line[1000], pkg[1000]; | |
448 int printit; | |
449 while (fgets (line, 1000, odb)) | |
450 { | |
451 printit = 1; | |
452 sscanf (line, "%s", pkg); | |
453 for (i=0; i<npackages; i++) | |
454 { | |
455 if (strcmp (pkg, package[i].name) == 0) | |
456 switch (package[i].action) | |
457 { | |
458 case ACTION_NEW: | |
459 case ACTION_UPGRADE: | |
460 case ACTION_UNINSTALL: | |
461 printit = 0; | |
462 break; | |
463 } | |
464 } | |
465 if (printit) | |
466 fputs (line, ndb); | |
467 } | |
468 | |
469 } | |
470 | |
471 LOOP_PACKAGES | |
472 { | |
473 if (package[i].srcaction == SRCACTION_YES) | |
474 fprintf (ndb, "%s %s %d %s %d\n", package[i].name, | |
475 pi.install, pi.install_size, | |
476 pi.source, pi.source_size); | |
477 else | |
478 fprintf (ndb, "%s %s %d\n", package[i].name, | |
479 pi.install, pi.install_size); | |
480 } | |
481 | |
482 if (odb) | |
483 fclose (odb); | |
484 fclose (ndb); | |
485 | |
486 remove (sdbn); | |
487 if (odb && rename (odbn, sdbn)) | |
488 badrename (odbn, sdbn); | |
489 | |
490 remove (odbn); | |
491 if (rename (ndbn, odbn)) | |
492 badrename (ndbn, odbn); | |
493 | |
494 if (num_installs == 0 && num_uninstalls == 0) | |
495 { | |
496 exit_msg = IDS_NOTHING_INSTALLED; | |
497 return; | |
498 } | |
499 if (num_installs == 0) | |
500 { | |
501 exit_msg = IDS_UNINSTALL_COMPLETE; | |
502 return; | |
503 } | |
504 | |
505 if (errors) | |
506 exit_msg = IDS_INSTALL_INCOMPLETE; | |
507 else | |
508 exit_msg = IDS_INSTALL_COMPLETE; | |
509 } |