fix various problems with allocation statistics, track overhead properly -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-20 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): * diagnose.el (show-object-memory-usage-stats): Further changes to correspond with changes in the C code; add an additional column showing the overhead used with each type, and add it into the grand total memory usage. src/ChangeLog addition: 2010-03-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (init_lrecord_stats): * alloc.c (free_normal_lisp_object): * alloc.c (struct): * alloc.c (clear_lrecord_stats): * alloc.c (tick_lrecord_stats): * alloc.c (COUNT_FROB_BLOCK_USAGE): * alloc.c (COPY_INTO_LRECORD_STATS): * alloc.c (sweep_strings): * alloc.c (UNMARK_string): * alloc.c (gc_sweep_1): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (object_dead_p): * alloc.c (fixed_type_block_overhead): * alloc.c (lisp_object_storage_size): * emacs.c (main_1): * lisp.h: * lrecord.h: Export lisp_object_storage_size() and malloced_storage_size() even when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS build to compile. Don't export fixed_type_block_overhead() any more. Some code cleanup, rearrangement, add some section headers. Clean up various bugs especially involving computation of overhead and double-counting certain usage in total_gc_usage. Add statistics computing the overhead used by all types. Don't add a special entry for string headers in the object-memory-usage-stats because it's already present as just "string". But do count the overhead used by long strings. Don't try to call the memory_usage() methods when NEW_GC because there's nowhere obvious in the sweep stage to make the calls. * marker.c (compute_buffer_marker_usage): Just use lisp_object_storage_size() rather than trying to reimplement it.

/* XPM */
static char * makefile[] = {
"33 33 7 1",
"X	c Gray75 s backgroundToolBarColor",
"u	c #000000000000 s foregroundToolBarColor",
"o	c black",
"O	c white",
"+	c Gray40",
"@	c Gray90",
"#	c white",
"XXXXXXXXXXoooXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXoooOoooXXXXXXXXXXXXXXXXXX",
"XXXXXXXXo++o++oXXXXXXXXXXXXXXXXXX",
"XXXXXXXoo+ooo+ooXXXXXXXXXXXXXXXXX",
"XXXXXXXo++o++++oXXXXXXXXXXXXXXXXX",
"XXXXXXXoo++o++ooXXXXXXXXXXXXXXXXX",
"XXXXXXXXo+++++ooooXXXXXXXXXXXXXXX",
"XXXXXXXXooo+oooo@oXXoXXXXXXXXXXXX",
"XXXXXXXXXXooo@o@@@oo@oXXXXXXXXXXX",
"XXXXXXXXXXo@@@@@@@@@@ooXXXXXXXXXX",
"XXXXXXXXXXXo@@o@o#o@@oXXXXXXXXXXX",
"XXXXXXXXXoo@@o@o###o@@ooXXXXXXXXX",
"XXXXXXXXXo@@@oo####o@@@oXXXXXXXXX",
"XXXXXXXXXooo@o@o###o@oooXXXXXXXXX",
"XXXXXXXXXXXo@@o@o#o@@oXXXXXXXXXXX",
"XXXXXXXXXXo@@@@@@@@@@@oXXXXXXXXXX",
"XXXXXXXXXXoo@oo@@oooooXXXXXXXXXXX",
"XXXXXXXXoooXooo@@oXXoXXXXXXXXXXXX",
"XXXXXXXXo++o++ooooXXXXXXXXXXXXXXX",
"XXXXXXXoo+ooo+ooXXXXXXXXXXXXXXXXX",
"XXXXXXXo++o++++oXXXXXXXXXXXXXXXXX",
"XXXXXXXoo++o++ooXXXXXXXXXXXXXXXXX",
"XXXXXXXXo+++++oXXXXXXXXXXXXXXXXXX",
"XXXXXXXXooo+oooXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXoooXXXXXXXXXXXuXuXXXXXX",
"XXXuuuXXXXXXXXXXXXXXXXXXXXuXXXXXX",
"XXuXXXuXXuuXXuuuuXXuuuXXuXuXXuXXX",
"XXuXXXXXuXXuXuXuXuXuXXuXuXuXuXuXX",
"XXuXXXXXuXXuXuXuXuXuXXuXuXuXuuuXX",
"XXuXXXuXuXXuXuXuXuXuXXuXuXuXuXXXX",
"XXXuuuXXXuuXXuXuXuXuuuXXuXuXXuuXX",
"XXXXXXXXXXXXXXXXXXXuXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};