Mercurial > hg > xemacs-beta
annotate src/ntplay.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 | 3c3c1d139863 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Sound in windows nt XEmacs. |
| 2 Copyright (C) 1998 Andy Piper. | |
| 771 | 3 Copyright (C) 2001 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to the Free | |
| 19 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 20 02111-1307, USA.*/ | |
| 21 | |
| 563 | 22 /* Synched up with: Not in FSF. */ |
| 23 | |
| 24 /* This file Mule-ized by Ben Wing, 5-15-01. */ | |
| 25 | |
| 428 | 26 #include <config.h> |
| 27 #include "lisp.h" | |
| 28 | |
| 563 | 29 #include "sound.h" |
| 771 | 30 #include "syswindows.h" |
| 563 | 31 |
| 32 #include "sysfile.h" | |
| 442 | 33 |
| 2367 | 34 static int play_sound_data_1 (Binbyte *data, int length, |
| 563 | 35 int volume, int convert); |
| 428 | 36 |
| 563 | 37 void |
| 2526 | 38 nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) |
| 428 | 39 { |
| 40 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; | |
| 2526 | 41 Lisp_Object fname = Ffile_name_nondirectory (path); |
| 563 | 42 Extbyte *fnameext; |
| 428 | 43 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
44 fnameext = LISP_STRING_TO_TSTR (fname); |
| 563 | 45 |
| 771 | 46 if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) |
| 428 | 47 { |
| 48 /* file isn't in the path so read it as data */ | |
| 49 int size; | |
| 2367 | 50 Binbyte *data; |
| 2526 | 51 int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); |
| 428 | 52 |
| 2526 | 53 if (ofd < 0) |
| 428 | 54 return; |
| 55 | |
| 56 size = lseek (ofd, 0, SEEK_END); | |
| 2367 | 57 data = xnew_binbytes (size); |
| 428 | 58 lseek (ofd, 0, SEEK_SET); |
| 59 | |
| 60 if (!data) | |
| 61 { | |
| 771 | 62 retry_close (ofd); |
| 428 | 63 return; |
| 64 } | |
| 65 | |
| 771 | 66 if (retry_read (ofd, data, size) != size) |
| 428 | 67 { |
| 771 | 68 retry_close (ofd); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
69 xfree (data); |
| 428 | 70 return; |
| 71 } | |
| 771 | 72 retry_close (ofd); |
| 428 | 73 |
| 74 play_sound_data_1 (data, size, 100, FALSE); | |
| 75 } | |
| 76 else | |
| 771 | 77 qxePlaySound (fnameext, NULL, flags); |
| 428 | 78 } |
| 79 | |
| 80 /* mswindows can't cope with playing a sound from alloca space so we | |
| 81 have to convert if necessary */ | |
| 563 | 82 static int |
| 2367 | 83 play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), |
| 563 | 84 int convert_to_malloc) |
| 428 | 85 { |
| 86 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; | |
| 2367 | 87 static Binbyte *sound_data = 0; |
| 428 | 88 if (sound_data) |
| 89 { | |
| 771 | 90 qxePlaySound (NULL, NULL, flags); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
91 xfree (sound_data); |
| 593 | 92 sound_data = 0; |
| 428 | 93 } |
| 94 | |
| 95 if (convert_to_malloc) | |
| 96 { | |
| 2367 | 97 sound_data = xnew_binbytes (length); |
| 428 | 98 memcpy (sound_data, data, length); |
| 99 } | |
| 100 else | |
| 101 sound_data = data; | |
| 102 | |
| 771 | 103 qxePlaySound ((Extbyte *) sound_data, NULL, flags); |
| 428 | 104 |
| 442 | 105 /* #### Error handling? */ |
| 106 return 1; | |
| 428 | 107 } |
| 108 | |
| 563 | 109 int |
| 2367 | 110 play_sound_data (Binbyte *data, int length, int volume) |
| 428 | 111 { |
| 442 | 112 return play_sound_data_1 (data, length, volume, TRUE); |
| 428 | 113 } |