annotate etc/trash.xpm @ 5160:ab9ee10a53e4

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.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Mar 2010 20:20:30 -0500
parents 376386a54a3c
children 7910031dd78a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* XPM */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 /* A trash can, drawn by jwz */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 static char *trash[] = {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 /* width height ncolors chars_per_pixel x_hot y_hot */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 " 32 46 4 1 16 23",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 /* colors */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 " c None m None",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 "= c gray85 m white",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 "- c gray75 m white",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 "# c black m black",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 /* pixels */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 " ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 " ###### ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 " #======# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 " #==# ==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 " ########################## ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 " #==========================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 " ####=####################### ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 " #========================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 " #======================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 " #=====##====##====##===# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 " ###-#==#--#==#--#==#--#==### ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 " #--#-#==#--#==#--#==#--#==#--# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 " ####-#==#--#==#--#==#--#==#### ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 " #-#==#--#==#--#==#--#==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 " #======================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 " #======================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 " #==######=###########==# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 " #========================# ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 " ######################## ",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 " "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 };