Mercurial > hg > xemacs-beta
comparison src/glyphs-eimage.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 | 7e57c0575a15 |
children | 97eb4942aec8 |
comparison
equal
deleted
inserted
replaced
5168:cf900a2f1fa3 | 5169:6c6d78781d59 |
---|---|
1 /* EImage-specific Lisp objects. | 1 /* EImage-specific Lisp objects. |
2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc. | 2 Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc. |
3 Copyright (C) 1995 Board of Trustees, University of Illinois. | 3 Copyright (C) 1995 Board of Trustees, University of Illinois. |
4 Copyright (C) 1995 Tinker Systems | 4 Copyright (C) 1995 Tinker Systems |
5 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005 Ben Wing | 5 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2005, 2010 Ben Wing |
6 Copyright (C) 1995 Sun Microsystems | 6 Copyright (C) 1995 Sun Microsystems |
7 | 7 |
8 This file is part of XEmacs. | 8 This file is part of XEmacs. |
9 | 9 |
10 XEmacs is free software; you can redistribute it and/or modify it | 10 XEmacs is free software; you can redistribute it and/or modify it |
175 free_opaque_ptr (unwind_obj); | 175 free_opaque_ptr (unwind_obj); |
176 if (data->cinfo_ptr) | 176 if (data->cinfo_ptr) |
177 jpeg_destroy_decompress (data->cinfo_ptr); | 177 jpeg_destroy_decompress (data->cinfo_ptr); |
178 | 178 |
179 if (data->instream) | 179 if (data->instream) |
180 retry_fclose (data->instream); | 180 { |
181 retry_fclose (data->instream); | |
182 data->instream = 0; | |
183 } | |
181 | 184 |
182 if (data->eimage) | 185 if (data->eimage) |
183 xfree (data->eimage); | 186 { |
187 xfree (data->eimage); | |
188 data->eimage = 0; | |
189 } | |
184 | 190 |
185 return Qnil; | 191 return Qnil; |
186 } | 192 } |
187 | 193 |
188 /* | 194 /* |
575 | 581 |
576 free_opaque_ptr (unwind_obj); | 582 free_opaque_ptr (unwind_obj); |
577 if (data->giffile) | 583 if (data->giffile) |
578 { | 584 { |
579 DGifCloseFile (data->giffile); | 585 DGifCloseFile (data->giffile); |
580 FreeSavedImages(data->giffile); | 586 FreeSavedImages (data->giffile); |
587 data->giffile = 0; | |
581 } | 588 } |
582 if (data->eimage) | 589 if (data->eimage) |
583 xfree (data->eimage); | 590 { |
591 xfree (data->eimage); | |
592 data->eimage = 0; | |
593 } | |
584 | 594 |
585 return Qnil; | 595 return Qnil; |
586 } | 596 } |
587 | 597 |
588 typedef struct gif_memory_storage | 598 typedef struct gif_memory_storage |
876 data->png_ptr = NULL; | 886 data->png_ptr = NULL; |
877 png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL); | 887 png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL); |
878 } | 888 } |
879 | 889 |
880 if (data->instream) | 890 if (data->instream) |
881 retry_fclose (data->instream); | 891 { |
892 retry_fclose (data->instream); | |
893 data->instream = 0; | |
894 } | |
882 | 895 |
883 if (data->eimage) | 896 if (data->eimage) |
884 xfree (data->eimage); | 897 { |
898 xfree (data->eimage); | |
899 data->eimage = 0; | |
900 } | |
885 | 901 |
886 return Qnil; | 902 return Qnil; |
887 } | 903 } |
888 | 904 |
889 static void | 905 static void |
1132 (struct tiff_unwind_data *) get_opaque_ptr (unwind_obj); | 1148 (struct tiff_unwind_data *) get_opaque_ptr (unwind_obj); |
1133 | 1149 |
1134 free_opaque_ptr (unwind_obj); | 1150 free_opaque_ptr (unwind_obj); |
1135 if (data->tiff) | 1151 if (data->tiff) |
1136 { | 1152 { |
1137 TIFFClose(data->tiff); | 1153 TIFFClose (data->tiff); |
1154 data->tiff = 0; | |
1138 } | 1155 } |
1139 if (data->eimage) | 1156 if (data->eimage) |
1140 xfree (data->eimage); | 1157 { |
1158 xfree (data->eimage); | |
1159 data->eimage = 0; | |
1160 } | |
1141 | 1161 |
1142 return Qnil; | 1162 return Qnil; |
1143 } | 1163 } |
1144 | 1164 |
1145 typedef struct tiff_memory_storage | 1165 typedef struct tiff_memory_storage |