Mercurial > hg > xemacs-beta
annotate lisp/auto-show.el @ 5157:1fae11d56ad2
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.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 18 Mar 2010 10:50:06 -0500 |
| parents | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; auto-show.el --- perform automatic horizontal scrolling as point moves |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; This file is in the public domain. | |
| 5 | |
| 6 ;; Author: Pete Ware <ware@cis.ohio-state.edu> | |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Keywords: extensions, internal, dumped | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 24 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 25 ;; 02111-1307, USA. | |
| 26 | |
| 27 ;;; Synched up with: Emacs/Mule zeta. | |
| 28 | |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;; This file is dumped with XEmacs. | |
| 32 | |
| 33 ;; Modified by: Ben Wing <ben@xemacs.org> | |
| 34 | |
| 35 ;; This file provides functions that | |
| 36 ;; automatically scroll the window horizontally when the point moves | |
| 37 ;; off the left or right side of the window. | |
| 38 | |
| 39 ;; Once this library is loaded, automatic horizontal scrolling | |
| 40 ;; occurs whenever long lines are being truncated. | |
| 41 ;; To request truncation of long lines, set the variable | |
| 42 ;; Setting the variable `truncate-lines' to non-nil. | |
| 43 ;; You can do this for all buffers as follows: | |
| 44 ;; | |
| 45 ;; (set-default 'truncate-lines t) | |
| 46 | |
| 47 ;; Here is how to do it for C mode only: | |
| 48 ;; | |
| 49 ;; (set-default 'truncate-lines nil) ; this is the original value | |
| 50 ;; (defun my-c-mode-hook () | |
| 51 ;; "Run when C-mode starts up. Changes ..." | |
| 52 ;; ... set various personal preferences ... | |
| 53 ;; (setq truncate-lines t)) | |
| 54 ;; (add-hook 'c-mode-hook 'my-c-mode-hook) | |
| 55 ;; | |
| 56 ;; | |
| 57 ;; As a finer level of control, you can still have truncated lines but | |
| 58 ;; without the automatic horizontal scrolling by setting the buffer | |
| 59 ;; local variable `auto-show-mode' to nil. The default value is t. | |
| 60 ;; The command `auto-show-mode' toggles the value of the variable | |
| 61 ;; `auto-show-mode'. | |
| 62 | |
| 63 ;;; Code: | |
| 64 | |
| 65 (defgroup auto-show nil | |
| 66 "Perform automatic horizontal scrolling as point moves." | |
| 67 :group 'display | |
| 68 :group 'extensions) | |
| 69 | |
| 70 ;; This is preloaded, so we don't need special :set, :require, etc. | |
| 71 (defcustom auto-show-mode t | |
| 72 "*Non-nil enables automatic horizontal scrolling, when lines are truncated. | |
| 73 The default value is t. To change the default, do this: | |
| 74 (set-default 'auto-show-mode nil) | |
| 75 See also command `auto-show-mode'. | |
| 76 This variable has no effect when lines are not being truncated. | |
| 77 This variable is automatically local in each buffer where it is set." | |
| 78 :type 'boolean | |
| 79 :group 'auto-show) | |
| 80 | |
| 81 (make-variable-buffer-local 'auto-show-mode) | |
| 82 | |
| 83 (defcustom auto-show-shift-amount 8 | |
| 84 "*Extra columns to scroll. for automatic horizontal scrolling." | |
| 85 :type 'integer | |
| 86 :group 'auto-show) | |
| 87 | |
| 88 (defcustom auto-show-show-left-margin-threshold 50 | |
| 89 "*Threshold column for automatic horizontal scrolling to the right. | |
| 90 If point is before this column, we try to scroll to make the left margin | |
| 91 visible. Setting this to 0 disables this feature." | |
| 92 :type 'number | |
| 93 :group 'auto-show) | |
| 94 | |
| 95 (defun auto-show-mode (arg) | |
| 96 "Turn automatic horizontal scroll mode on or off. | |
| 97 With arg, turn auto scrolling on if arg is positive, off otherwise. | |
| 98 This mode is enabled or disabled for each buffer individually. | |
| 99 It takes effect only when `truncate-lines' is non-nil." | |
| 100 (interactive "P") | |
| 101 (setq auto-show-mode | |
| 102 (if (null arg) | |
| 103 (not auto-show-mode) | |
| 104 (> (prefix-numeric-value arg) 0)))) | |
| 105 | |
| 106 ;; XEmacs addition: | |
| 107 (defvar auto-show-inhibiting-commands | |
| 108 '(scrollbar-char-left | |
| 109 scrollbar-char-right | |
| 110 scrollbar-page-left | |
| 111 scrollbar-page-right | |
| 112 scrollbar-to-left | |
| 113 scrollbar-to-right | |
| 114 scrollbar-horizontal-drag) | |
| 115 "Commands that inhibit auto-show behavior. | |
| 116 This normally includes the horizontal scrollbar commands.") | |
| 117 | |
| 118 ;; XEmacs addition: | |
| 119 (defun auto-show-should-take-action-p () | |
| 120 (and auto-show-mode (window-truncated-p) | |
| 121 (equal (window-buffer) (current-buffer)) | |
| 122 (not (memq this-command auto-show-inhibiting-commands)))) | |
| 123 | |
| 124 ;; XEmacs addition: | |
| 125 (defun auto-show-make-region-visible (start end) | |
| 126 "Move point in such a way that the region (START, END) is visible. | |
| 127 This only does anything if auto-show-mode is enabled, and it doesn't | |
| 128 actually do any horizontal scrolling; rather, it just sets things up so | |
| 129 that the region will be visible when `auto-show-make-point-visible' | |
| 130 is next called (this happens after every command)." | |
| 131 (if (auto-show-should-take-action-p) | |
| 132 (let* ((scroll (window-hscroll)) ;how far window is scrolled | |
| 133 (w-width (- (window-width) | |
| 134 (if (> scroll 0) | |
| 135 2 1))) ;how wide window is on the screen | |
| 136 (right-col (+ scroll w-width)) | |
| 137 (start-col (save-excursion (goto-char start) (current-column))) | |
| 138 (end-col (save-excursion (goto-char end) (current-column)))) | |
| 139 (cond ((and (>= start-col scroll) | |
| 140 (<= end-col right-col)) | |
| 141 ;; already completely visible | |
| 142 nil) | |
| 143 ((< start-col scroll) | |
| 144 (scroll-right (- scroll start-col))) | |
| 145 (t | |
| 146 (scroll-left (- end-col right-col))))))) | |
| 147 | |
| 148 (defun auto-show-make-point-visible (&optional ignore-arg) | |
| 149 "Scroll horizontally to make point visible, if that is enabled. | |
| 150 This function only does something if `auto-show-mode' is non-nil | |
| 151 and longlines are being truncated in the selected window. | |
| 152 See also the command `auto-show-mode'." | |
| 153 (interactive) | |
| 154 ;; XEmacs change | |
| 155 (if (auto-show-should-take-action-p) | |
| 156 (let* ((col (current-column)) ;column on line point is at | |
| 157 (scroll (window-hscroll)) ;how far window is scrolled | |
| 158 (w-width (- (window-width) | |
| 159 (if (> scroll 0) | |
| 160 2 1))) ;how wide window is on the screen | |
| 161 (right-col (+ scroll w-width))) | |
| 162 (if (and (< col auto-show-show-left-margin-threshold) | |
| 163 (< col (window-width)) | |
| 164 (> scroll 0)) | |
| 165 (scroll-right scroll) | |
| 166 (if (< col scroll) ;to the left of the screen | |
| 167 (scroll-right (+ (- scroll col) auto-show-shift-amount)) | |
| 168 (if (or (> col right-col) ;to the right of the screen | |
| 169 (and (= col right-col) | |
| 170 (not (eolp)))) | |
| 171 (scroll-left (+ auto-show-shift-amount | |
| 172 (- col (+ scroll w-width)))))))))) | |
| 173 | |
| 174 ;; XEmacs change: | |
| 175 ;; #### instead of this, we kludgily call it from the C code, to make sure | |
| 176 ;; that it's done after any other things on post-command-hook (which might | |
| 177 ;; move point). | |
| 178 ;; Do auto-scrolling after commands. | |
| 179 ;;(add-hook 'post-command-hook 'auto-show-make-point-visible) | |
| 180 | |
| 181 ;; If being dumped, turn it on right away. | |
| 182 (when (boundp 'pureload) | |
| 183 (auto-show-mode 1)) | |
| 184 | |
| 185 ;; Do auto-scrolling in comint buffers after process output also. | |
| 186 ; XEmacs -- don't do this now, it messes up comint. | |
| 187 ;(add-hook 'comint-output-filter-functions 'auto-show-make-point-visible t) | |
| 188 | |
| 189 (provide 'auto-show) | |
| 190 | |
| 191 ;;; auto-show.el ends here |