Mercurial > hg > xemacs-beta
view lisp/term/bg-mouse.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 | d682c0f82a71 |
children | 85bd42a1e544 308d34e9f07d |
line wrap: on
line source
;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse. ;; Copyright (C) Free Software Foundation, Inc. Oct 1985. ;; Author: John Robinson <jr@bbn-unix.arpa> ;; Stephen Gildea <gildea@bbn.com> ;; Maintainer: FSF ;; Keywords: hardware ;; This file is part of GNU Emacs. ;; GNU Emacs 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. ;; GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; Code: ;;; #### utterly broken. I've put in hacks so we don't get byte-comp ;;; warnings, but this shit should go NOW. --ben ;;; Original version by John Robinson (jr@bbn-unix.arpa, bbncca!jr), Oct 1985 ;;; Modularized and enhanced by gildea@bbn.com Nov 1987 ;;; Time stamp <89/03/21 14:27:08 gildea> ;;; User customization option: (defvar bg-mouse-fast-select-window nil "*Non-nil for mouse hits to select new window, then execute; else just select.") ;;; These numbers are summed to make the index into the mouse-map. ;;; The low three bits correspond to what the mouse actually sends. (defconst bg-button-r 1) (defconst bg-button-m 2) (defconst bg-button-c 2) (defconst bg-button-l 4) (defconst bg-in-modeline 8) (defconst bg-in-scrollbar 16) (defconst bg-in-minibuf 24) ;;; semicolon screws up indenting, so use this instead (defconst semicolon ?\;) ;;; Defuns: ;; #### bunch of crap. (globally-declare-boundp 'mouse-map) (defun bg-window-edges (&optional win) (error "not implemented") (window-pixel-edges win)) (defun bg-mouse-report (prefix-arg) "Read, parse, and execute a BBN BitGraph mouse click. L-- move point | These apply for mouse click in a window. --R set mark | If bg-mouse-fast-select-window is nil, L-R kill region | these commands on a nonselected window -C- move point and yank | just select that window. LC- yank-pop | -CR or LCR undo | \"Scroll bar\" is right-hand window column. on modeline: on \"scroll bar\": in minibuffer: L-- scroll-up line to top execute-extended-command --R scroll-down line to bottom eval-expression -C- proportional goto-char line to middle suspend-emacs To reinitialize the mouse if the terminal is reset, type ESC : RET" (interactive "P") (declare (special bg-mouse-x bg-mouse-y bg-cursor-window)) (bg-get-tty-num semicolon) (let* ((screen-mouse-x (min (1- (frame-width)) ;don't hit column 86! (/ (bg-get-tty-num semicolon) 9))) (screen-mouse-y (- (1- (frame-height)) ;assume default font size. (/ (bg-get-tty-num semicolon) 16))) (bg-mouse-buttons (% (bg-get-tty-num ?c) 8)) (bg-mouse-window (bg-window-from-x-y screen-mouse-x screen-mouse-y)) (bg-cursor-window (selected-window)) (edges (bg-window-edges bg-mouse-window)) (minibuf-p (= screen-mouse-y (1- (frame-height)))) (in-modeline-p (and (not minibuf-p) (= screen-mouse-y (1- (nth 3 edges))))) (in-scrollbar-p (and (not minibuf-p) (not in-modeline-p) (>= screen-mouse-x (1- (nth 2 edges))))) (same-window-p (eq bg-mouse-window bg-cursor-window)) (in-minibuf-p (and minibuf-p (not bg-mouse-window))) ;minibuf must be inactive (bg-mode-bits (+ (if in-minibuf-p bg-in-minibuf 0) (if in-modeline-p bg-in-modeline 0) (if in-scrollbar-p bg-in-scrollbar 0))) (bg-command (lookup-key mouse-map (char-to-string (+ bg-mode-bits bg-mouse-buttons)))) (bg-mouse-x (- screen-mouse-x (nth 0 edges))) (bg-mouse-y (- screen-mouse-y (nth 1 edges)))) (cond ((or in-modeline-p in-scrollbar-p) (select-window bg-mouse-window) (bg-command-execute bg-command) (select-window bg-cursor-window)) ((or same-window-p in-minibuf-p) (bg-command-execute bg-command)) (t ;in another window (select-window bg-mouse-window) (if bg-mouse-fast-select-window (bg-command-execute bg-command))) ))) ;;; Library of commands: (defun bg-set-point () "Move point to location of BitGraph mouse." (interactive) (declare (special bg-mouse-x bg-mouse-y)) (bg-move-point-to-x-y bg-mouse-x bg-mouse-y) (setq this-command 'next-line) ;make subsequent line moves work (setq temporary-goal-column bg-mouse-x)) (defun bg-set-mark () "Set mark at location of BitGraph mouse." (interactive) (declare (special bg-mouse-x bg-mouse-y)) (push-mark) (bg-move-point-to-x-y bg-mouse-x bg-mouse-y) (exchange-point-and-mark)) (defun bg-yank () "Move point to location of BitGraph mouse and yank." (interactive "*") (declare (special bg-mouse-x bg-mouse-y)) (bg-move-point-to-x-y bg-mouse-x bg-mouse-y) (setq this-command 'yank) (yank)) (defun yank-pop-1 () (interactive "*") (yank-pop 1)) (defun bg-yank-or-pop () "Move point to location of BitGraph mouse and yank. If last command was a yank, do a yank-pop." (interactive "*") (if (eql last-command 'yank) (yank-pop 1) (bg-yank))) ;;; In 18.51, Emacs Lisp doesn't provide most-positive-fixnum (defconst bg-most-positive-fixnum 8388607) (defun bg-move-by-percentage () "Go to location in buffer that is the same percentage of the way through the buffer as the BitGraph mouse's X position in the window." (interactive) (declare (special bg-mouse-x bg-mouse-y)) ;; check carefully for overflow in intermediate calculations (goto-char (cond ((zerop bg-mouse-x) 0) ((< (buffer-size) (/ bg-most-positive-fixnum bg-mouse-x)) ;; no danger of overflow: compute it exactly (/ (* bg-mouse-x (buffer-size)) (1- (window-width)))) (t ;; overflow possible: approximate (* (/ (buffer-size) (1- (window-width))) bg-mouse-x)))) (beginning-of-line) (what-cursor-position)) (defun bg-mouse-line-to-top () "Scroll the line pointed to by the BitGraph mouse to the top of the window." (interactive) (declare (special bg-mouse-x bg-mouse-y)) (scroll-up bg-mouse-y)) (defun bg-mouse-line-to-center () "Scroll the line pointed to by the BitGraph mouse to the center of the window." (interactive) (declare (special bg-mouse-x bg-mouse-y)) (scroll-up (/ (+ 2 bg-mouse-y bg-mouse-y (- (window-height))) 2))) (defun bg-mouse-line-to-bottom () "Scroll the line pointed to by the mouse to the bottom of the window." (interactive) (declare (special bg-mouse-x bg-mouse-y)) (scroll-up (+ bg-mouse-y (- 2 (window-height))))) (defun bg-kill-region () (interactive "*") (kill-region (region-beginning) (region-end))) (defun bg-insert-moused-sexp () "Insert a copy of the word (actually sexp) that the mouse is pointing at. Sexp is inserted into the buffer at point (where the text cursor is)." (interactive) (declare (special bg-mouse-x bg-mouse-y bg-cursor-window)) (let ((moused-text (save-excursion (bg-move-point-to-x-y bg-mouse-x bg-mouse-y) (if (looking-at "\\s)") (forward-char 1) (forward-sexp 1)) (buffer-substring (save-excursion (backward-sexp 1) (point)) (point))))) (select-window bg-cursor-window) (delete-horizontal-space) (cond ((bolp) (indent-according-to-mode)) ;; In Lisp assume double-quote is closing; in Text assume opening. ;; Why? Because it does the right thing most often. ((save-excursion (backward-char 1) (and (not (looking-at "\\s\"")) (looking-at "[`'\"\\]\\|\\s("))) nil) (t (insert-string " "))) (insert-string moused-text) (or (eolp) (looking-at "\\s.\\|\\s)") (and (looking-at "'") (looking-at "\\sw")) ;hack for text mode (save-excursion (insert-string " "))))) ;;; Utility functions: (defun bg-get-tty-num (term-char) "Read from terminal until TERM-CHAR is read, and return intervening number. If non-numeric not matching TERM-CHAR, reprogram the mouse and signal an error." (let ((num 0) (char (- (read-char) 48))) (while (and (>= char 0) (<= char 9)) (setq num (+ (* num 10) char)) (setq char (- (read-char) 48))) (or (eq term-char (+ char 48)) (progn (bg-program-mouse) (error "Invalid data format in bg-mouse command: mouse reinitialized."))) num)) ;;; Note that this fails in the minibuf because move-to-column doesn't ;;; allow for the width of the prompt. (defun bg-move-point-to-x-y (x y) "Position cursor in window coordinates. X and Y are 0-based character positions in the window." (move-to-window-line y) ;; if not on a wrapped line, zero-column will be 0 (let ((zero-column (current-column)) (scroll-offset (window-hscroll))) ;; scrolling takes up column 0 to display the $ (if (> scroll-offset 0) (setq scroll-offset (1- scroll-offset))) (move-to-column (+ zero-column scroll-offset x)) )) ;;; Returns the window that screen position (x, y) is in or nil if none, ;;; meaning we are in the echo area with a non-active minibuffer. ;;; If coordinates-in-window-p were not in an X-windows-specific file ;;; we could use that. In Emacs 19 can even use locate-window-from-coordinates (defun bg-window-from-x-y (x y) "Find window corresponding to screen coordinates. X and Y are 0-based character positions on the screen." (let ((edges (bg-window-edges)) (window nil)) (while (and (not (eq window (selected-window))) (or (< y (nth 1 edges)) (>= y (nth 3 edges)) (< x (nth 0 edges)) (>= x (nth 2 edges)))) (setq window (next-window window)) (setq edges (bg-window-edges window))) (cond ((eq window (selected-window)) nil) ;we've looped: not found ((not window) (selected-window)) ;just starting: current window (t window)) )) (defun bg-command-execute (bg-command) (if (commandp bg-command) (command-execute bg-command) (ding))) (defun bg-program-mouse () (send-string-to-terminal "\e:0;7;;;360;512;9;16;9;16c")) ;;; Note that the doc string for mouse-map (as defined in subr.el) ;;; says it is for the X-window mouse. This is wrong; that keymap ;;; should be used for your mouse no matter what terminal you have. (or (keymapp mouse-map) (setq mouse-map (make-keymap))) (defun bind-bg-mouse-click (click-code function) "Bind bg-mouse CLICK-CODE to run FUNCTION." (define-key mouse-map (char-to-string click-code) function)) (bind-bg-mouse-click bg-button-l 'bg-set-point) (bind-bg-mouse-click bg-button-m 'bg-yank) (bind-bg-mouse-click bg-button-r 'bg-set-mark) (bind-bg-mouse-click (+ bg-button-l bg-button-m) 'yank-pop-1) (bind-bg-mouse-click (+ bg-button-l bg-button-r) 'bg-kill-region) (bind-bg-mouse-click (+ bg-button-m bg-button-r) 'undo) (bind-bg-mouse-click (+ bg-button-l bg-button-m bg-button-r) 'undo) (bind-bg-mouse-click (+ bg-in-modeline bg-button-l) 'scroll-up) (bind-bg-mouse-click (+ bg-in-modeline bg-button-m) 'bg-move-by-percentage) (bind-bg-mouse-click (+ bg-in-modeline bg-button-r) 'scroll-down) (bind-bg-mouse-click (+ bg-in-scrollbar bg-button-l) 'bg-mouse-line-to-top) (bind-bg-mouse-click (+ bg-in-scrollbar bg-button-m) 'bg-mouse-line-to-center) (bind-bg-mouse-click (+ bg-in-scrollbar bg-button-r) 'bg-mouse-line-to-bottom) (bind-bg-mouse-click (+ bg-in-minibuf bg-button-l) 'execute-extended-command) (bind-bg-mouse-click (+ bg-in-minibuf bg-button-m) 'suspend-emacs) (bind-bg-mouse-click (+ bg-in-minibuf bg-button-r) 'eval-expression) (provide 'bg-mouse) ;;; bg-mouse.el ends here