Mercurial > hg > xemacs-beta
annotate src/strftime.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 | 3d8143fc88e1 |
| children | 0a63e5de7bdc |
| rev | line source |
|---|---|
| 428 | 1 /* strftime - custom formatting of date and/or time |
| 2 Copyright (C) 1989, 1991, 1992 Free Software Foundation, 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, or (at your option) | |
| 7 any later version. | |
| 8 | |
| 9 This program is distributed in the hope that it will be useful, | |
| 10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 GNU General Public License for more details. | |
| 13 | |
| 14 You should have received a copy of the GNU General Public License | |
| 15 along with this program; see the file COPYING. If not, write to | |
| 16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 17 Boston, MA 02111-1307, USA. */ | |
| 18 | |
| 19 /* Synched up with: FSF 19.30. */ | |
| 20 | |
| 771 | 21 /* This file has been ... uhhhhh ... Mule-ized. Yeah. |
| 22 | |
| 23 (Everything here is external format. This is DANGEROUS and | |
| 24 data-lossy, but fixing it is too much of a bother now.) --ben */ | |
| 25 | |
| 428 | 26 /* Note: this version of strftime lacks locale support, |
| 27 but it is standalone. | |
| 28 | |
| 29 Performs `%' substitutions similar to those in printf. Except | |
| 30 where noted, substituted fields have a fixed size; numeric fields are | |
| 31 padded if necessary. Padding is with zeros by default; for fields | |
| 32 that display a single number, padding can be changed or inhibited by | |
| 33 following the `%' with one of the modifiers described below. Unknown | |
| 34 field specifiers are copied as normal characters. All other | |
| 35 characters are copied to the output without change. | |
| 36 | |
| 37 Supports a superset of the ANSI C field specifiers. | |
| 38 | |
| 39 Literal character fields: | |
| 40 % % | |
| 41 n newline | |
| 42 t tab | |
| 43 | |
| 44 Numeric modifiers (a nonstandard extension): | |
| 45 - do not pad the field | |
| 46 _ pad the field with spaces | |
| 47 | |
| 48 Time fields: | |
| 49 %H hour (00..23) | |
| 50 %I hour (01..12) | |
| 51 %k hour ( 0..23) | |
| 52 %l hour ( 1..12) | |
| 53 %M minute (00..59) | |
| 54 %p locale's AM or PM | |
| 55 %r time, 12-hour (hh:mm:ss [AP]M) | |
| 56 %R time, 24-hour (hh:mm) | |
| 57 %s time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension) | |
| 58 %S second (00..61) | |
| 59 %T time, 24-hour (hh:mm:ss) | |
| 60 %X locale's time representation (%H:%M:%S) | |
| 61 %Z time zone (EDT), or nothing if no time zone is determinable | |
| 62 | |
| 63 Date fields: | |
| 64 %a locale's abbreviated weekday name (Sun..Sat) | |
| 65 %A locale's full weekday name, variable length (Sunday..Saturday) | |
| 66 %b locale's abbreviated month name (Jan..Dec) | |
| 67 %B locale's full month name, variable length (January..December) | |
| 68 %c locale's date and time (Sat Nov 04 12:02:33 EST 1989) | |
| 69 %C century (00..99) | |
| 70 %d day of month (01..31) | |
| 71 %e day of month ( 1..31) | |
| 72 %D date (mm/dd/yy) | |
| 73 %h same as %b | |
| 74 %j day of year (001..366) | |
| 75 %m month (01..12) | |
| 76 %U week number of year with Sunday as first day of week (00..53) | |
| 77 %w day of week (0..6) | |
| 78 %W week number of year with Monday as first day of week (00..53) | |
| 79 %x locale's date representation (mm/dd/yy) | |
| 80 %y last two digits of year (00..99) | |
| 81 %Y year (1970...) | |
| 82 | |
| 83 David MacKenzie <djm@gnu.ai.mit.edu> */ | |
| 84 | |
| 85 #ifdef HAVE_CONFIG_H | |
| 86 #include <config.h> | |
| 87 #include "lisp.h" | |
| 88 #endif | |
| 89 | |
| 90 #include <stdio.h> | |
| 91 #include <sys/types.h> | |
| 92 #if defined(TM_IN_SYS_TIME) || (!defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)) | |
| 93 #include <sys/time.h> | |
| 94 #else | |
| 95 #include <time.h> | |
| 96 #endif | |
| 97 | |
| 98 #ifndef STDC_HEADERS | |
| 99 time_t mktime (); | |
| 100 #endif | |
| 101 | |
| 442 | 102 #if defined(WIN32_NATIVE) || defined(CYGWIN) |
| 428 | 103 #include <time.h> |
| 104 #else | |
| 105 #if defined(HAVE_TZNAME) | |
| 106 extern char *tzname[2]; | |
| 107 #endif | |
| 442 | 108 #endif /* WIN32_NATIVE */ |
| 428 | 109 |
| 110 #ifdef emacs | |
| 111 #define strftime emacs_strftime | |
| 112 #endif | |
| 113 | |
| 114 /* Types of padding for numbers in date and time. */ | |
| 115 enum padding | |
| 116 { | |
| 117 none, blank, zero | |
| 118 }; | |
| 119 | |
| 442 | 120 static char const* const days[] = |
| 428 | 121 { |
| 122 "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" | |
| 123 }; | |
| 124 | |
| 442 | 125 static char const * const months[] = |
| 428 | 126 { |
| 127 "January", "February", "March", "April", "May", "June", | |
| 128 "July", "August", "September", "October", "November", "December" | |
| 129 }; | |
| 130 | |
| 131 /* Add character C to STRING and increment LENGTH, | |
| 132 unless LENGTH would exceed MAX. */ | |
| 133 | |
| 134 #define add_char(c) do \ | |
| 135 { \ | |
| 136 if (length + 1 <= max) \ | |
| 137 string[length++] = (c); \ | |
| 138 } while (0) | |
| 139 | |
| 140 /* Add a 2 digit number to STRING, padding if specified. | |
| 141 Return the number of characters added, up to MAX. */ | |
| 142 | |
| 143 static int | |
| 144 add_num2 (char *string, int num, int max, enum padding pad) | |
| 145 { | |
| 146 int top = num / 10; | |
| 147 int length = 0; | |
| 148 | |
| 149 if (top == 0 && pad == blank) | |
| 150 add_char (' '); | |
| 151 else if (top != 0 || pad == zero) | |
| 152 add_char (top + '0'); | |
| 153 add_char (num % 10 + '0'); | |
| 154 return length; | |
| 155 } | |
| 156 | |
| 157 /* Add a 3 digit number to STRING, padding if specified. | |
| 158 Return the number of characters added, up to MAX. */ | |
| 159 | |
| 160 static int | |
| 161 add_num3 (char *string, int num, int max, enum padding pad) | |
| 162 { | |
| 163 int top = num / 100; | |
| 164 int mid = (num - top * 100) / 10; | |
| 165 int length = 0; | |
| 166 | |
| 167 if (top == 0 && pad == blank) | |
| 168 add_char (' '); | |
| 169 else if (top != 0 || pad == zero) | |
| 170 add_char (top + '0'); | |
| 171 if (mid == 0 && top == 0 && pad == blank) | |
| 172 add_char (' '); | |
| 173 else if (mid != 0 || top != 0 || pad == zero) | |
| 174 add_char (mid + '0'); | |
| 175 add_char (num % 10 + '0'); | |
| 176 return length; | |
| 177 } | |
| 178 | |
| 179 /* Like strncpy except return the number of characters copied. */ | |
| 180 | |
| 181 static int | |
| 442 | 182 add_str (char *to, const char *from, int max) |
| 428 | 183 { |
| 184 int i; | |
| 185 | |
| 186 for (i = 0; from[i] && i <= max; ++i) | |
| 187 to[i] = from[i]; | |
| 188 return i; | |
| 189 } | |
| 190 | |
| 191 static int | |
| 192 add_num_time_t (char *string, int max, time_t num) | |
| 193 { | |
| 194 /* This buffer is large enough to hold the character representation | |
| 195 (including the trailing NUL) of any unsigned decimal quantity | |
| 196 whose binary representation fits in 128 bits. */ | |
| 197 char buf[40]; | |
| 198 | |
| 199 if (sizeof (num) > 16) | |
| 2500 | 200 ABORT (); |
| 428 | 201 sprintf (buf, "%lu", (unsigned long) num); |
| 793 | 202 return add_str (string, buf, max); |
| 428 | 203 } |
| 204 | |
| 205 /* Return the week in the year of the time in TM, with the weeks | |
| 206 starting on Sundays. */ | |
| 207 | |
| 208 static int | |
| 442 | 209 sun_week (const struct tm *tm) |
| 428 | 210 { |
| 211 int dl; | |
| 212 | |
| 213 /* Set `dl' to the day in the year of the last day of the week previous | |
| 214 to the one containing the day specified in TM. If the day specified | |
| 215 in TM is in the first week of the year, `dl' will be negative or 0. | |
| 216 Otherwise, calculate the number of complete weeks before our week | |
| 217 (dl / 7) and add any partial week at the start of the year (dl % 7). */ | |
| 218 dl = tm->tm_yday - tm->tm_wday; | |
| 219 return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0); | |
| 220 } | |
| 221 | |
| 222 /* Return the week in the year of the time in TM, with the weeks | |
| 223 starting on Mondays. */ | |
| 224 | |
| 225 static int | |
| 442 | 226 mon_week (const struct tm *tm) |
| 428 | 227 { |
| 228 int dl, wday; | |
| 229 | |
| 230 if (tm->tm_wday == 0) | |
| 231 wday = 6; | |
| 232 else | |
| 233 wday = tm->tm_wday - 1; | |
| 234 dl = tm->tm_yday - wday; | |
| 235 return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0); | |
| 236 } | |
| 237 | |
| 238 #if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME) | |
| 442 | 239 char *zone_name (const struct tm *tp); |
| 428 | 240 char * |
| 442 | 241 zone_name (const struct tm *tp) |
| 428 | 242 { |
| 243 char *timezone (); | |
| 244 struct timeval tv; | |
| 245 struct timezone tz; | |
| 246 | |
| 247 gettimeofday (&tv, &tz); | |
| 248 return timezone (tz.tz_minuteswest, tp->tm_isdst); | |
| 249 } | |
| 250 #endif | |
| 251 | |
| 252 /* Format the time given in TM according to FORMAT, and put the | |
| 253 results in STRING. | |
| 254 Return the number of characters (not including terminating null) | |
| 255 that were put into STRING, or 0 if the length would have | |
| 256 exceeded MAX. */ | |
| 257 | |
| 442 | 258 size_t strftime (char *string, size_t max, const char *format, |
| 259 const struct tm *tm); | |
| 428 | 260 |
| 261 size_t | |
| 442 | 262 strftime (char *string, size_t max, const char *format, const struct tm *tm) |
| 428 | 263 { |
| 264 enum padding pad; /* Type of padding to apply. */ | |
| 265 size_t length = 0; /* Characters put in STRING so far. */ | |
| 266 | |
| 267 for (; *format && length < max; ++format) | |
| 268 { | |
| 269 if (*format != '%') | |
| 270 add_char (*format); | |
| 271 else | |
| 272 { | |
| 273 ++format; | |
| 274 /* Modifiers: */ | |
| 275 if (*format == '-') | |
| 276 { | |
| 277 pad = none; | |
| 278 ++format; | |
| 279 } | |
| 280 else if (*format == '_') | |
| 281 { | |
| 282 pad = blank; | |
| 283 ++format; | |
| 284 } | |
| 285 else | |
| 286 pad = zero; | |
| 287 | |
| 288 switch (*format) | |
| 289 { | |
| 290 /* Literal character fields: */ | |
| 291 case 0: | |
| 292 case '%': | |
| 293 add_char ('%'); | |
| 294 break; | |
| 295 case 'n': | |
| 296 add_char ('\n'); | |
| 297 break; | |
| 298 case 't': | |
| 299 add_char ('\t'); | |
| 300 break; | |
| 301 default: | |
| 302 add_char (*format); | |
| 303 break; | |
| 304 | |
| 305 /* Time fields: */ | |
| 306 case 'H': | |
| 307 case 'k': | |
| 308 length += | |
| 309 add_num2 (&string[length], tm->tm_hour, max - length, | |
| 310 *format == 'H' ? pad : blank); | |
| 311 break; | |
| 312 case 'I': | |
| 313 case 'l': | |
| 314 { | |
| 315 int hour12; | |
| 316 | |
| 317 if (tm->tm_hour == 0) | |
| 318 hour12 = 12; | |
| 319 else if (tm->tm_hour > 12) | |
| 320 hour12 = tm->tm_hour - 12; | |
| 321 else | |
| 322 hour12 = tm->tm_hour; | |
| 323 length += | |
| 324 add_num2 (&string[length], hour12, max - length, | |
| 325 *format == 'I' ? pad : blank); | |
| 326 } | |
| 327 break; | |
| 328 case 'M': | |
| 329 length += | |
| 330 add_num2 (&string[length], tm->tm_min, max - length, pad); | |
| 331 break; | |
| 332 case 'p': | |
| 333 if (tm->tm_hour < 12) | |
| 334 add_char ('A'); | |
| 335 else | |
| 336 add_char ('P'); | |
| 337 add_char ('M'); | |
| 338 break; | |
| 339 case 'r': | |
| 340 length += | |
| 341 strftime (&string[length], max - length, "%I:%M:%S %p", tm); | |
| 342 break; | |
| 343 case 'R': | |
| 344 length += | |
| 345 strftime (&string[length], max - length, "%H:%M", tm); | |
| 346 break; | |
| 347 | |
| 348 case 's': | |
| 349 { | |
| 350 struct tm writable_tm; | |
| 351 writable_tm = *tm; | |
| 352 length += add_num_time_t (&string[length], max - length, | |
| 353 mktime (&writable_tm)); | |
| 354 } | |
| 355 break; | |
| 356 | |
| 357 case 'S': | |
| 358 length += | |
| 359 add_num2 (&string[length], tm->tm_sec, max - length, pad); | |
| 360 break; | |
| 361 case 'T': | |
| 362 length += | |
| 363 strftime (&string[length], max - length, "%H:%M:%S", tm); | |
| 364 break; | |
| 365 case 'X': | |
| 366 length += | |
| 367 strftime (&string[length], max - length, "%H:%M:%S", tm); | |
| 368 break; | |
| 369 case 'Z': | |
| 370 #ifdef HAVE_TM_ZONE | |
| 371 length += add_str (&string[length], tm->tm_zone, max - length); | |
| 372 #else | |
| 373 #ifdef HAVE_TZNAME | |
| 374 if (tm->tm_isdst && tzname[1] && *tzname[1]) | |
| 375 length += add_str (&string[length], tzname[1], max - length); | |
| 376 else | |
| 377 length += add_str (&string[length], tzname[0], max - length); | |
| 378 #else | |
| 379 length += add_str (&string[length], zone_name (tm), max - length); | |
| 380 #endif | |
| 381 #endif | |
| 382 break; | |
| 383 | |
| 384 /* Date fields: */ | |
| 385 case 'a': | |
| 386 add_char (days[tm->tm_wday][0]); | |
| 387 add_char (days[tm->tm_wday][1]); | |
| 388 add_char (days[tm->tm_wday][2]); | |
| 389 break; | |
| 390 case 'A': | |
| 391 length += | |
| 392 add_str (&string[length], days[tm->tm_wday], max - length); | |
| 393 break; | |
| 394 case 'b': | |
| 395 case 'h': | |
| 396 add_char (months[tm->tm_mon][0]); | |
| 397 add_char (months[tm->tm_mon][1]); | |
| 398 add_char (months[tm->tm_mon][2]); | |
| 399 break; | |
| 400 case 'B': | |
| 401 length += | |
| 402 add_str (&string[length], months[tm->tm_mon], max - length); | |
| 403 break; | |
| 404 case 'c': | |
| 405 length += | |
| 406 strftime (&string[length], max - length, | |
| 407 "%a %b %d %H:%M:%S %Z %Y", tm); | |
| 408 break; | |
| 409 case 'C': | |
| 410 length += | |
| 411 add_num2 (&string[length], (tm->tm_year + 1900) / 100, | |
| 412 max - length, pad); | |
| 413 break; | |
| 414 case 'd': | |
| 415 length += | |
| 416 add_num2 (&string[length], tm->tm_mday, max - length, pad); | |
| 417 break; | |
| 418 case 'e': | |
| 419 length += | |
| 420 add_num2 (&string[length], tm->tm_mday, max - length, blank); | |
| 421 break; | |
| 422 case 'D': | |
| 423 length += | |
| 424 strftime (&string[length], max - length, "%m/%d/%y", tm); | |
| 425 break; | |
| 426 case 'j': | |
| 427 length += | |
| 428 add_num3 (&string[length], tm->tm_yday + 1, max - length, pad); | |
| 429 break; | |
| 430 case 'm': | |
| 431 length += | |
| 432 add_num2 (&string[length], tm->tm_mon + 1, max - length, pad); | |
| 433 break; | |
| 434 case 'U': | |
| 435 length += | |
| 436 add_num2 (&string[length], sun_week (tm), max - length, pad); | |
| 437 break; | |
| 438 case 'w': | |
| 439 add_char (tm->tm_wday + '0'); | |
| 440 break; | |
| 441 case 'W': | |
| 442 length += | |
| 443 add_num2 (&string[length], mon_week (tm), max - length, pad); | |
| 444 break; | |
| 445 case 'x': | |
| 446 length += | |
| 447 strftime (&string[length], max - length, "%m/%d/%y", tm); | |
| 448 break; | |
| 449 case 'y': | |
| 450 length += | |
| 451 add_num2 (&string[length], tm->tm_year % 100, | |
| 452 max - length, pad); | |
| 453 break; | |
| 454 case 'Y': | |
| 455 add_char ((tm->tm_year + 1900) / 1000 + '0'); | |
| 456 length += | |
| 457 add_num3 (&string[length], | |
| 458 (1900 + tm->tm_year) % 1000, max - length, zero); | |
| 459 break; | |
| 460 } | |
| 461 } | |
| 462 } | |
| 463 add_char (0); | |
| 464 return length - 1; | |
| 465 } |