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.

(^|/)CVS($|/)
(^|/)\.hg($|/)
(^|/)\.hgtags($|/)
\.o$
\.elc$
~$
\.orig$
\.rej$
(^|/)\#[^/]*\#$
(^|/)\.\#[^/]*$
info/.*\.info(-[0-9]+)?$
^GNUmakefile$
^Installation$
^Makefile$
^Makefile\.in$
^autom4te\.cache
^config\.(log|status)$
^lib-src/DOC$
^lib-src/(GNUmakefile|Makefile(\.in)?)$
^lib-src/config\.values$
^lib-src/(b2m|ctags|cvtmail|digest-doc|ellcc|etags|fakemail|gnuclient|gnuserv|hexl|insert-data-in-exec|make-docfile|make-dump-id|make-path|mmencode|movemail|ootags|profile|sorted-doc|wakeup|yow)$
^lib-src/ellcc\.h$
^lisp/(auto-autoloads|custom-load|finder-inf)\.el$
^lisp/mule/(auto-autoloads|custom-load)\.el$
^lwlib/(GNUmakefile|Makefile(\.in)?)$
^lwlib/liblw\.a$
^lwlib/config\.h$
^modules/auto-autoloads\.el$
^modules/ldap/(GNUmakefile|Makefile(\.in)?)$
^modules/ldap/eldap\.ell$
^modules/ldap/eldap_i\.c$
^(xemacs|mule)-packages
^etc/PROBLEMS$
^src/(.dbxrc|.gdbinit)(\.in)?$ 
^src/(GNUmakefile|Makefile(\.in)?)$
^src/NEEDTODUMP$
^src/config\.h$
^src/dump-id\.c$
^src/dump-size$
^src/paths\.h$
^src/sheap-adjust\.h$
^src/temacs$
^src/xemacs$
^src/xemacs\.def(\.in)?$
^src/xemacs\.dmp$
^src/Emacs\.ad\.h$
^etc/bundled-packages/.*\.tar\.gz$
^lib-src/(etags|hexl|i|make-docfile|make-dump-id|minitar|mmencode|movemail|sorted-doc|wakeup|winclient)\.(exe|exe\.manifest|pdb)$
\.obj$
^nt/obj
^nt/config.inc
^src/REBUILD_AUTOLOADS$
^src/(temacs|xemacs)\.(exe|exe\.manifest|pdb|map|bsc)$
^TAGS$
^version\.sh$