Mercurial > hg > xemacs-beta
view src/nas.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 | ecf1ebac70d8 |
| children | 6c7605dfcf07 |
line wrap: on
line source
/* nas.c --- XEmacs support for the Network Audio System server. * * Author: Richard Caley <R.Caley@ed.ac.uk> * * Copyright 1994 Free Software Foundation, Inc. * Copyright 1993 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation, and that the name Network Computing Devices, Inc. not be * used in advertising or publicity pertaining to distribution of this * software without specific, written prior permission. * * THIS SOFTWARE IS PROVIDED 'AS-IS'. NETWORK COMPUTING DEVICES, INC., * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, * OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF * WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ /* There are four compile-time options. * * XTOOLKIT This will be part of an Xt program. * * XTEVENTS The playing will be supervised asynchronously by the Xt event * loop. If not set, playing will be completed within the call * to play_file etc. * * ROBUST_PLAY Causes errors in nas to be caught. This means that the * program will attempt not to die if the nas server does. * * CACHE_SOUNDS Causes the sounds to be played in buckets in the NAS * server. They are named by their comment field, or if that is * empty by the filename, or for play_sound_data by a name made up * from the sample itself. */ /* CHANGES: * 10/8/94, rjc Changed names from netaudio to nas * Added back asynchronous play if nas library has * correct error facilities. * 4/11/94, rjc Added wait_for_sounds to be called when user wants to * be sure all play has finished. * 1998-10-01 rlt Added support for WAVE files. * 2002-10-16 Jon Trulson modifed this to work with NAS releases * 1.5f and higher. We were using the private variable * SoundFileInfo that doesn't exist anymore. But preserve * backward compatibility. This will not work for some * versions of NAS around 1.5b to 1.5f or so. Known to * work on 1.2p5 and 1.6. */ #include <config.h> #include "lisp.h" #include "sound.h" #include "sysdep.h" #include "syssignal.h" /* NAS <= 1.2p5 defines {BIG,LITTLE}_ENDIAN in <audio/fileutil.h>, conflicting with GNU libc (at least); newer versions avoid this name space pollution. DO NOT USE THOSE MACROS in this file. Use NAS_{BIG,LITTLE}_ENDIAN. It would be slightly more reliable to do this via configure, but that seems unnecessarily complex. */ #undef LITTLE_ENDIAN #undef BIG_ENDIAN BEGIN_C_DECLS #include <audio/audiolib.h> #include <audio/soundlib.h> #include <audio/snd.h> #include <audio/wave.h> #include <audio/fileutil.h> END_C_DECLS /* NAS <= 1.2p5 <audio/fileutil.h> doesn't define the NAS_ versions */ #ifndef NAS_LITTLE_ENDIAN # define NAS_LITTLE_ENDIAN LITTLE_ENDIAN # define NAS_BIG_ENDIAN BIG_ENDIAN #endif #define XTOOLKIT #define XTEVENTS #define ROBUST_PLAY #define CACHE_SOUNDS /* * For old NAS libraries, force playing to be synchronous * and declare the long jump point locally. */ #if defined (NAS_NO_ERROR_JUMP) # undef XTEVENTS # include <setjmp.h> jmp_buf AuXtErrorJump; #endif #ifdef XTOOLKIT # include <X11/Intrinsic.h> # include <audio/Xtutil.h> #endif /* audiolib <= some version doesn't define major and minor versions */ /* Do NOT use AudioLibraryVersion in this file. */ #ifndef AudioLibraryVersion #define AudioLibraryVersion 1 #endif #ifndef AudioLibraryVersionMajor #define AudioLibraryVersionMajor AudioLibraryVersion #endif #ifndef AudioLibraryVersionMinor #define AudioLibraryVersionMinor 0 #endif #if defined (ROBUST_PLAY) static AuBool CatchIoErrorAndJump (AuServer *aud); static AuBool CatchErrorAndJump (AuServer *aud, AuErrorEvent *event); SIGTYPE sigpipe_handle (int signo); #endif extern Lisp_Object Vsynchronous_sounds; static Sound SoundOpenDataForReading (Binbyte *data, int length); static AuServer *aud; /* count of sounds currently being played. */ static int sounds_in_play; #ifdef XTOOLKIT static Display *aud_server; static XtInputId input_id; #else static Extbyte *aud_server; #endif /* XTOOLKIT */ Extbyte * nas_init_play ( #ifdef XTOOLKIT Display *display #else Extbyte *server #endif ); Extbyte * nas_init_play ( #ifdef XTOOLKIT Display *display #else Extbyte *server #endif ) { Extbyte *err_message; SIGTYPE (*old_sigpipe) (int); #ifdef XTOOLKIT Extbyte * server = DisplayString (display); XtAppContext app_context = XtDisplayToApplicationContext (display); aud_server = display; #else aud_server = server; #endif #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump)) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); start_interrupts (); return "error in NAS"; } #endif #if defined (ROBUST_PLAY) && !defined (NAS_NO_ERROR_JUMP) AuDefaultIOErrorHandler = CatchIoErrorAndJump; AuDefaultErrorHandler = CatchErrorAndJump; #endif stop_interrupts (); aud = AuOpenServer (server, 0, NULL, 0, NULL, &err_message); start_interrupts (); if (!aud) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif if (err_message == NULL) return "Can't connect to audio server"; else return err_message; } #if defined (ROBUST_PLAY) # if defined (NAS_NO_ERROR_JUMP) aud->funcs.ioerror_handler = CatchIoErrorAndJump; aud->funcs.error_handler = CatchErrorAndJump; # else /* !NAS_NO_ERROR_JUMP */ AuDefaultIOErrorHandler = NULL; AuDefaultErrorHandler = NULL; # endif #endif #ifdef XTEVENTS input_id = AuXtAppAddAudioHandler (app_context, aud); #endif #ifdef CACHE_SOUNDS AuSetCloseDownMode (aud, AuCloseDownRetainPermanent, NULL); #endif #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif sounds_in_play = 0; return NULL; } static void nas_close_down_play (void) { AuCloseServer (aud); sound_warn ("disconnected from audio server"); } /********************************************************************\ * * * Callback which is run when the sound finishes playing. * * * \********************************************************************/ static void doneCB (AuServer *UNUSED (auserver), AuEventHandlerRec *UNUSED (handler), AuEvent *UNUSED (ev), AuPointer data) { int *in_play_p = (int *) data; (*in_play_p) --; } #ifdef CACHE_SOUNDS /********************************************************************\ * * * Play a sound by playing the relevant bucket, if any or * * downloading it if not. * * * \********************************************************************/ static void do_caching_play (Sound s, int volume, Binbyte *buf) { AuBucketAttributes *list, b; AuBucketID id; int n; AuSetString (AuBucketDescription (&b), AuStringLatin1, strlen (SoundComment (s)), SoundComment (s)); list = AuListBuckets (aud, AuCompCommonDescriptionMask, &b, &n, NULL); if (list == NULL) { AuPointer my_buf; if (buf==NULL) { if ((my_buf= (AuPointer) malloc (SoundNumBytes (s)))==NULL) { return; } if (SoundReadFile ((Extbyte *) my_buf, SoundNumBytes (s), s) != SoundNumBytes (s)) { free (my_buf); return; } } else my_buf = (AuPointer) buf; id = AuSoundCreateBucketFromData (aud, s, my_buf, AuAccessAllMasks, NULL, NULL); if (buf == NULL) free (my_buf); } else /* found cached sound */ { id = AuBucketIdentifier (list); AuFreeBucketAttributes (aud, n, list); } sounds_in_play++; AuSoundPlayFromBucket (aud, id, AuNone, AuFixedPointFromFraction (volume, 100), doneCB, (AuPointer) &sounds_in_play, 1, NULL, NULL, NULL, NULL); } #endif /* CACHE_SOUNDS */ void nas_wait_for_sounds (void); void nas_wait_for_sounds (void) { AuEvent ev; while (sounds_in_play>0) { AuNextEvent (aud, AuTrue, &ev); AuDispatchEvent (aud, &ev); } } int nas_play_sound_file (Extbyte *sound_file, int volume); int nas_play_sound_file (Extbyte *sound_file, int volume) { SIGTYPE (*old_sigpipe) (int); #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump)) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); return 0; } #endif if (aud==NULL) { if (aud_server != NULL) { Extbyte *m; /* attempt to reconect */ if ((m = nas_init_play (aud_server)) != NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } else { sound_warn ("Attempt to play with no audio init\n"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } #ifndef CACHE_SOUNDS sounds_in_play++; AuSoundPlayFromFile (aud, sound_file, AuNone, AuFixedPointFromFraction (volume,100), doneCB, (AuPointer) &sounds_in_play, NULL, NULL, NULL, NULL); #else /* Cache the sounds in buckets on the server */ { Sound s; if ((s = SoundOpenFileForReading (sound_file))==NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } if (SoundComment (s) == NULL || SoundComment (s)[0] == '\0') { SoundComment (s) = FileCommentFromFilename (sound_file); } do_caching_play (s, volume, NULL); SoundCloseFile (s); } #endif /* CACHE_SOUNDS */ #ifndef XTEVENTS nas_wait_for_sounds (); #else if (!NILP (Vsynchronous_sounds)) nas_wait_for_sounds (); #endif #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 1; } int nas_play_sound_data (Binbyte *data, int length, int volume); int nas_play_sound_data (Binbyte *data, int length, int volume) { Sound s; int offset; SIGTYPE (*old_sigpipe) (int); #if !defined (XTEVENTS) AuEvent ev; #endif #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump) != 0) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); return 0; } #endif if (aud == NULL) { if (aud_server != NULL) { Extbyte *m; /* attempt to reconect */ if ((m = nas_init_play (aud_server)) != NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } else { sound_warn ("Attempt to play with no audio init\n"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } if ((s=SoundOpenDataForReading (data, length))==NULL) { sound_warn ("unknown sound type"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } if (SoundFileFormat (s) == SoundFileFormatSnd) { /* hack, hack */ offset = ((SndInfo *) (s->formatInfo))->h.dataOffset; } else if (SoundFileFormat (s) == SoundFileFormatWave) { offset = ((WaveInfo *) (s->formatInfo))->dataOffset; } else { sound_warn ("only understand snd and wave files at the moment"); SoundCloseFile (s); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } #ifndef CACHE_SOUNDS sounds_in_play++; AuSoundPlayFromData (aud, s, data+offset, AuNone, AuFixedPointFromFraction (volume,100), doneCB, (AuPointer) &sounds_in_play, NULL, NULL, NULL, NULL); #else /* Cache the sounds in buckets on the server */ do_caching_play (s, volume, data+offset); #endif /* CACHE_SOUNDS */ #ifndef XTEVENTS nas_wait_for_sounds (); #else if (!NILP (Vsynchronous_sounds)) nas_wait_for_sounds (); #endif SoundCloseFile (s); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 1; } #if defined (ROBUST_PLAY) /********************************************************************\ * * * Code to protect the client from server shutdowns. * * * * This is unbelievably horrible. * * * \********************************************************************/ static AuBool CatchIoErrorAndJump (AuServer *old_aud) { if (old_aud) sound_warn ("Audio Server connection broken"); else sound_warn ("Audio Server connection broken because of signal"); #ifdef XTEVENTS #ifdef XTOOLKIT AuXtAppRemoveAudioHandler (aud, input_id); #endif if (aud) AuCloseServer (aud); aud = NULL; sounds_in_play = 0; longjmp (AuXtErrorJump, 1); #else /* not XTEVENTS */ if (aud) AuCloseServer (aud); aud = NULL; sounds_in_play = 0; longjmp (AuXtErrorJump, 1); #endif /* XTEVENTS */ return 0; } SIGTYPE sigpipe_handle (int UNUSED (signo)) { CatchIoErrorAndJump (NULL); } static AuBool CatchErrorAndJump (AuServer *old_aud, AuErrorEvent *UNUSED (event)) { return CatchIoErrorAndJump (old_aud); } #endif /* ROBUST_PLAY */ /********************************************************************\ * * * This code is here because the nas Sound library doesn't * * support playing from a file buffered in memory. It's a fairly * * direct translation of the file-based equivalent. * * * * Since we don't have a filename, samples with no comment field * * are named by a section of their content. * * * \********************************************************************/ /* Create a name from the sound. */ static Extbyte * NameFromData (const CBinbyte *buf, int len) { Extbyte name[9]; int i; Extbyte *s; buf+=len/2; len -= len/2; i=0; while (i<8 && len >0) { while (*buf < 32 && len>0) { buf++; len--; } name[i]= *buf; i++; buf++; len--; } name[i]='\0'; if (i==8) { strcpy (s = (Extbyte *) malloc (10), name); } else { strcpy (s = (Extbyte *) malloc (15), "short sound"); } return s; } /* Code to do a pseudo-open on a data buffer. Only for snd files at the moment. */ static SndInfo * SndOpenDataForReading (const CBinbyte *data, int length) { SndInfo *si; int size; if (!(si = (SndInfo *) malloc (sizeof (SndInfo)))) return NULL; si->comment = NULL; si->writing = 0; memcpy (&si->h, data, sizeof (SndHeader)); if (NAS_LITTLE_ENDIAN) { CBinbyte n; swapl (&si->h.magic, n); swapl (&si->h.dataOffset, n); swapl (&si->h.dataSize, n); swapl (&si->h.format, n); swapl (&si->h.sampleRate, n); swapl (&si->h.tracks, n); } if (si->h.magic != SND_MAGIC_NUM) { free (si); return NULL; } size = si->h.dataOffset - sizeof (SndHeader); if (size) { if (!(si->comment = (Extbyte *) malloc (size + 1))) { free (si); return NULL; } memcpy (si->comment, data+sizeof (SndHeader), size); *(si->comment + size) = 0; if (*si->comment == '\0') si->comment = NameFromData (data+si->h.dataOffset, length-si->h.dataOffset); } else si->comment = NameFromData (data+si->h.dataOffset, length-si->h.dataOffset); si->h.dataSize = length-si->h.dataOffset; si->fp=NULL; return si; } /* Stuff taken from wave.c from NAS. Just like snd files, NAS can't read wave data from memory, so these functions do that for us. */ #define Err() { return NULL; } #define readFourcc(_f) dread(_f, sizeof(RIFF_FOURCC), 1) #define cmpID(_x, _y) \ strncmp((CBinbyte *) (_x), (CBinbyte *) (_y), sizeof(RIFF_FOURCC)) #define PAD2(_x) (((_x) + 1) & ~1) /* These functions here are for faking file I/O from buffer. */ /* The "file" position */ static size_t file_posn; /* The length of the "file" */ static size_t file_len; /* The actual "file" data. */ static const void* file_data; /* Like fopen, but for a buffer in memory */ static void dopen (const void* data, size_t length) { file_data = data; file_len = length; file_posn = 0; } /* Like fread, but for a buffer in memory */ static int dread (void* buf, size_t size, size_t nitems) { size_t nread = size * nitems; if (file_posn + nread <= file_len) { memcpy(buf, (CBinbyte *) file_data + file_posn, size * nitems); file_posn += nread; return nitems; } else { return EOF; } } /* Like fgetc, but for a buffer in memory */ static int dgetc (void) { if (file_posn < file_len) return ((CBinbyte *)file_data)[file_posn++]; else return -1; } /* Like fseek, but for a buffer in memory */ static int dseek (long offset, int from) { if (from == 0) file_posn = offset; else if (from == 1) file_posn += offset; else if (from == 2) file_posn = file_len + offset; return 0; } /* Like ftell, but for a buffer in memory */ static long dtell (void) { return file_posn; } /* Data buffer analogs for FileReadS and FileReadL in NAS. */ static unsigned short DataReadS (int swapit) { unsigned short us; dread(&us, 2, 1); if (swapit) us = FileSwapS(us); return us; } static AuUint32 DataReadL (int swapit) { AuUint32 ul; dread(&ul, 4, 1); if (swapit) ul = FileSwapL(ul); return ul; } static int readChunk (RiffChunk *c) { int status; CBinbyte n; if ((status = dread(c, sizeof(RiffChunk), 1))) if (NAS_BIG_ENDIAN) swapl(&c->ckSize, n); return status; } /* A very straight-forward translation of WaveOpenFileForReading to read the wave data from a buffer in memory. */ static WaveInfo * WaveOpenDataForReading (const CBinbyte *data, int length) { RiffChunk ck; RIFF_FOURCC fourcc; AuInt32 fileSize; WaveInfo *wi; if (!(wi = (WaveInfo *) malloc(sizeof(WaveInfo)))) return NULL; wi->comment = NULL; wi->dataOffset = wi->format = wi->writing = 0; dopen(data, length); if (!readChunk(&ck) || cmpID(&ck.ckID, RIFF_RiffID) || !readFourcc(&fourcc) || cmpID(&fourcc, RIFF_WaveID)) Err(); fileSize = PAD2(ck.ckSize) - sizeof(RIFF_FOURCC); while (fileSize >= (AuInt32) sizeof(RiffChunk)) { if (!readChunk(&ck)) Err(); fileSize -= sizeof(RiffChunk) + PAD2(ck.ckSize); /* LIST chunk */ if (!cmpID(&ck.ckID, RIFF_ListID)) { if (!readFourcc(&fourcc)) Err(); /* INFO chunk */ if (!cmpID(&fourcc, RIFF_ListInfoID)) { ck.ckSize -= sizeof(RIFF_FOURCC); while (ck.ckSize) { RiffChunk c; if (!readChunk(&c)) Err(); /* ICMT chunk */ if (!cmpID(&c.ckID, RIFF_InfoIcmtID)) { if (!(wi->comment = (Extbyte *) malloc(c.ckSize)) || !dread(wi->comment, c.ckSize, 1)) Err(); if (c.ckSize & 1) dgetc(); /* eat the pad byte */ } else /* skip unknown chunk */ dseek(PAD2(c.ckSize), 1); ck.ckSize -= sizeof(RiffChunk) + PAD2(c.ckSize); } } else /* skip unknown chunk */ dseek(PAD2(ck.ckSize) - sizeof(RIFF_FOURCC), 1); } /* wave format chunk */ else if (!cmpID(&ck.ckID, RIFF_WaveFmtID) && !wi->format) { AuInt32 dummy; wi->format = DataReadS(NAS_BIG_ENDIAN); wi->channels = DataReadS(NAS_BIG_ENDIAN); wi->sampleRate = DataReadL(NAS_BIG_ENDIAN); /* we don't care about the next two fields */ dummy = DataReadL(NAS_BIG_ENDIAN); dummy = DataReadS(NAS_BIG_ENDIAN); if (wi->format != RIFF_WAVE_FORMAT_PCM) Err(); wi->bitsPerSample = DataReadS(NAS_BIG_ENDIAN); /* skip any other format specific fields */ dseek(PAD2(ck.ckSize - 16), 1); } /* wave data chunk */ else if (!cmpID(&ck.ckID, RIFF_WaveDataID) && !wi->dataOffset) { long endOfFile; wi->dataOffset = dtell(); wi->dataSize = ck.ckSize; dseek(0, 2); endOfFile = dtell(); /* seek past the data */ if (dseek(wi->dataOffset + PAD2(ck.ckSize), 0) || dtell() > endOfFile) { /* the seek failed, assume the size is bogus */ dseek(0, 2); wi->dataSize = dtell() - wi->dataOffset; } wi->dataOffset -= sizeof(long); } else /* skip unknown chunk */ dseek(PAD2(ck.ckSize), 1); } if (!wi->dataOffset) Err(); wi->numSamples = wi->dataSize / wi->channels / (wi->bitsPerSample >> 3); if (!wi->comment) wi->comment = NameFromData (data + wi->dataOffset, length - wi->dataOffset); wi->fp = NULL; return wi; } static Sound SoundOpenDataForReading (Binbyte *data, int length) { Sound s; #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) SoundFileInfoProc toProc; #endif if (!(s = (Sound) malloc (sizeof (SoundRec)))) return NULL; if ((s->formatInfo = SndOpenDataForReading ((CBinbyte *) data, length)) != NULL) { #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) if ((toProc = SoundFileGetProc(SoundFileFormatSnd, SoundFileInfoProcTo)) == NULL) { SndCloseFile ((SndInfo *) (s->formatInfo)); free (s); return NULL; } if (!((*toProc)(s))) #else if (!((int(*)(Sound))(SoundFileInfo[SoundFileFormatSnd].toSound)) (s)) #endif { SndCloseFile ((SndInfo *) (s->formatInfo)); free (s); return NULL; } } else if ((s->formatInfo = WaveOpenDataForReading ((CBinbyte *) data, length)) != NULL) { #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) if ((toProc = SoundFileGetProc(SoundFileFormatWave, SoundFileInfoProcTo)) == NULL) { WaveCloseFile ((WaveInfo *) (s->formatInfo)); free (s); return NULL; } if (!((*toProc)(s))) #else if (!((int(*)(Sound))(SoundFileInfo[SoundFileFormatWave].toSound)) (s)) #endif { WaveCloseFile ((WaveInfo *) (s->formatInfo)); free (s); return NULL; } } return s; }
