redo memory-usage mechanism, add way of dynamically initializing Lisp objects -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): Rewrite to take into account API changes in memory-usage functions. src/ChangeLog addition: 2010-03-18 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (disksave_object_finalization_1): * alloc.c (lisp_object_storage_size): * alloc.c (listu): * alloc.c (listn): * alloc.c (Fobject_memory_usage_stats): * alloc.c (compute_memusage_stats_length): * alloc.c (Fobject_memory_usage): * alloc.c (Ftotal_object_memory_usage): * alloc.c (malloced_storage_size): * alloc.c (common_init_alloc_early): * alloc.c (reinit_alloc_objects_early): * alloc.c (reinit_alloc_early): * alloc.c (init_alloc_once_early): * alloc.c (syms_of_alloc): * alloc.c (reinit_vars_of_alloc): * buffer.c: * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_text_usage): * buffer.c (compute_buffer_usage): * buffer.c (buffer_memory_usage): * buffer.c (buffer_objects_create): * buffer.c (syms_of_buffer): * buffer.c (vars_of_buffer): * console-impl.h (struct console_methods): * dynarr.c (Dynarr_memory_usage): * emacs.c (main_1): * events.c (clear_event_resource): * extents.c: * extents.c (compute_buffer_extent_usage): * extents.c (extent_objects_create): * extents.h: * faces.c: * faces.c (compute_face_cachel_usage): * faces.c (face_objects_create): * faces.h: * general-slots.h: * glyphs.c: * glyphs.c (compute_glyph_cachel_usage): * glyphs.c (glyph_objects_create): * glyphs.h: * lisp.h: * lisp.h (struct usage_stats): * lrecord.h: * lrecord.h (enum lrecord_type): * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lrecord.h (INIT_LISP_OBJECT): * lrecord.h (INIT_MODULE_LISP_OBJECT): * lrecord.h (UNDEF_LISP_OBJECT): * lrecord.h (UNDEF_MODULE_LISP_OBJECT): * lrecord.h (DECLARE_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_API_LISP_OBJECT): * lrecord.h (DECLARE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (syms_of_lstream): * lstream.c (vars_of_lstream): * marker.c: * marker.c (compute_buffer_marker_usage): * mc-alloc.c (mc_alloced_storage_size): * mc-alloc.h: * mule-charset.c: * mule-charset.c (struct charset_stats): * mule-charset.c (compute_charset_usage): * mule-charset.c (charset_memory_usage): * mule-charset.c (mule_charset_objects_create): * mule-charset.c (syms_of_mule_charset): * mule-charset.c (vars_of_mule_charset): * redisplay.c: * redisplay.c (compute_rune_dynarr_usage): * redisplay.c (compute_display_block_dynarr_usage): * redisplay.c (compute_glyph_block_dynarr_usage): * redisplay.c (compute_display_line_dynarr_usage): * redisplay.c (compute_line_start_cache_dynarr_usage): * redisplay.h: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c (compute_scrollbar_instance_usage): * scrollbar.h: * symbols.c: * symbols.c (reinit_symbol_objects_early): * symbols.c (init_symbols_once_early): * symbols.c (reinit_symbols_early): * symbols.c (defsymbol_massage_name_1): * symsinit.h: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_getprop): * ui-gtk.c (emacs_gtk_object_putprop): * ui-gtk.c (ui_gtk_objects_create): * unicode.c (compute_from_unicode_table_size_1): * unicode.c (compute_to_unicode_table_size_1): * unicode.c (compute_from_unicode_table_size): * unicode.c (compute_to_unicode_table_size): * window.c: * window.c (struct window_stats): * window.c (compute_window_mirror_usage): * window.c (compute_window_usage): * window.c (window_memory_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): * window.h: Redo memory-usage mechanism, make it general; add way of dynamically initializing Lisp object types -- OBJECT_HAS_METHOD(), similar to CONSOLE_HAS_METHOD(). (1) Create OBJECT_HAS_METHOD(), OBJECT_HAS_PROPERTY() etc. for specifying that a Lisp object type has a particular method or property. Call such methods with OBJECT_METH, MAYBE_OBJECT_METH, OBJECT_METH_OR_GIVEN; retrieve properties with OBJECT_PROPERTY. Methods that formerly required a DEFINE_*GENERAL_LISP_OBJECT() to specify them (getprop, putprop, remprop, plist, disksave) now instead use the dynamic-method mechanism. The main benefit of this is that new methods or properties can be added without requiring that the declaration statements of all existing methods be modified. We have to make the `struct lrecord_implementation' non-const, but I don't think this should have any effect on speed -- the only possible method that's really speed-critical is the mark method, and we already extract those out into a separate (non-const) array for increased cache locality. Object methods need to be reinitialized after pdump, so we put them in separate functions such as face_objects_create(), extent_objects_create() and call them appropriately from emacs.c The only current object property (`memusage_stats_list') that objects can specify is a Lisp object and gets staticpro()ed so it only needs to be set during dump time, but because it references symbols that might not exist in a syms_of_() function, we initialize it in vars_of_(). There is also an object property (`num_extra_memusage_stats') that is automatically initialized based on `memusage_stats_list'; we do that in reinit_vars_of_alloc(), which is called after all vars_of_() functions are called. `disksaver' method was renamed `disksave' to correspond with the name normally given to the function (e.g. disksave_lstream()). (2) Generalize the memory-usage mechanism in `buffer-memory-usage', `window-memory-usage', `charset-memory-usage' into an object-type- specific mechanism called by a single function `object-memory-usage'. (Former function `object-memory-usage' renamed to `total-object-memory-usage'). Generalize the mechanism of different "slices" so that we can have different "classes" of memory described and different "slices" onto each class; `t' separates classes, `nil' separates slices. Currently we have three classes defined: the memory of an object itself, non-Lisp-object memory associated with the object (e.g. arrays or dynarrs stored as fields in the object), and Lisp-object memory associated with the object (other internal Lisp objects stored in the object). This isn't completely finished yet and we might need to further separate the "other internal Lisp objects" class into two classes. The memory-usage mechanism uses a `struct usage_stats' (renamed from `struct overhead_stats') to describe a malloc-view onto a set of allocated memory (listing how much was requested and various types of overhead) and a more general `struct generic_usage_stats' (with a `struct usage_stats' in it) to hold all statistics about object memory. `struct generic_usage_stats' contains an array of 32 Bytecounts, which are statistics of unspecified semantics. The intention is that individual types declare a corresponding struct (e.g. `struct window_stats') with the same structure but with specific fields in place of the array, corresponding to specific statistics. The number of such statistics is an object property computed from the list of tags (Lisp symbols describing the statistics) stored in `memusage_stats_list'. The idea here is to allow particular object types to customize the number and semantics of the statistics where completely avoiding consing. This doesn't matter so much yet, but the intention is to have the memory usage of all objects computed at the end of GC, at the same time as other statistics are currently computed. The values for all statistics for a single type would be added up to compute aggregate values for all objects of a specific type. To make this efficient, we can't allow any memory allocation at all. (3) Create some additional functions for creating lists that specify the elements directly as args rather than indirectly through an array: listn() (number of args given), listu() (list terminated by Qunbound). (4) Delete a bit of remaining unused C window_config stuff, also unused lrecord_type_popup_data.

;; scoansi.el --- set up key names for SCO ansi console

;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.

;; Author: Kean Johnston <jkj@paradigm.co.za>

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING.  If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

;; HISTORY
;;    jkj - Jan 18, 1993: Created.
;;    jkj - Nov 18, 1993: Modified to work with Emacs 19.21

;;
;; First of all, the normal cursor movement keys. Some of these, if not
;; all, should be set up my termcap/terminfo. We reset them anyway for
;; the sake of completeness.
;;
(define-key function-key-map "\e[A" [up])
(define-key function-key-map "\e[B" [down])
(define-key function-key-map "\e[C" [right])
(define-key function-key-map "\e[D" [left])
(define-key function-key-map "\e[E" [center])
(define-key function-key-map "\e[F" [end])
(define-key function-key-map "\e[G" [next])
(define-key function-key-map "\e[H" [home])
(define-key function-key-map "\e[I" [prior])
(define-key function-key-map "\e[L" [insert])
(define-key function-key-map "\e[-" [kp-subtract])
(define-key function-key-map "\e[+" [kp-add])

;;
;; And now all the function keys
;;

;; Normal, unshifted keys
(define-key function-key-map "\e[M" [f1])
(define-key function-key-map "\e[N" [f2])
(define-key function-key-map "\e[O" [f3])
(define-key function-key-map "\e[P" [f4])
(define-key function-key-map "\e[Q" [f5])
(define-key function-key-map "\e[R" [f6])
(define-key function-key-map "\e[S" [f7])
(define-key function-key-map "\e[T" [f8])
(define-key function-key-map "\e[U" [f9])
(define-key function-key-map "\e[V" [f10])
(define-key function-key-map "\e[W" [f11])
(define-key function-key-map "\e[X" [f12])

;; Shift-function keys
(define-key function-key-map "\e[Y" [(shift f1)])
(define-key function-key-map "\e[Z" [(shift f2)])
(define-key function-key-map "\e[a" [(shift f3)])
(define-key function-key-map "\e[b" [(shift f4)])
(define-key function-key-map "\e[c" [(shift f5)])
(define-key function-key-map "\e[d" [(shift f6)])
(define-key function-key-map "\e[e" [(shift f7)])
(define-key function-key-map "\e[f" [(shift f8)])
(define-key function-key-map "\e[g" [(shift f9)])
(define-key function-key-map "\e[h" [(shift f10)])
(define-key function-key-map "\e[i" [(shift f11)])
(define-key function-key-map "\e[j" [(shift f12)])

;; Control function keys
(define-key function-key-map "\e[k" [(control f1)])
(define-key function-key-map "\e[l" [(control f2)])
(define-key function-key-map "\e[m" [(control f3)])
(define-key function-key-map "\e[n" [(control f4)])
(define-key function-key-map "\e[o" [(control f5)])
(define-key function-key-map "\e[p" [(control f6)])
(define-key function-key-map "\e[q" [(control f7)])
(define-key function-key-map "\e[r" [(control f8)])
(define-key function-key-map "\e[s" [(control f9)])
(define-key function-key-map "\e[t" [(control f10)])
(define-key function-key-map "\e[u" [(control f11)])
(define-key function-key-map "\e[v" [(control f12)])

;; Shift-control function keys
(define-key function-key-map "\e[w" [(control shift f1)])
(define-key function-key-map "\e[x" [(control shift f2)])
(define-key function-key-map "\e[y" [(control shift f3)])
(define-key function-key-map "\e[z" [(control shift f4)])
(define-key function-key-map "\e[@" [(control shift f5)])
(define-key function-key-map "\e[[" [(control shift f6)])
(define-key function-key-map "\e[\\" [(control shift f7)])
(define-key function-key-map "\e[]" [(control shift f8)])
(define-key function-key-map "\e[^" [(control shift f9)])
(define-key function-key-map "\e[_" [(control shift f10)])
(define-key function-key-map "\e[`" [(control shift f11)])
(define-key function-key-map "\e[{" [(control shift f12)])

;;;
;;; Now come the extended key names. Please refer to README.sco for
;;; more information regarding these keys and how to set them up.
;;;
(define-key function-key-map "\e]A" [(shift home)])
(define-key function-key-map "\e]B" [(shift up)])
(define-key function-key-map "\e]C" [(shift prior)])
(define-key function-key-map "\e]D" [(shift left)])
(define-key function-key-map "\e]E" [(shift right)])
(define-key function-key-map "\e]F" [(shift end)])
(define-key function-key-map "\e]G" [(shift down)])
(define-key function-key-map "\e]H" [(shift next)])
(define-key function-key-map "\e]I" [(shift insert)])
(define-key function-key-map "\e]J" [(shift delete)])

(define-key function-key-map "\e]K" [(control home)])
(define-key function-key-map "\e]L" [(control up)])
(define-key function-key-map "\e]M" [(control prior)])
(define-key function-key-map "\e]N" [(control left)])
(define-key function-key-map "\e]O" [(control right)])
(define-key function-key-map "\e]P" [(control end)])
(define-key function-key-map "\e]Q" [(control down)])
(define-key function-key-map "\e]R" [(control next)])
(define-key function-key-map "\e]S" [(control insert)])
(define-key function-key-map "\e]T" [(control delete)])

(define-key function-key-map "\e]U" [(meta home)])
(define-key function-key-map "\e]V" [(meta up)])
(define-key function-key-map "\e]W" [(meta prior)])
(define-key function-key-map "\e]X" [(meta left)])
(define-key function-key-map "\e]Y" [(meta right)])
(define-key function-key-map "\e]Z" [(meta end)])
(define-key function-key-map "\e]a" [(meta down)])
(define-key function-key-map "\e]b" [(meta next)])
(define-key function-key-map "\e]c" [(meta insert)])
(define-key function-key-map "\e]d" [(meta delete)])

(define-key function-key-map "\e]e" [(control center)])
(define-key function-key-map "\e]f" [(control kp-subtract)])
(define-key function-key-map "\e]g" [(control kp-add)])

(define-key function-key-map "\e]h" [(meta center)])
(define-key function-key-map "\e]i" [(meta kp-subtract)])
(define-key function-key-map "\e]j" [(meta kp-add)])