comparison src/data.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 f965e31a35f0
children 71ee43b8a74d
comparison
equal deleted inserted replaced
5168:cf900a2f1fa3 5169:6c6d78781d59
1 /* Primitive operations on Lisp data types for XEmacs Lisp interpreter. 1 /* Primitive operations on Lisp data types for XEmacs Lisp interpreter.
2 Copyright (C) 1985, 1986, 1988, 1992, 1993, 1994, 1995 2 Copyright (C) 1985, 1986, 1988, 1992, 1993, 1994, 1995
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 Copyright (C) 2000, 2001, 2002, 2003, 2005 Ben Wing. 4 Copyright (C) 2000, 2001, 2002, 2003, 2005, 2010 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
28 #include <config.h> 28 #include <config.h>
29 #include "lisp.h" 29 #include "lisp.h"
30 30
31 #include "buffer.h" 31 #include "buffer.h"
32 #include "bytecode.h" 32 #include "bytecode.h"
33 #include "gc.h"
33 #include "syssignal.h" 34 #include "syssignal.h"
34 #include "sysfloat.h" 35 #include "sysfloat.h"
35 36
36 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; 37 Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound;
37 Lisp_Object Qerror_conditions, Qerror_message; 38 Lisp_Object Qerror_conditions, Qerror_message;
2802 } 2803 }
2803 2804
2804 if (need_to_mark_elem && ! marked_p (elem)) 2805 if (need_to_mark_elem && ! marked_p (elem))
2805 { 2806 {
2806 #ifdef USE_KKCC 2807 #ifdef USE_KKCC
2807 kkcc_gc_stack_push_lisp_object (elem, 0, -1); 2808 kkcc_gc_stack_push_lisp_object_0 (elem);
2808 #else /* NOT USE_KKCC */ 2809 #else /* NOT USE_KKCC */
2809 mark_object (elem); 2810 mark_object (elem);
2810 #endif /* NOT USE_KKCC */ 2811 #endif /* NOT USE_KKCC */
2811 did_mark = 1; 2812 did_mark = 1;
2812 } 2813 }
2830 /* In case of imperfect list, need to mark the final cons 2831 /* In case of imperfect list, need to mark the final cons
2831 because we're not removing it */ 2832 because we're not removing it */
2832 if (!NILP (rest2) && ! marked_p (rest2)) 2833 if (!NILP (rest2) && ! marked_p (rest2))
2833 { 2834 {
2834 #ifdef USE_KKCC 2835 #ifdef USE_KKCC
2835 kkcc_gc_stack_push_lisp_object (rest2, 0, -1); 2836 kkcc_gc_stack_push_lisp_object_0 (rest2);
2836 #else /* NOT USE_KKCC */ 2837 #else /* NOT USE_KKCC */
2837 mark_object (rest2); 2838 mark_object (rest2);
2838 #endif /* NOT USE_KKCC */ 2839 #endif /* NOT USE_KKCC */
2839 did_mark = 1; 2840 did_mark = 1;
2840 } 2841 }
3206 { 3207 {
3207 MARK_CONS (XCONS (XEPHEMERON (rest)->cons_chain)); 3208 MARK_CONS (XCONS (XEPHEMERON (rest)->cons_chain));
3208 if (marked_p (XEPHEMERON (rest)->key)) 3209 if (marked_p (XEPHEMERON (rest)->key))
3209 { 3210 {
3210 #ifdef USE_KKCC 3211 #ifdef USE_KKCC
3211 kkcc_gc_stack_push_lisp_object 3212 kkcc_gc_stack_push_lisp_object_0
3212 (XCAR (XEPHEMERON (rest)->cons_chain), 0, -1); 3213 (XCAR (XEPHEMERON (rest)->cons_chain));
3213 #else /* NOT USE_KKCC */ 3214 #else /* NOT USE_KKCC */
3214 mark_object (XCAR (XEPHEMERON (rest)->cons_chain)); 3215 mark_object (XCAR (XEPHEMERON (rest)->cons_chain));
3215 #endif /* NOT USE_KKCC */ 3216 #endif /* NOT USE_KKCC */
3216 did_mark = 1; 3217 did_mark = 1;
3217 XSET_EPHEMERON_NEXT (rest, Vnew_all_ephemerons); 3218 XSET_EPHEMERON_NEXT (rest, Vnew_all_ephemerons);
3256 3257
3257 if (! NILP (XEPHEMERON_FINALIZER (rest))) 3258 if (! NILP (XEPHEMERON_FINALIZER (rest)))
3258 { 3259 {
3259 MARK_CONS (XCONS (XEPHEMERON (rest)->cons_chain)); 3260 MARK_CONS (XCONS (XEPHEMERON (rest)->cons_chain));
3260 #ifdef USE_KKCC 3261 #ifdef USE_KKCC
3261 kkcc_gc_stack_push_lisp_object 3262 kkcc_gc_stack_push_lisp_object_0
3262 (XCAR (XEPHEMERON (rest)->cons_chain), 0, -1); 3263 (XCAR (XEPHEMERON (rest)->cons_chain));
3263 #else /* NOT USE_KKCC */ 3264 #else /* NOT USE_KKCC */
3264 mark_object (XCAR (XEPHEMERON (rest)->cons_chain)); 3265 mark_object (XCAR (XEPHEMERON (rest)->cons_chain));
3265 #endif /* NOT USE_KKCC */ 3266 #endif /* NOT USE_KKCC */
3266 3267
3267 /* Register the finalizer */ 3268 /* Register the finalizer */