Mercurial > hg > xemacs-beta
annotate lisp/x-select.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 | 5e906dd5c3e9 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-select.el --- Lisp interface to X Selections. |
| 2 | |
| 3 ;; Copyright (C) 1990, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: extensions, 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, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: FSF 19.30 (select.el). | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when X support is compiled in). | |
| 31 | |
| 32 ;; The selection code requires us to use certain symbols whose names are | |
| 33 ;; all upper-case; this may seem tasteless, but it makes there be a 1:1 | |
| 34 ;; correspondence between these symbols and X Atoms (which are upcased). | |
| 35 | |
| 36 ;;; Code: | |
| 37 | |
| 502 | 38 (globally-declare-fboundp |
| 39 '(x-get-cutbuffer-internal | |
| 40 x-rotate-cutbuffers-internal x-store-cutbuffer-internal)) | |
| 41 | |
| 428 | 42 (define-obsolete-function-alias 'x-selection-exists-p 'selection-exists-p) |
| 43 (define-obsolete-function-alias 'x-selection-owner-p 'selection-owner-p) | |
| 44 (define-obsolete-variable-alias 'x-selection-converter-alist 'selection-converter-alist) | |
| 45 (define-obsolete-variable-alias 'x-lost-selection-hooks 'lost-selection-hooks) | |
| 2620 | 46 (define-obsolete-variable-alias 'x-selected-text-type 'selection-preferred-types) |
| 428 | 47 (define-obsolete-function-alias 'x-valid-simple-selection-p 'valid-simple-selection-p) |
| 48 (define-obsolete-function-alias 'x-own-selection 'own-selection) | |
| 49 (define-obsolete-function-alias 'x-disown-selection 'disown-selection) | |
| 50 (define-obsolete-function-alias 'x-delete-primary-selection 'delete-primary-selection) | |
| 51 (define-obsolete-function-alias 'x-copy-primary-selection 'copy-primary-selection) | |
| 52 (define-obsolete-function-alias 'x-kill-primary-selection 'kill-primary-selection) | |
| 53 (define-obsolete-function-alias 'x-select-make-extent-for-selection | |
| 54 'select-make-extent-for-selection) | |
| 55 (define-obsolete-function-alias 'x-cut-copy-clear-internal 'cut-copy-clear-internal) | |
| 56 (define-obsolete-function-alias 'x-get-selection 'get-selection) | |
| 57 (define-obsolete-function-alias 'x-get-clipboard 'get-clipboard) | |
| 444 | 58 (define-obsolete-function-alias 'x-yank-clipboard-selection |
| 428 | 59 'yank-clipboard-selection) |
| 60 (define-obsolete-function-alias 'x-disown-selection-internal | |
| 61 'disown-selection-internal) | |
| 62 | |
| 63 (defun x-get-secondary-selection () | |
| 64 "Return text selected from some X window." | |
| 65 (get-selection 'SECONDARY)) | |
| 66 | |
| 67 (defun x-own-secondary-selection (selection &optional type) | |
| 68 "Make a secondary X Selection of the given argument. The argument may be a | |
| 69 string or a cons of two markers (in which case the selection is considered to | |
| 70 be the text between those markers)." | |
| 71 (interactive (if (not current-prefix-arg) | |
| 72 (list (read-string "Store text for pasting: ")) | |
| 73 (list (cons ;; these need not be ordered. | |
| 74 (copy-marker (point-marker)) | |
| 75 (copy-marker (mark-marker)))))) | |
| 76 (own-selection selection 'SECONDARY)) | |
| 77 | |
| 78 (defun x-notice-selection-requests (selection type successful) | |
| 444 | 79 "for possible use as the value of `x-sent-selection-hooks'." |
| 428 | 80 (if (not successful) |
| 81 (message "Selection request failed to convert %s to %s" | |
| 82 selection type) | |
| 83 (message "Sent selection %s as %s" selection type))) | |
| 84 | |
| 85 (defun x-notice-selection-failures (selection type successful) | |
| 444 | 86 "for possible use as the value of `x-sent-selection-hooks'." |
| 428 | 87 (or successful |
| 88 (message "Selection request failed to convert %s to %s" | |
| 89 selection type))) | |
| 90 | |
| 91 ;(setq x-sent-selection-hooks 'x-notice-selection-requests) | |
| 92 ;(setq x-sent-selection-hooks 'x-notice-selection-failures) | |
| 93 | |
| 94 | |
| 95 ;;; Cut Buffer support | |
| 96 | |
| 97 ;;; FSF name x-get-cut-buffer | |
| 98 (defun x-get-cutbuffer (&optional which-one) | |
| 99 "Return the value of one of the 8 X server cut buffers. | |
| 100 Optional arg WHICH-ONE should be a number from 0 to 7, defaulting to 0. | |
| 101 Cut buffers are considered obsolete; you should use selections instead. | |
| 444 | 102 This function does nothing if cut buffer support was not compiled in." |
| 103 (when (fboundp 'x-get-cutbuffer-internal) | |
| 104 (x-get-cutbuffer-internal | |
| 105 (aref [CUT_BUFFER0 CUT_BUFFER1 CUT_BUFFER2 CUT_BUFFER3 | |
| 106 CUT_BUFFER4 CUT_BUFFER5 CUT_BUFFER6 CUT_BUFFER7] | |
| 107 (or which-one 0))))) | |
| 428 | 108 |
| 109 ;;; FSF name x-set-cut-buffer | |
| 110 (defun x-store-cutbuffer (string &optional push) | |
| 111 "Store STRING into the X server's primary cut buffer. | |
| 444 | 112 If optional arg PUSH is non-nil, also rotate the cut buffers: this |
| 113 means the previous value of the primary cut buffer moves to the second | |
| 428 | 114 cut buffer, and the second to the third, and so on (there are 8 buffers.) |
| 115 Cut buffers are considered obsolete; you should use selections instead. | |
| 444 | 116 This function does nothing if cut buffer support was not compiled in." |
| 117 (when (fboundp 'x-store-cutbuffer-internal) | |
| 118 (when push | |
| 119 (x-rotate-cutbuffers-internal 1)) | |
| 120 (x-store-cutbuffer-internal 'CUT_BUFFER0 string))) | |
| 428 | 121 |
| 122 | |
| 123 ;FSFmacs (provide 'select) | |
| 124 | |
| 125 ;;; x-select.el ends here. |