comparison src/elhash.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 9e0b43d3095c
children 71ee43b8a74d
comparison
equal deleted inserted replaced
5168:cf900a2f1fa3 5169:6c6d78781d59
79 79
80 #include <config.h> 80 #include <config.h>
81 #include "lisp.h" 81 #include "lisp.h"
82 #include "bytecode.h" 82 #include "bytecode.h"
83 #include "elhash.h" 83 #include "elhash.h"
84 #include "gc.h"
84 #include "opaque.h" 85 #include "opaque.h"
85 86
86 Lisp_Object Qhash_tablep; 87 Lisp_Object Qhash_tablep;
87 static Lisp_Object Qhashtable, Qhash_table, Qmake_hash_table; 88 static Lisp_Object Qhashtable, Qhash_table, Qmake_hash_table;
88 static Lisp_Object Qweakness, Qvalue, Qkey_or_value, Qkey_and_value; 89 static Lisp_Object Qweakness, Qvalue, Qkey_or_value, Qkey_and_value;
418 write_ascstring (printcharfun, ")"); 419 write_ascstring (printcharfun, ")");
419 else 420 else
420 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); 421 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
421 } 422 }
422 423
424 #ifdef ERROR_CHECK_STRUCTURES
425 #define USED_IF_ERROR_CHECK_STRUCTURES(x) x
426 #else
427 #define USED_IF_ERROR_CHECK_STRUCTURES(x) UNUSED (x)
428 #endif
429
423 #ifndef NEW_GC 430 #ifndef NEW_GC
424 static void 431 static void
425 free_hentries (htentry *hentries, 432 free_hentries (htentry *hentries,
426 #ifdef ERROR_CHECK_STRUCTURES 433 Elemcount USED_IF_ERROR_CHECK_STRUCTURES (size))
427 Elemcount size
428 #else /* not ERROR_CHECK_STRUCTURES) */
429 Elemcount UNUSED (size)
430 #endif /* not ERROR_CHECK_STRUCTURES) */
431 )
432 { 434 {
433 #ifdef ERROR_CHECK_STRUCTURES 435 #ifdef ERROR_CHECK_STRUCTURES
434 /* Ensure a crash if other code uses the discarded entries afterwards. */ 436 /* Ensure a crash if other code uses the discarded entries afterwards. */
435 deadbeef_memory (hentries, 437 deadbeef_memory (hentries,
436 (Rawbyte *) (hentries + size) - (Rawbyte *) hentries); 438 (Rawbyte *) (hentries + size) - (Rawbyte *) hentries);
479 481
480 static const struct memory_description htentry_union_description_1[] = { 482 static const struct memory_description htentry_union_description_1[] = {
481 /* Note: XD_INDIRECT in this table refers to the surrounding table, 483 /* Note: XD_INDIRECT in this table refers to the surrounding table,
482 and so this will work. */ 484 and so this will work. */
483 #ifdef NEW_GC 485 #ifdef NEW_GC
484 { XD_LISP_OBJECT_BLOCK_PTR, HASH_TABLE_NON_WEAK, 486 { XD_INLINE_LISP_OBJECT_BLOCK_PTR, HASH_TABLE_NON_WEAK,
485 XD_INDIRECT (0, 1), { &htentry_description } }, 487 XD_INDIRECT (0, 1), { &htentry_description } },
486 { XD_LISP_OBJECT_BLOCK_PTR, 0, XD_INDIRECT (0, 1), 488 { XD_INLINE_LISP_OBJECT_BLOCK_PTR, 0, XD_INDIRECT (0, 1),
487 { &htentry_weak_description }, XD_FLAG_UNION_DEFAULT_ENTRY }, 489 { &htentry_weak_description }, XD_FLAG_UNION_DEFAULT_ENTRY },
488 #else /* not NEW_GC */ 490 #else /* not NEW_GC */
489 { XD_BLOCK_PTR, HASH_TABLE_NON_WEAK, XD_INDIRECT (0, 1), 491 { XD_BLOCK_PTR, HASH_TABLE_NON_WEAK, XD_INDIRECT (0, 1),
490 { &htentry_description } }, 492 { &htentry_description } },
491 { XD_BLOCK_PTR, 0, XD_INDIRECT (0, 1), { &htentry_description }, 493 { XD_BLOCK_PTR, 0, XD_INDIRECT (0, 1), { &htentry_description },
506 { &htentry_union_description } }, 508 { &htentry_union_description } },
507 { XD_LO_LINK, offsetof (Lisp_Hash_Table, next_weak) }, 509 { XD_LO_LINK, offsetof (Lisp_Hash_Table, next_weak) },
508 { XD_END } 510 { XD_END }
509 }; 511 };
510 512
511 #ifdef NEW_GC
512 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table, 513 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table,
513 mark_hash_table, print_hash_table, 514 mark_hash_table, print_hash_table,
514 0, hash_table_equal, hash_table_hash, 515 IF_OLD_GC (finalize_hash_table),
515 hash_table_description,
516 Lisp_Hash_Table);
517 #else /* not NEW_GC */
518 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table,
519 mark_hash_table, print_hash_table,
520 finalize_hash_table,
521 hash_table_equal, hash_table_hash, 516 hash_table_equal, hash_table_hash,
522 hash_table_description, 517 hash_table_description,
523 Lisp_Hash_Table); 518 Lisp_Hash_Table);
524 #endif /* not NEW_GC */
525 519
526 static Lisp_Hash_Table * 520 static Lisp_Hash_Table *
527 xhash_table (Lisp_Object hash_table) 521 xhash_table (Lisp_Object hash_table)
528 { 522 {
529 /* #### What's going on here? Why the gc_in_progress check? */ 523 /* #### What's going on here? Why the gc_in_progress check? */
1556 #ifdef USE_KKCC 1550 #ifdef USE_KKCC
1557 #define MARK_OBJ(obj) do { \ 1551 #define MARK_OBJ(obj) do { \
1558 Lisp_Object mo_obj = (obj); \ 1552 Lisp_Object mo_obj = (obj); \
1559 if (!marked_p (mo_obj)) \ 1553 if (!marked_p (mo_obj)) \
1560 { \ 1554 { \
1561 kkcc_gc_stack_push_lisp_object (mo_obj, 0, -1); \ 1555 kkcc_gc_stack_push_lisp_object_0 (mo_obj); \
1562 did_mark = 1; \ 1556 did_mark = 1; \
1563 } \ 1557 } \
1564 } while (0) 1558 } while (0)
1565 1559
1566 #else /* NO USE_KKCC */ 1560 #else /* NO USE_KKCC */