annotate netinstall/reginfo.h @ 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 15139dbf89f4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /* reginfo.h -- XEmacs version numbers and accompanying documentation.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 Copyright (C) 2000 Andy Piper. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
5 #define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 #define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 /* Keys */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 #define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 #define XEMACS_INFO_XEMACS_ROOT_TYPE "install_type"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 #define XEMACS_INFO_XEMACS_PACKAGE_KEY "EMACSPACKAGEPATH"
3179
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
11 #define XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY "EMACSEARLYPACKAGES"
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
12 #define XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY "EMACSLATEPACKAGES"
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
13 #define XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY "EMACSLASTPACKAGES"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 #define XEMACS_INFO_XEMACS_VERSION_KEY "version"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 #define XEMACS_DEFAULT_ROOT "\\Program Files\\XEmacs"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 #define XEMACS_CYGWIN_DEFAULT_ROOT "\\usr\\local"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #define XEMACS_SETUP_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\setup\\" : "/lib/xemacs/setup/"))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #define XEMACS_RESOURCE_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\" : "/lib/xemacs/"))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #define XEMACS_PACKAGE_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\xemacs-packages\\" \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 : "/lib/xemacs/xemacs-packages/"))
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
26 #define XEMACS_NATIVE_ARCH_NAME "i586-pc-win32"
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
27 #define XEMACS_CYGWIN_ARCH_NAME "i686-pc-cygwin"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 * Installation hierarchy is:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 * C:\Program Files\XEmacs
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 * \xemacs-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 * \etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 * \info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 * \lib-src
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 * \lisp
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 * \man
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 * \pkginfo
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 * \site-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 * \mule-packages
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
41 * \XEmacs-21.4
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
42 * \i586-pc-win32
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 * \etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 * \info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 * \lisp
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 * Or:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 * /usr/local/lib
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 * /xemacs/xemacs-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 * /xemacs/site-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 * /xemacs/mule-packages
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
51 * /xemacs-21.4
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
52 * /i686-pc-cygwin
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 * /etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 * /info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 * /lisp
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
56 * /usr/local/bin/i686-pc-cygwin
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59