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.

/* reginfo.h -- XEmacs version numbers and accompanying documentation.

Copyright (C) 2000 Andy Piper. */

#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
#define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
/* Keys */
#define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
#define XEMACS_INFO_XEMACS_ROOT_TYPE "install_type"
#define XEMACS_INFO_XEMACS_PACKAGE_KEY "EMACSPACKAGEPATH"
#define XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY "EMACSEARLYPACKAGES"
#define XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY "EMACSLATEPACKAGES"
#define XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY "EMACSLASTPACKAGES"
#define XEMACS_INFO_XEMACS_VERSION_KEY "version"

#define XEMACS_DEFAULT_ROOT "\\Program Files\\XEmacs"
#define XEMACS_CYGWIN_DEFAULT_ROOT "\\usr\\local"

#define XEMACS_SETUP_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\setup\\" : "/lib/xemacs/setup/"))
#define XEMACS_RESOURCE_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\" : "/lib/xemacs/"))
#define XEMACS_PACKAGE_DIR \
  ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\xemacs-packages\\" \
				    : "/lib/xemacs/xemacs-packages/"))
#define XEMACS_NATIVE_ARCH_NAME "i586-pc-win32"
#define XEMACS_CYGWIN_ARCH_NAME "i686-pc-cygwin"

/*
 * Installation hierarchy is:
 * C:\Program Files\XEmacs
 *			\xemacs-packages
 *				\etc
 *				\info
 *				\lib-src
 *				\lisp
 *				\man
 *				\pkginfo
 * 			\site-packages
 *			\mule-packages
 *			\XEmacs-21.4
 *				\i586-pc-win32
 *				\etc
 *				\info
 *				\lisp
 * Or:
 * /usr/local/lib
 *		/xemacs/xemacs-packages
 * 		/xemacs/site-packages
 *		/xemacs/mule-packages
 *		/xemacs-21.4
 *				/i686-pc-cygwin
 *				/etc
 *				/info
 *				/lisp
 * /usr/local/bin/i686-pc-cygwin
 */