Mercurial > hg > xemacs-beta
view lisp/backquote.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 | aa20a889ff14 91b3aa59f49b |
line wrap: on
line source
;;; backquote.el --- Full backquote support for elisp. Reverse compatible too. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not synched with FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; The bulk of the code is originally from CMU Common Lisp (original notice ;; below). ;; It correctly supports nested backquotes and backquoted vectors. ;; Converted to work with elisp by Miles Bader <miles@cogsci.ed.ac.uk> ;; Changes by Jonathan Stigelman <Stig@hackvan.com>: ;; - Documentation added ;; - support for old-backquote-compatibility-hook nixed because the ;; old-backquote compatibility is now done in the reader... ;; - nixed support for |,.| because ;; (a) it's not in CLtl2 ;; (b) ",.foo" is the same as ". ,foo" ;; (c) because RMS isn't interested in using this version of backquote.el ;; ;; ben@xemacs.org added ,. support back in: ;; (a) yes, it is in CLtl2. Read closely on page 529. ;; (b) RMS in 19.30 adds C support for ,. even if it's not really ;; handled. ;; ;; ********************************************************************** ;; This code was written as part of the CMU Common Lisp project at ;; Carnegie Mellon University, and has been placed in the public domain. ;; If you want to use this code or any part of CMU Common Lisp, please contact ;; Scott Fahlman or slisp-group@cs.cmu.edu. ;; ;; ********************************************************************** ;; ;; BACKQUOTE: Code Spice Lispified by Lee Schumacher. ;; ;; The flags passed back by BQ-PROCESS-2 can be interpreted as follows: ;; ;; |`,|: [a] => a ;; NIL: [a] => a ;the NIL flag is used only when a is NIL ;; T: [a] => a ;the T flag is used when a is self-evaluating ;; QUOTE: [a] => (QUOTE a) ;; APPEND: [a] => (APPEND . a) ;; NCONC: [a] => (NCONC . a) ;; LIST: [a] => (LIST . a) ;; LIST*: [a] => (LIST* . a) ;; ;; The flags are combined according to the following set of rules: ;; ([a] means that a should be converted according to the previous table) ;; ;; \ car || otherwise | QUOTE or | |`,@| | |`,.| ;;cdr \ || | T or NIL | | ;;============================================================================ ;; |`,| ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a [d]) |NCONC (a [d]) ;; NIL ||LIST ([a]) |QUOTE (a) |<hair> a |<hair> a ;;QUOTE or T||LIST* ([a] [d]) |QUOTE (a . d) |APPEND (a [d]) |NCONC (a [d]) ;; APPEND ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a . d) |NCONC (a [d]) ;; NCONC ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a [d]) |NCONC (a . d) ;; LIST ||LIST ([a] . d) |LIST ([a] . d) |APPEND (a [d]) |NCONC (a [d]) ;; LIST* ||LIST* ([a] . d) |LIST* ([a] . d) |APPEND (a [d]) |NCONC (a [d]) ;; ;;<hair> involves starting over again pretending you had read ".,a)" instead ;; of ",@a)" ;; ;; These are the forms it expects: |backquote| |`| |,| |,@| and |,.|. ;;; Code: (defconst bq-backquote-marker 'backquote) (defconst bq-backtick-marker '\`) ; remnant of the old lossage (defconst bq-comma-marker '\,) (defconst bq-at-marker '\,@) (defconst bq-dot-marker '\,\.) ;;; ---------------------------------------------------------------- (fset '\` 'backquote) (defmacro backquote (template) "Expand the internal representation of a backquoted TEMPLATE into a lisp form. The backquote character is like the quote character in that it prevents the template which follows it from being evaluated, except that backquote permits you to evaluate portions of the quoted template. A comma character inside TEMPLATE indicates that the following item should be evaluated. A comma character may be followed by an at-sign, which indicates that the form which follows should be evaluated and inserted and \"spliced\" into the template. Forms following ,@ must evaluate to lists. Here is how to use backquotes: (setq p 'b q '(c d e)) `(a ,p ,@q) -> (a b c d e) `(a . b) -> (a . b) `(a . ,p) -> (a . b) The XEmacs lisp reader expands lisp backquotes as it reads them. Examples: `atom is read as (backquote atom) `(a ,b ,@(c d e)) is read as (backquote (a (\\, b) (\\,\\@ (c d e)))) `(a . ,p) is read as (backquote (a \\, p)) \(backquote TEMPLATE) is a macro that produces code to construct TEMPLATE. Note that this is very slow in interpreted code, but fast if you compile. TEMPLATE is one or more nested lists or vectors, which are `almost quoted'. They are copied recursively, with elements preceded by comma evaluated. (backquote (a b)) == (list 'a 'b) (backquote (a [b c])) == (list 'a (vector 'b 'c)) However, certain special lists are not copied. They specify substitution. Lists that look like (\\, EXP) are evaluated and the result is substituted. (backquote (a (\\, (+ x 5)))) == (list 'a (+ x 5)) Elements of the form (\\,\\@ EXP) are evaluated and then all the elements of the result are substituted. This result must be a list; it may be `nil'. Elements of the form (\\,\\. EXP) are evaluated and then all the elements of the result are concatenated to the list of preceding elements in the list. They must occur as the last element of a list (not a vector). EXP may evaluate to nil. As an example, a simple macro `push' could be written: (defmacro push (v l) `(setq ,l (cons ,@(list v l)))) or as (defmacro push (v l) `(setq ,l (cons ,v ,l))) For backwards compatibility, old-style emacs-lisp backquotes are still read. OLD STYLE NEW STYLE (` (foo (, bar) (,@ bing))) `(foo ,bar ,@bing) Because of the old-style backquote support, you cannot use a new-style backquoted form as the first element of a list. Perhaps some day this restriction will go away, but for now you should be wary of it: (`(this ,will ,@fail)) ((` (but (, this) will (,@ work)))) This is an extremely rare thing to need to do in lisp." (bq-process template)) ;;; ---------------------------------------------------------------- (defconst bq-comma-flag 'unquote) (defconst bq-at-flag 'unquote-splicing) (defconst bq-dot-flag 'unquote-nconc-splicing) (defun bq-process (form) (let* ((flag-result (bq-process-2 form)) (flag (car flag-result)) (result (cdr flag-result))) (cond ((eq flag bq-at-flag) (error ",@ after ` in form: %s" form)) ((eq flag bq-dot-flag) (error ",. after ` in form: %s" form)) (t (bq-process-1 flag result))))) ;;; ---------------------------------------------------------------- (defun bq-vector-contents (vec) (let ((contents nil) (n (length vec))) (while (> n 0) (setq n (1- n)) (setq contents (cons (aref vec n) contents))) contents)) ;;; This does the expansion from table 2. (defun bq-process-2 (code) (cond ((vectorp code) (let* ((dflag-d (bq-process-2 (bq-vector-contents code)))) (cons 'vector (bq-process-1 (car dflag-d) (cdr dflag-d))))) ((atom code) (cond ((null code) (cons nil nil)) ((or (numberp code) (eq code t)) (cons t code)) (t (cons 'quote code)))) ((eq (car code) bq-at-marker) (cons bq-at-flag (nth 1 code))) ((eq (car code) bq-dot-marker) (cons bq-dot-flag (nth 1 code))) ((eq (car code) bq-comma-marker) (bq-comma (nth 1 code))) ((or (eq (car code) bq-backquote-marker) (eq (car code) bq-backtick-marker)) ; old lossage (bq-process-2 (bq-process (nth 1 code)))) (t (let* ((aflag-a (bq-process-2 (car code))) (aflag (car aflag-a)) (a (cdr aflag-a))) (let* ((dflag-d (bq-process-2 (cdr code))) (dflag (car dflag-d)) (d (cdr dflag-d))) (if (eq dflag bq-at-flag) ;; get the errors later. (error ",@ after dot in %s" code)) (if (eq dflag bq-dot-flag) (error ",. after dot in %s" code)) (cond ((eq aflag bq-at-flag) (if (null dflag) (bq-comma a) (cons 'append (cond ((eq dflag 'append) (cons a d )) (t (list a (bq-process-1 dflag d))))))) ((eq aflag bq-dot-flag) (if (null dflag) (bq-comma a) (cons 'nconc (cond ((eq dflag 'nconc) (cons a d)) (t (list a (bq-process-1 dflag d))))))) ((null dflag) (if (memq aflag '(quote t nil)) (cons 'quote (list a)) (cons 'list (list (bq-process-1 aflag a))))) ((memq dflag '(quote t)) (if (memq aflag '(quote t nil)) (cons 'quote (cons a d )) (cons 'list* (list (bq-process-1 aflag a) (bq-process-1 dflag d))))) (t (setq a (bq-process-1 aflag a)) (if (memq dflag '(list list*)) (cons dflag (cons a d)) (cons 'list* (list a (bq-process-1 dflag d))))))))))) ;;; This handles the <hair> cases (defun bq-comma (code) (cond ((atom code) (cond ((null code) (cons nil nil)) ((or (numberp code) (eq code 't)) (cons t code)) (t (cons bq-comma-flag code)))) ((eq (car code) 'quote) (cons (car code) (car (cdr code)))) ((memq (car code) '(append list list* nconc)) (cons (car code) (cdr code))) ((eq (car code) 'cons) (cons 'list* (cdr code))) (t (cons bq-comma-flag code)))) ;;; This handles table 1. (defun bq-process-1 (flag thing) (cond ((or (eq flag bq-comma-flag) (memq flag '(t nil))) thing) ((eq flag 'quote) (list 'quote thing)) ((eq flag 'vector) (list 'apply '(function vector) thing)) (t (cons (cdr (assq flag '((cons . cons) (list* . bq-list*) (list . list) (append . append) (nconc . nconc)))) thing)))) ;;; ---------------------------------------------------------------- (defmacro bq-list* (&rest args) "Return a list of its arguments with last cons a dotted pair." (setq args (reverse args)) (let ((result (car args))) (setq args (cdr args)) (while args (setq result (list 'cons (car args) result)) (setq args (cdr args))) result)) (provide 'backquote) ;;; backquote.el ends here