fix memory usage stats to include pdumped objects -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-02-21 Ben Wing <ben@xemacs.org> * diagnose.el: * diagnose.el (show-object-memory-usage-stats): Fix errors preventing this from working properly, account for words like "entry" pluralized to "entries". src/ChangeLog addition: 2010-02-21 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): * alloc.c (struct): * alloc.c (tick_lrecord_stats): * alloc.c (tick_lcrecord_stats): * alloc.c (sweep_lcrecords_1): * alloc.c (COUNT_FROB_BLOCK_USAGE): * alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): * alloc.c (free_cons): * alloc.c (free_key_data): * alloc.c (free_button_data): * alloc.c (free_motion_data): * alloc.c (free_process_data): * alloc.c (free_timeout_data): * alloc.c (free_magic_data): * alloc.c (free_magic_eval_data): * alloc.c (free_eval_data): * alloc.c (free_misc_user_data): * alloc.c (free_marker): * alloc.c (gc_sweep_1): * alloc.c (HACK_O_MATIC): * alloc.c (FROB): * alloc.c (object_memory_usage_stats): * alloc.c (Fgarbage_collect): * dumper.c: * dumper.c (pdump_objects_unmark): * lrecord.h: * lrecord.h (enum lrecord_alloc_status): Fixes to memory-usage-tracking code, etc. (1) Incorporate NEW_GC stuff into FREE_FIXED_TYPE_WHEN_NOT_IN_GC to avoid duplication. (2) Rewrite tick_lcrecord_stats() to include separate tick_lrecord_stats(); use in dumper.c to note pdumped objects. (3) Instead of handling frob-block objects specially in object_memory_usage_stats(), have SWEEP_FIXED_TYPE_BLOCK_1 increment the stats in lrecord_stats[] so that they get handled like other objects. (4) Pluralize entry as entries, etc.

/* DO NOT EDIT THIS FILE!!!! */

/* Most of this is required due to a bug in the GCC compiler driver
   which prevents us from passing this on the command line. It also
   reduces the compiler command line length, which can be a problem
   on some systems. */

#ifndef ELLCC_HDR
#define ELLCC_HDR

#define ELLCC_CC            "@XEMACS_CC@"
#define ELLCC_CFLAGS        "@XE_CFLAGS@"
#define ELLCC_CPPFLAGS      "@CPPFLAGS@"
#define ELLCC_LDFLAGS       "@LDFLAGS@"
#define ELLCC_CF_GENERAL    "@c_switch_general@"
#define ELLCC_CF_ALL        "@c_switch_all@"
#define ELLCC_LF_GENERAL    "@ld_switch_general@"
#define ELLCC_LF_ALL        "@ld_switch_all@"
#define ELLCC_LIBS_GENERAL  "@ld_libs_general@"
#define ELLCC_DLL_CFLAGS    "@dll_cflags@"
#define ELLCC_DLL_LDFLAGS   "@dll_ldflags@"
#define ELLCC_DLL_POST      "@dll_post@"
#define ELLCC_DLL_LD        "@dll_ld@"
#define ELLCC_DLL_LDO       "@dll_ldo@"
#define ELLCC_CONFIG        "@configuration@"
#define ELLCC_EMACS_VER     "@version@"
#define ELLCC_PROGNAME      "@PROGNAME@"
#define ELLCC_ARCHDIR       "@ARCHLIBDIR@"
#define ELLCC_MODDIR        "@MODULEDIR@"
#define ELLCC_SITEMODS      "@SITEMODULEDIR@"

#endif /* ELLCC_HDR */