Mercurial > hg > xemacs-beta
view lisp/symbols.el @ 5170:5ddbab03b0e6
various fixes to memory-usage stats
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-25 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 in show-object-memory-usage-stats showing
the ancillary Lisp overhead used with each type; shrink columns for
windows in show-memory-usage to get it to fit in 79 chars.
src/ChangeLog addition:
2010-03-25 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (struct):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fobject_memory_usage):
* alloc.c (lisp_object_memory_usage_full):
* alloc.c (compute_memusage_stats_length):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
Add fields to the `lrecord_implementation' structure to list an
offset into the array of extra statistics in a
`struct generic_usage_stats' and a length, listing the first slice
of ancillary Lisp-object memory. Compute automatically in
compute_memusage_stats_length(). Use to add an entry
`FOO-lisp-ancillary-storage' for object type FOO.
Don't crash when an int or char is given to object-memory-usage,
signal an error instead.
Add functions lisp_object_memory_usage_full() and
lisp_object_memory_usage() to compute the total memory usage of an
object (sum of object, non-Lisp attached, and Lisp ancillary
memory).
* array.c:
* array.c (gap_array_memory_usage):
* array.h:
Add function to return memory usage of a gap array.
* buffer.c (struct buffer_stats):
* buffer.c (compute_buffer_usage):
* buffer.c (vars_of_buffer):
* extents.c (compute_buffer_extent_usage):
* marker.c:
* marker.c (compute_buffer_marker_usage):
* extents.h:
* lisp.h:
Remove `struct usage_stats' arg from compute_buffer_marker_usage()
and compute_buffer_extent_usage() -- these are ancillary Lisp
objects and don't get accumulated into `struct usage_stats';
change the value of `memusage_stats_list' so that `markers' and
`extents' memory is in Lisp-ancillary, where it belongs.
In compute_buffer_marker_usage(), use lisp_object_memory_usage()
rather than lisp_object_storage_size().
* casetab.c:
* casetab.c (case_table_memory_usage):
* casetab.c (vars_of_casetab):
* emacs.c (main_1):
Add memory usage stats for case tables.
* lisp.h:
Add comment explaining the `struct generic_usage_stats' more,
as well as the new fields in lrecord_implementation.
* console-impl.h:
* console-impl.h (struct console_methods):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
* scrollbar-x.c:
* scrollbar-x.c (x_compute_scrollbar_instance_usage):
* scrollbar.c:
* scrollbar.c (struct scrollbar_instance_stats):
* scrollbar.c (compute_all_scrollbar_instance_usage):
* scrollbar.c (scrollbar_instance_memory_usage):
* scrollbar.c (scrollbar_objects_create):
* scrollbar.c (vars_of_scrollbar):
* scrollbar.h:
* symsinit.h:
* window.c:
* window.c (find_window_mirror_maybe):
* window.c (struct window_mirror_stats):
* window.c (compute_window_mirror_usage):
* window.c (window_mirror_memory_usage):
* window.c (compute_window_usage):
* window.c (window_objects_create):
* window.c (syms_of_window):
* window.c (vars_of_window):
Redo memory-usage associated with windows, window mirrors, and
scrollbar instances. Should fix crash in find_window_mirror,
among other things. Properly assign memo ry to object memory,
non-Lisp extra memory, and Lisp ancillary memory. For example,
redisplay structures are non-Lisp memory hanging off a window
mirror, not a window; make it an ancillary Lisp-object field.
Window mirrors and scrollbar instances have their own statistics,
among other things.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 25 Mar 2010 06:07:25 -0500 |
parents | 7039e6323819 |
children | 308d34e9f07d |
line wrap: on
line source
;;; symbols.el --- functions for working with symbols and symbol values ;; Copyright (C) 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; Not yet dumped into XEmacs. ;; The idea behind magic variables is that you can specify arbitrary ;; behavior to happen when setting or retrieving a variable's value. The ;; purpose of this is to make it possible to cleanly provide support for ;; obsolete variables (e.g. unread-command-event, which is obsolete for ;; unread-command-events) and variable compatibility ;; (e.g. suggest-key-bindings, the FSF equivalent of ;; teach-extended-commands-p and teach-extended-commands-timeout). ;; There are a large number of functions pertaining to a variable's ;; value: ;; boundp ;; globally-boundp ;; makunbound ;; symbol-value ;; set / setq ;; default-boundp ;; default-value ;; set-default / setq-default ;; make-variable-buffer-local ;; make-local-variable ;; kill-local-variable ;; kill-console-local-variable ;; symbol-value-in-buffer ;; symbol-value-in-console ;; local-variable-p / local-variable-if-set-p ;; Plus some "meta-functions": ;; defvaralias ;; variable-alias ;; indirect-variable ;; I wanted an implementation that: ;; -- would work with all the above functions, but (a) didn't require ;; a separate handler for every function, and (b) would work OK ;; even if more functions are added (e.g. `set-symbol-value-in-buffer' ;; or `makunbound-default') or if more arguments are added to a ;; function. ;; -- avoided consing if at all possible. ;; -- didn't slow down operations on non-magic variables (therefore, ;; storing the magic information using `put' is ruled out). ;; ;;; Code: ;; perhaps this should check whether the functions are bound, so that ;; some handlers can be unspecified. That requires that all functions ;; are defined before `define-magic-variable-handlers' is called, ;; though. ;; perhaps there should be something that combines ;; `define-magic-variable-handlers' with `defvaralias'. (globally-declare-fboundp '(set-magic-variable-handler)) (defun define-magic-variable-handlers (variable handler-class harg) "Set the magic variable handles for VARIABLE to those in HANDLER-CLASS. HANDLER-CLASS should be a symbol. The handlers are constructed by adding the handler type to HANDLER-CLASS. HARG is passed as the HARG value for each of the handlers." (mapcar #'(lambda (htype) (set-magic-variable-handler variable htype (intern (concat (symbol-value handler-class) "-" (symbol-value htype))) harg)) '(get-value set-value other-predicate other-action))) ;; unread-command-event (defun mvh-first-of-list-get-value (sym fun args harg) (car (apply fun harg args))) (defun mvh-first-of-list-set-value (sym value setfun getfun args harg) (apply setfun harg (cons value (apply getfun harg args)) args)) (defun mvh-first-of-list-other-predicate (sym fun args harg) (apply fun harg args)) (defun mvh-first-of-list-other-action (sym fun args harg) (apply fun harg args)) (define-magic-variable-handlers 'unread-command-event 'mvh-first-of-list 'unread-command-events) ;; last-command-char, last-input-char, unread-command-char (defun mvh-char-to-event-get-value (sym fun args harg) (event-to-character (apply fun harg args))) (defun mvh-char-to-event-set-value (sym value setfun getfun args harg) (let ((event (apply getfun harg args))) (if (event-live-p event) nil (setq event (make-event)) (apply setfun harg event args)) (character-to-event value event))) (defun mvh-char-to-event-other-predicate (sym fun args harg) (apply fun harg args)) (defun mvh-char-to-event-other-action (sym fun args harg) (apply fun harg args)) (define-magic-variable-handlers 'last-command-char 'mvh-char-to-event 'last-command-event) (define-magic-variable-handlers 'last-input-char 'mvh-char-to-event 'last-input-event) (define-magic-variable-handlers 'unread-command-char 'mvh-char-to-event 'unread-command-event) ;; suggest-key-bindings (set-magic-variable-handler 'suggest-key-bindings 'get-value #'(lambda (sym fun args harg) (and (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args)))) (set-magic-variable-handler 'suggest-key-bindings 'set-value #'(lambda (sym value setfun getfun args harg) (apply setfun 'teach-extended-commands-p (not (null value)) args) (if value (apply 'teach-extended-commands-timeout (if (numberp value) value 2) args)))) (set-magic-variable-handler 'suggest-key-bindings 'other-action #'(lambda (sym fun args harg) (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args))) (set-magic-variable-handler 'suggest-key-bindings 'other-predicate #'(lambda (sym fun args harg) (and (apply fun 'teach-extended-commands-p args) (apply fun 'teach-extended-commands-timeout args)))) ;;; symbols.el ends here