Mercurial > hg > xemacs-beta
annotate lisp/dialog-items.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 | 42375619fa45 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 442 | 1 ;;; dialog-items.el --- Dialog-box content for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 2000 Andy Piper. | |
| 4 ;; Copyright (C) 2000 Ben Wing. | |
| 5 | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: content, gui, internal, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: Not in FSF. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; | |
| 31 ;; Simple search dialog | |
| 32 ;; | |
| 33 (defvar search-dialog-direction t) | |
| 34 (defvar search-dialog-regexp nil) | |
| 35 (defvar search-dialog nil) | |
| 36 | |
| 37 (defun search-dialog-callback (parent image-instance event) | |
| 38 (save-selected-frame | |
| 39 (select-frame parent) | |
| 40 (let ((domain (frame-selected-window (event-channel event)))) | |
| 41 (funcall (if search-dialog-direction | |
| 42 (if search-dialog-regexp | |
| 43 're-search-forward | |
| 44 'search-forward) | |
| 45 (if search-dialog-regexp | |
| 46 're-search-backward | |
| 47 'search-backward)) | |
| 48 (glyph-image-property | |
| 49 (car (glyph-image-property | |
| 50 (nth 1 (glyph-image-property | |
| 51 search-dialog :items domain)) | |
| 52 :items domain)) :text domain)) | |
| 53 (isearch-highlight (match-beginning 0) (match-end 0))))) | |
| 54 | |
| 55 (defun make-search-dialog () | |
| 56 "Popup a search dialog box." | |
| 57 (interactive) | |
| 58 (let ((parent (selected-frame))) | |
| 59 (make-dialog-box | |
| 60 'general | |
| 61 :parent parent | |
| 62 :title "Search" | |
| 863 | 63 :autosize t |
| 442 | 64 :spec |
| 65 (setq search-dialog | |
| 66 (make-glyph | |
| 67 `[layout | |
| 863 | 68 :orientation horizontal |
| 69 :vertically-justify top | |
| 70 :horizontally-justify center | |
| 442 | 71 :border [string :data "Search"] |
| 72 :items | |
| 863 | 73 ([layout :orientation vertical |
| 74 :justify top ; implies left also | |
| 442 | 75 :items |
| 76 ([string :data "Search for:"] | |
| 77 [button :descriptor "Match Case" | |
| 78 :style toggle | |
| 79 :selected (not case-fold-search) | |
| 80 :callback (setq case-fold-search | |
| 81 (not case-fold-search))] | |
| 82 [button :descriptor "Regular Expression" | |
| 83 :style toggle | |
| 84 :selected search-dialog-regexp | |
| 85 :callback (setq search-dialog-regexp | |
| 86 (not search-dialog-regexp))] | |
| 87 [button :descriptor "Forwards" | |
| 88 :style radio | |
| 89 :selected search-dialog-direction | |
| 90 :callback (setq search-dialog-direction t)] | |
| 91 [button :descriptor "Backwards" | |
| 92 :style radio | |
| 93 :selected (not search-dialog-direction) | |
| 94 :callback (setq search-dialog-direction nil)] | |
| 95 )] | |
| 863 | 96 [layout :orientation vertical |
| 97 :vertically-justify top | |
| 98 :horizontally-justify right | |
| 99 :items | |
| 442 | 100 ([edit-field :width 15 :descriptor "" :active t |
| 863 | 101 :initial-focus t] |
| 442 | 102 [button :width 10 :descriptor "Find Next" |
| 103 :callback-ex | |
| 104 (lambda (image-instance event) | |
| 105 (search-dialog-callback ,parent | |
| 106 image-instance | |
| 107 event))] | |
| 108 [button :width 10 :descriptor "Cancel" | |
| 109 :callback-ex | |
| 110 (lambda (image-instance event) | |
| 111 (isearch-dehighlight) | |
| 112 (delete-frame | |
| 113 (event-channel event)))])])])) | |
| 863 | 114 ;; These are no longer strictly necessary, but not setting a size |
| 115 ;; at all yields a much more noticeable resize since the initial | |
| 116 ;; frame is so big. | |
| 117 :properties `(height ,(widget-logical-to-character-height 6) | |
| 118 width ,(widget-logical-to-character-width 39)) | |
| 119 ))) |