Mercurial > hg > xemacs-beta
view lisp/wid-browse.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 | 023b83f4e54b |
children | 308d34e9f07d |
line wrap: on
line source
;;; wid-browse.el --- Functions for browsing widgets. ;; ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: extensions ;; Version: 1.9960 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; Widget browser. See `widget.el'. ;;; Code: (require 'easymenu) (require 'custom) (require 'wid-edit) (eval-when-compile (require 'cl)) (defgroup widget-browse nil "Customization support for browsing widgets." :group 'widgets) ;;; The Mode. (defvar widget-browse-mode-map nil "Keymap for `widget-browse-mode'.") (unless widget-browse-mode-map (setq widget-browse-mode-map (make-sparse-keymap)) (set-keymap-parent widget-browse-mode-map widget-keymap) (define-key widget-browse-mode-map "q" 'bury-buffer)) (easy-menu-define widget-browse-mode-customize-menu widget-browse-mode-map "Menu used in widget browser buffers." (customize-menu-create 'widgets)) (easy-menu-define widget-browse-mode-menu widget-browse-mode-map "Menu used in widget browser buffers." '("Widget" ["Browse" widget-browse t] ["Browse At" widget-browse-at t])) (defcustom widget-browse-mode-hook nil "Hook called when entering widget-browse-mode." :type 'hook :group 'widget-browse) (defun widget-browse-mode () "Major mode for widget browser buffers. The following commands are available: \\[widget-forward] Move to next button or editable field. \\[widget-backward] Move to previous button or editable field. \\[widget-button-click] Activate button under the mouse pointer. \\[widget-button-press] Activate button under point. Entry to this mode calls the value of `widget-browse-mode-hook' if that value is non-nil." (kill-all-local-variables) (setq major-mode 'widget-browse-mode mode-name "Widget") (use-local-map widget-browse-mode-map) (easy-menu-add widget-browse-mode-customize-menu) (easy-menu-add widget-browse-mode-menu) (run-hooks 'widget-browse-mode-hook)) ;;; Commands. ;;;###autoload (defun widget-browse-at (pos) "Browse the widget under point." (interactive "d") (let* ((field (get-char-property pos 'field)) (button (get-char-property pos 'button)) (doc (get-char-property pos 'widget-doc)) (text (cond (field "This is an editable text area.") (button "This is an active area.") (doc "This is documentation text.") (t "This is unidentified text."))) (widget (or field button doc))) (when widget (widget-browse widget)) (message text))) (defvar widget-browse-history nil) ;;;###autoload (defun widget-browse (widget) "Create a widget browser for WIDGET." (interactive (list (completing-read "Widget: " obarray (lambda (symbol) (get symbol 'widget-type)) t nil 'widget-browse-history))) (if (stringp widget) (setq widget (intern widget))) (unless (if (symbolp widget) (get widget 'widget-type) (and (consp widget) (get (widget-type widget) 'widget-type))) (error "Not a widget.")) ;; Create the buffer. (if (symbolp widget) (let ((buffer (format "*Browse %s Widget*" widget))) (kill-buffer (get-buffer-create buffer)) (switch-to-buffer (get-buffer-create buffer))) (kill-buffer (get-buffer-create "*Browse Widget*")) (switch-to-buffer (get-buffer-create "*Browse Widget*"))) (widget-browse-mode) ;; Quick way to get out. ;; (widget-create 'push-button ;; :action (lambda (widget &optional event) ;; (bury-buffer)) ;; "Quit") ;; (widget-insert "\n") ;; Top text indicating whether it is a class or object browser. (if (listp widget) (widget-insert "Widget object browser.\n\nClass: ") (widget-insert "Widget class browser.\n\n") (widget-create 'widget-browse :format "%[%v%]\n%d" :doc (get widget 'widget-documentation) widget) (unless (eq (preceding-char) ?\n) (widget-insert "\n")) (widget-insert "\nSuper: ") (setq widget (get widget 'widget-type))) ;; Now show the attributes. (let ((name (car widget)) (items (cdr widget)) key value printer) (widget-create 'widget-browse :format "%[%v%]" name) (widget-insert "\n") (while items (setq key (nth 0 items) value (nth 1 items) printer (or (get key 'widget-keyword-printer) 'widget-browse-sexp) items (cdr (cdr items))) (widget-insert "\n" (symbol-name key) "\n\t") (funcall printer widget key value) (widget-insert "\n"))) (widget-setup) (goto-char (point-min))) ;;;###autoload (defun widget-browse-other-window (&optional widget) "Show widget browser for WIDGET in other window." (interactive) (let ((window (selected-window))) (switch-to-buffer-other-window "*Browse Widget*") (if widget (widget-browse widget) (call-interactively 'widget-browse)) (select-window window))) ;;; The `widget-browse' Widget. (define-widget 'widget-browse 'push-button "Button for creating a widget browser. The :value of the widget shuld be the widget to be browsed." :format "%[[%v]%]" :value-create 'widget-browse-value-create :action 'widget-browse-action) (defun widget-browse-action (widget &optional event) ;; Create widget browser for WIDGET's :value. (widget-browse (widget-get widget :value))) (defun widget-browse-value-create (widget) ;; Insert type name. (let ((value (widget-get widget :value))) (cond ((symbolp value) (insert (symbol-name value))) ((consp value) (insert (symbol-name (widget-type value)))) (t (insert "strange"))))) ;;; Keyword Printer Functions. (defun widget-browse-widget (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a widget." (widget-create 'widget-browse value)) (defun widget-browse-widgets (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (while value (widget-create 'widget-browse (car value)) (setq value (cdr value)) (when value (widget-insert " ")))) (defun widget-browse-sexp (widget key value) "Insert description of WIDGET's KEY VALUE. Nothing is assumed about value." (let ((pp (condition-case signal (declare-fboundp (pp-to-string value)) (error (prin1-to-string signal))))) (when (string-match "\n\\'" pp) (setq pp (substring pp 0 (1- (length pp))))) (if (cond ((string-match "\n" pp) nil) ((> (length pp) (- (window-width) (current-column))) nil) (t t)) (widget-insert pp) (widget-create 'push-button :tag "show" :action (lambda (widget &optional event) (with-output-to-temp-buffer "*Pp Eval Output*" (princ (widget-get widget :value)))) pp)))) (defun widget-browse-sexps (widget key value) "Insert description of WIDGET's KEY VALUE. VALUE is assumed to be a list of widgets." (let ((target (current-column))) (while value (widget-browse-sexp widget key (car value)) (setq value (cdr value)) (when value (widget-insert "\n" (make-string target ?\ )))))) ;;; Keyword Printers. (put :parent 'widget-keyword-printer 'widget-browse-widget) (put :children 'widget-keyword-printer 'widget-browse-widgets) (put :buttons 'widget-keyword-printer 'widget-browse-widgets) (put :button 'widget-keyword-printer 'widget-browse-widget) (put :args 'widget-keyword-printer 'widget-browse-sexps) ;;; Widget Minor Mode. (defvar widget-minor-mode nil "I non-nil, we are in Widget Minor Mode.") (make-variable-buffer-local 'widget-minor-mode) (defvar widget-minor-mode-map nil "Keymap used in Widget Minor Mode.") (unless widget-minor-mode-map (setq widget-minor-mode-map (make-sparse-keymap)) (set-keymap-parent widget-minor-mode-map widget-keymap)) ;;;###autoload (defun widget-minor-mode (&optional arg) "Togle minor mode for traversing widgets. With arg, turn widget mode on if and only if arg is positive." (interactive "P") (cond ((null arg) (setq widget-minor-mode (not widget-minor-mode))) ((<= arg 0) (setq widget-minor-mode nil)) (t (setq widget-minor-mode t))) (force-mode-line-update)) (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget")) (add-to-list 'minor-mode-map-alist (cons 'widget-minor-mode widget-minor-mode-map)) ;;; The End: (provide 'wid-browse) ;; wid-browse.el ends here