Mercurial > hg > xemacs-beta
annotate lisp/symbol-syntax.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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; symbol-syntax.el --- find chars with symbol syntax |
| 2 | |
| 3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Author: JBW, JBW@_CORTEZ | |
| 7 ;; Created: Wed Jun 20 15:15:34 1990 | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: matching | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; Last modified by: Ben Wing, ben@xemacs.org | |
| 33 ;; Last modified on: Mon Oct 2 02:32:05 GMT 1995 | |
| 34 | |
| 35 ;;; Code: | |
| 36 | |
| 37 (defvar symbol-syntax-table-alist nil) | |
| 38 ;; '((c-mode-syntax-table) | |
| 39 ;; (emacs-lisp-mode-syntax-table) | |
| 40 ;; (lisp-mode-syntax-table) | |
| 41 ;; (text-mode-syntax-table))) | |
| 42 | |
| 43 (defun update-symbol-syntax-table-alist () | |
| 44 (let ((alist symbol-syntax-table-alist) | |
| 45 item) | |
| 46 (while (consp alist) | |
| 47 (cond ((null (car alist)) | |
| 48 (error "Missing alist item")) | |
| 49 ((null (car (car alist))) | |
| 50 (error "Alist item with null car")) | |
| 51 ;; this functionality not used | |
| 52 ((symbolp (setq item (car (car alist)))) | |
| 53 (or (null (cdr (car alist))) | |
| 54 (error "Alist item expected to have null cdr")) | |
| 55 (while (symbolp item) | |
| 56 (setq item (symbol-value item))) | |
| 57 (setcar (car alist) item))) | |
| 58 (cond ((not (syntax-table-p (car (car alist)))) | |
| 59 (error "Alist item car expected to be symbol table")) | |
| 60 ((null (cdr (car alist))) | |
| 61 (setcdr (car alist) | |
| 62 (make-symbol-syntax-table (car (car alist)))))) | |
| 63 (setq alist (cdr alist))))) | |
| 64 | |
| 65 (defun get-symbol-syntax-table (norm-table) | |
| 66 (let (result) | |
| 67 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 68 nil | |
| 69 (update-symbol-syntax-table-alist) | |
| 70 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 71 nil | |
| 72 (setq symbol-syntax-table-alist | |
| 73 (cons (list norm-table) | |
| 74 symbol-syntax-table-alist)) | |
| 75 (update-symbol-syntax-table-alist) | |
| 76 (or (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 77 (error "Syntax table missing from symbol-syntax-table-alist")))) | |
| 78 (or (setq result (cdr result)) | |
| 79 (error "Alist item has null cdr")) | |
| 80 (or (syntax-table-p result) | |
| 81 (error "Non-syntax-table item in alist")) | |
| 82 result)) | |
| 83 | |
| 84 (defun make-symbol-syntax-table (in-table) | |
| 85 (let ((out-table (copy-syntax-table in-table))) | |
| 86 (map-syntax-table | |
| 87 #'(lambda (key value) | |
| 88 (if (eq ?_ (char-syntax-from-code value)) | |
| 89 (put-char-table key (set-char-syntax-in-code value ?w) | |
| 90 out-table)) | |
| 91 nil) | |
| 92 out-table) | |
| 93 out-table)) | |
| 94 | |
| 95 ;; stuff for examining contents of syntax tables | |
| 96 ;;(show-chars-with-syntax | |
| 97 ;; '(c-mode-syntax-table | |
| 98 ;; emacs-lisp-mode-syntax-table | |
| 99 ;; lisp-mode-syntax-table | |
| 100 ;; text-mode-syntax-table) | |
| 101 ;; ?_) | |
| 102 | |
| 103 (defun show-chars-with-syntax (tables syntax) | |
| 104 (let ((schars nil)) | |
| 105 (unwind-protect | |
| 106 (while (consp tables) | |
| 107 (let* ((chars nil) | |
| 108 (table-symbol (car tables)) | |
| 109 (table table-symbol)) | |
| 110 (or (symbolp table-symbol) | |
| 111 (error "bad argument non-symbol")) | |
| 112 (while (symbolp table) | |
| 113 (setq table (symbol-value table))) | |
| 114 (map-syntax-table | |
| 115 #'(lambda (key value) | |
| 116 (if (eq syntax (char-syntax-from-code value)) | |
| 117 (setq chars (cons key chars))) | |
| 118 nil) | |
| 119 table) | |
| 120 (setq schars (cons (list table-symbol (nreverse chars)) | |
| 121 schars))) | |
| 122 (setq tables (cdr tables)))) | |
| 123 (nreverse schars))) | |
| 124 | |
| 125 (provide 'symbol-syntax) | |
| 126 | |
| 127 ;;; symbol-syntax.el ends here |