Mercurial > hg > xemacs-beta
annotate src/vdb.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 | f395ee7ad844 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 3092 | 1 /* Virtual diry bit implementation (platform independent) for XEmacs. |
| 2 Copyright (C) 2005 Marcus Crestani. | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
3 Copyright (C) 2010 Ben Wing. |
| 3092 | 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 | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 #include "gc.h" | |
| 27 #include "mc-alloc.h" | |
| 28 #include "vdb.h" | |
| 29 | |
| 30 | |
| 31 typedef struct | |
| 32 { | |
| 33 Dynarr_declare (void *); | |
| 34 } void_ptr_dynarr; | |
| 35 | |
| 36 void_ptr_dynarr *page_fault_table; | |
| 37 | |
| 38 /* Init page fault table and protect heap. */ | |
| 39 void | |
| 40 vdb_start_dirty_bits_recording (void) | |
| 41 { | |
| 3303 | 42 Elemcount protected_pages = (Elemcount) protect_heap_pages (); |
| 3092 | 43 page_fault_table = Dynarr_new2 (void_ptr_dynarr, void *); |
| 3303 | 44 Dynarr_resize (page_fault_table, protected_pages); |
| 3092 | 45 } |
| 46 | |
| 47 /* Remove heap protection. */ | |
| 48 void | |
| 49 vdb_stop_dirty_bits_recording (void) | |
| 50 { | |
| 51 unprotect_heap_pages (); | |
| 52 } | |
| 53 | |
| 54 /* Read page fault table and pass page faults to garbage collector. */ | |
| 55 int | |
| 56 vdb_read_dirty_bits (void) | |
| 57 { | |
| 58 int repushed_objects = 0; | |
| 59 Elemcount count; | |
| 60 for (count = Dynarr_length (page_fault_table); count; count--) | |
| 61 repushed_objects += | |
| 62 repush_all_objects_on_page (Dynarr_at (page_fault_table, count - 1)); | |
| 63 Dynarr_free (page_fault_table); | |
| 64 page_fault_table = 0; | |
| 65 return repushed_objects; | |
| 66 } | |
| 67 | |
| 68 /* Called by the page fault handler: add address to page fault table. */ | |
| 69 void | |
| 70 vdb_designate_modified (void *addr) | |
| 71 { | |
| 72 Dynarr_add (page_fault_table, addr); | |
| 73 } | |
| 74 | |
| 75 | |
| 76 /* For testing and debugging... */ | |
| 77 | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
78 #ifdef DEBUG_XEMACS |
|
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
79 |
| 3092 | 80 DEFUN ("test-vdb", Ftest_vdb, 0, 0, "", /* |
| 81 Test virtual dirty bit implementation. Prints results to stderr. | |
| 82 */ | |
| 83 ()) | |
| 84 { | |
| 85 Rawbyte *p; | |
| 86 char c; | |
| 87 Elemcount count; | |
| 88 | |
| 89 /* Wrap up gc (if currently running). */ | |
| 90 gc_full (); | |
| 91 | |
| 92 /* Allocate a buffer; it will have the default | |
| 93 protection of PROT_READ|PROT_WRITE. */ | |
| 94 p = (Rawbyte *) mc_alloc (mc_get_page_size()); | |
| 95 set_lheader_implementation ((struct lrecord_header *) p, &lrecord_cons); | |
| 4123 | 96 fprintf (stderr, "Allocate p: [%p ... %p], length %d\n", |
| 97 p, p + mc_get_page_size (), (int) mc_get_page_size ()); | |
| 3092 | 98 |
| 99 /* Test read. */ | |
| 100 fprintf (stderr, "Attempt to read p[666]... "); | |
| 101 c = p[666]; | |
| 102 fprintf (stderr, "read ok.\n"); | |
| 103 | |
| 104 /* Test write. */ | |
| 105 fprintf (stderr, "Attempt to write 42 to p[666]... "); | |
| 106 p[666] = 42; | |
| 107 fprintf (stderr, "write ok, p[666] = %d\n", p[666]); | |
| 108 | |
| 109 /* Mark the buffer read-only and set environemnt for write-barrier. */ | |
| 110 fprintf (stderr, "Write-protect the page.\n"); | |
| 111 MARK_BLACK (p); | |
| 112 vdb_start_dirty_bits_recording (); | |
| 113 write_barrier_enabled = 1; | |
| 114 | |
| 115 /* Test write-barrier read. */ | |
| 116 fprintf (stderr, "Attempt to read p[666]... "); | |
| 117 c = p[666]; | |
| 118 fprintf (stderr, "read ok.\n"); | |
| 119 | |
| 120 /* Test write-barrier write, program receives SIGSEGV. */ | |
| 121 fprintf (stderr, "Attempt to write 23 to p[666]... "); | |
| 122 p[666] = 23; | |
| 123 fprintf (stderr, "Written p[666] = %d\n", p[666]); | |
| 124 | |
| 125 /* Stop write-barrier mode. */ | |
| 126 write_barrier_enabled = 0; | |
| 127 MARK_WHITE (p); | |
| 128 vdb_unprotect (p, mc_get_page_size ()); | |
| 129 for (count = Dynarr_length (page_fault_table); count; count--) | |
| 130 if (Dynarr_at (page_fault_table, count - 1) == &p[666]) | |
| 4123 | 131 fprintf (stderr, "VALID page fault at %p\n", |
| 132 Dynarr_at (page_fault_table, count - 1)); | |
| 3092 | 133 else |
| 4123 | 134 fprintf (stderr, "WRONG page fault at %p\n", |
| 135 Dynarr_at (page_fault_table, count - 1)); | |
| 3092 | 136 Dynarr_free (page_fault_table); |
| 137 return Qnil; | |
| 138 } | |
| 139 | |
| 140 DEFUN ("test-segfault", Ftest_segfault, 0, 0, "", /* | |
| 141 Test virtual dirty bit implementation: provoke a segfault on purpose. | |
| 142 WARNING: this function causes a SEGFAULT on purpose and thus crashes | |
| 143 XEmacs! This is only used for debbugging, e.g. for testing how the | |
| 144 debugger behaves when XEmacs segfaults and the write barrier is | |
| 145 enabled. | |
| 146 */ | |
| 147 ()) | |
| 148 { | |
| 149 Rawbyte *q = 0; | |
| 150 q[0] = 23; | |
| 151 return Qnil; | |
| 152 } | |
| 153 | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
154 #endif /* DEBUG_XEMACS */ |
|
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
155 |
| 3092 | 156 void |
| 157 syms_of_vdb (void) | |
| 158 { | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
159 #ifdef DEBUG_XEMACS |
| 3092 | 160 DEFSUBR (Ftest_vdb); |
| 161 DEFSUBR (Ftest_segfault); | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4123
diff
changeset
|
162 #endif /* DEBUG_XEMACS */ |
| 3092 | 163 } |