Mercurial > hg > xemacs-beta
annotate src/esd.c @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Mar 2010 01:22:51 -0500 |
| parents | ecf1ebac70d8 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 398 | 1 /* esd.c - play a sound over ESD |
| 2 | |
| 3 This file is part of XEmacs. | |
| 4 | |
| 5 XEmacs is free software; you can redistribute it and/or modify it | |
| 6 under the terms of the GNU General Public License as published by the | |
| 7 Free Software Foundation; either version 2, or (at your option) any | |
| 8 later version. | |
| 9 | |
| 10 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 13 for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with XEmacs; see the file COPYING. If not, write to | |
| 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 18 Boston, MA 02111-1307, USA. */ | |
| 19 | |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 563 | 22 /* This file Mule-ized by Ben Wing, 5-15-01. */ |
| 23 | |
| 398 | 24 #include <config.h> |
| 563 | 25 #include "lisp.h" |
| 398 | 26 |
| 27 #include "miscplay.h" | |
| 563 | 28 #include "sound.h" |
| 29 | |
| 30 #include "sysfile.h" | |
| 398 | 31 |
| 32 #include <esd.h> | |
| 33 | |
| 34 | |
| 35 /* the name given to ESD - I think this should identify ourselves */ | |
| 36 #define ESD_NAME "xemacs" | |
| 37 | |
| 563 | 38 int esd_play_sound_file (Extbyte *file, int vol); |
| 609 | 39 int |
| 2286 | 40 esd_play_sound_file (Extbyte *file, int UNUSED (vol)) |
| 398 | 41 { /* #### FIXME: vol is ignored */ |
| 42 return esd_play_file(ESD_NAME, file, 0); | |
| 43 } | |
| 44 | |
| 2367 | 45 int esd_play_sound_data (Binbyte *data, size_t length, int vol); |
| 609 | 46 int |
| 2367 | 47 esd_play_sound_data (Binbyte *data, size_t length, int UNUSED (vol)) |
| 398 | 48 { /* #### FIXME: vol is ignored */ |
| 49 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf); | |
| 50 size_t (*sndcnv)(void **dayta,size_t *sz,void **); | |
| 51 fmtType ffmt; | |
| 52 int fmt,speed,tracks; | |
| 53 unsigned char *pptr,*optr,*cptr,*sptr; | |
| 1261 | 54 Bytecount wrtn, crtn; |
| 398 | 55 size_t prtn; |
| 56 int flags, sock; | |
| 57 | |
| 58 /* analyze_format needs at least this many bytes to work with */ | |
| 59 if (length < HEADERSZ) | |
| 60 return 0; | |
| 61 | |
| 62 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile); | |
| 63 | |
| 64 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) { | |
| 564 | 65 sound_warn("Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)"); |
| 398 | 66 return 0; |
| 67 } | |
| 68 | |
| 69 /* convert header information into ESD flags */ | |
| 70 flags = ESD_STREAM|ESD_PLAY; | |
| 71 sndcnv = sndcnvnop; | |
| 72 switch (fmt) | |
| 73 { | |
| 74 case AFMT_MU_LAW: | |
| 75 sndcnv = sndcnvULaw_2linear; | |
| 76 flags |= ESD_BITS8; | |
| 77 break; | |
| 78 case AFMT_S8: | |
| 79 sndcnv = sndcnv2unsigned; /* ESD needs unsigned bytes */ | |
| 80 case AFMT_U8: | |
| 81 flags |= ESD_BITS8; | |
| 82 break; | |
| 83 case AFMT_S16_BE: | |
| 84 sndcnv = sndcnv16swap; /* ESD wants little endian */ | |
| 85 case AFMT_S16_LE: | |
| 86 flags |= ESD_BITS16; | |
| 87 break; | |
| 88 default: | |
| 564 | 89 { |
| 90 Extbyte warn_buf[255]; | |
| 91 sprintf (warn_buf, "byte format %d unimplemented", fmt); | |
| 92 sound_warn (warn_buf); | |
| 93 return 0; | |
| 94 } | |
| 398 | 95 } |
| 96 switch (tracks) | |
| 97 { | |
| 98 case 1: flags |= ESD_MONO; break; | |
| 99 case 2: flags |= ESD_STEREO; break; | |
| 100 default: | |
| 564 | 101 { |
| 102 Extbyte warn_buf[255]; | |
| 103 sprintf (warn_buf, "%d channels - only 1 or 2 supported", tracks); | |
| 104 sound_warn (warn_buf); | |
| 105 return 0; | |
| 106 } | |
| 398 | 107 } |
| 108 | |
| 109 sock = esd_play_stream(flags, speed, NULL, "xemacs"); | |
| 110 if (sock < 0) | |
| 111 return 0; | |
| 112 | |
| 113 reset_parsestate(); | |
| 114 | |
| 115 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length, | |
| 116 (void **)&optr)) > 0; ) | |
| 117 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn, | |
| 1261 | 118 (void **)&sptr)) > 0; ) |
| 119 { | |
| 120 if ((wrtn = write(sock,sptr,crtn)) < 0) | |
| 121 { | |
| 122 sound_perror ("write error"); | |
| 123 goto END_OF_PLAY; | |
| 124 } | |
| 125 if (wrtn != crtn) | |
| 126 { | |
| 127 Extbyte warn_buf[255]; | |
| 128 sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn); | |
| 129 sound_warn (warn_buf); | |
| 130 goto END_OF_PLAY; | |
| 131 } | |
| 398 | 132 } |
| 133 | |
| 134 if (ffmt == fmtWave) | |
| 135 parse_wave_complete(); | |
| 136 | |
| 137 END_OF_PLAY: | |
| 138 /* Now cleanup all used resources */ | |
| 139 | |
| 140 close(sock); | |
| 141 return 1; | |
| 142 } |