annotate etc/recycle.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 3ecd8885ac67
children 7910031dd78a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 /* XPM */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2 /* A recycle logo, artist unknown, converted to xpm by jwz */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 static char *recycle[] = {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4 /* width height ncolors chars_per_pixel x_hot y_hot */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 " 51 51 4 1 26 23",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 /* colors */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 " c None m None",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 "# c black m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 "- c chartreuse1 m #7fff0f",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 "@ c chartreuse4 m #4f8f0f",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 /* pixels */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 " ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 " ################### ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 " ##------------##@@-@-## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 " #-------------#@@@-@----# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 " #-------------#@@@-@------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 " #------------#@@@-@-------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 " #-------------##@-@---------# ### ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 " #------------# #-@----------# ##@## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 " #-------------# #@------------##-## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 " #------------# #---------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 " #-------------# #--------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 " #------------# #------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 " #-------------# #------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 " ##----------# #----------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 " ##--------# ##---------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 " ##-----# ###-----------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 " ##---# ############## ### ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 " ############## ### ##--# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 " #------------## # ##-----# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 " ##-----------# ##-------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 " ##---------## ##----------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 " #----------# #------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 " #------------# #-------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 " #------------## #------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 " #--------------# #-------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 " #---------------# #------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 " #------------#--## #------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 " #-----------####-# #-----------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 " #-----------# ## ## #-----------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 " #---------# ## #---------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 " #---------# #-# #---------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 " #-------# #-# #-------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 " #-------# #--# #----@@## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 " #-----############# #--############### ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 " #-----#@@@-@------# #----------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 " #---#@@@-@-------# #---------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 " #---#@@-@--------# #----------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 " #-#@@-@---------# #---------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 " #-#@@@----------# #----------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 " #@@@-----------# #----------------# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 " #@@@-----------# #--------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 " #@@-----------# #-------------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 " #------------# #-----------@# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 " ##----------# #---------@## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 " ########### #--####### ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 " #--# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 " #-# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 " #-# ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 " ## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 " ## ",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 " "
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 };