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 * recycle2_xpm[] = {
/* width height ncolors cpp [x_hot y_hot] */
"32 32 4 1 26 23",
/* colors */
" 	s none	m none	c none",
".	s iconColor1	m black	c black",
"X	c #7F7FFFFF0000",
"o	c #45458B8B0000",
/* pixels */
"                                ",
"           ............         ",
"         .XXXXXXXX.oooXX.       ",
"         XXXXXXXX.ooXXXXX.      ",
"        .XXXXXXXX.ooXXXXXX  ..  ",
"        .XXXXXXX..XXXXXXXX .o.  ",
"       .XXXXXXXX  .XXXXXXXXX.   ",
"       XXXXXXXX.   XXXXXXXX.    ",
"      .XXXXXXXX.   XXXXXXXX     ",
"        .XXXXX.    .XXXXXX.     ",
"         ..XXX   ..XXXXXXX      ",
" .........  ..            .XX   ",
"  .XXXXXXX.             .XXXX.  ",
"   .XXXXXX.           ..XXXXXX. ",
"   .XXXXXXX.          XXXXXXXXX ",
"   .XXXXXXX.          .XXXXXXXX ",
"  .XXXXXXXXX.          .XXXXXXX.",
"  .XXXXXXX..X.          XXXXXXX.",
"  .XXXXXXX. ..      .   XXXXXXX.",
"   .XXXXX.         .X   .XXXXXX ",
"    XXXXX          .X    .XXXX. ",
"    .XXX........   XX.........  ",
"     .X.ooXXXXXX  .XXXXXXXXXo   ",
"     .X.oXoXXXXX .XXXXXXXXXXo   ",
"      XooXXXXXXX XXXXXXXXXXo.   ",
"      .ooXXXXXXX XXXXXXXXXX.    ",
"       ooXXXXXXX .XXXXXXXXo     ",
"        .XXXXXXX  .XXXXXo.      ",
"         .......   XX....       ",
"                   .X           ",
"                   .X           ",
"                    .           "};