Mercurial > hg > xemacs-beta
view lisp/x-font-menu.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 | e29fcfd8df5f |
children | 2a54dfbe434f 308d34e9f07d |
line wrap: on
line source
;;; x-font-menu.el --- Managing menus of X fonts. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. ;; Copyright (C) 1997 Sun Microsystems ;; Author: Jamie Zawinski <jwz@jwz.org> ;; Restructured by: Jonathan Stigelman <Stig@hackvan.com> ;; Mule-ized by: Martin Buchholz ;; More restructuring for MS-Windows by Andy Piper <andy@xemacs.org> ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Code: ;; #### - implement these... ;; ;;; (defvar font-menu-ignore-proportional-fonts nil ;;; "*If non-nil, then the font menu will only show fixed-width fonts.") (require 'font-menu) (when (featurep 'xft-fonts) (require 'fontconfig)) (globally-declare-boundp '(x-font-regexp x-font-regexp-foundry-and-family x-font-regexp-spacing)) (globally-declare-boundp '(charset-registries fc-find-available-font-families fc-find-available-weights-for-family fc-font-match fc-font-slant-translate-from-string fc-font-slant-translate-to-string fc-font-weight-translate-from-string fc-font-weight-translate-to-string fc-name-parse fc-name-unparse fc-pattern-add-family fc-pattern-add-size fc-pattern-add-slant fc-pattern-add-weight fc-pattern-get-family fc-pattern-get-size fc-pattern-get-slant fc-pattern-get-successp fc-pattern-get-weight make-fc-pattern xlfd-font-name-p)) (defvar x-font-menu-registry-encoding nil "Registry and encoding to use with font menu fonts.") (defvar x-fonts-menu-junk-families (mapconcat #'identity '("cursor" "glyph" "symbol" ; Obvious losers. "\\`Ax...\\'" ; FrameMaker fonts - there are just way too ; many of these, and there is a different ; font family for each font face! Losers. ; "Axcor" -> "Applix Courier Roman", ; "Axcob" -> "Applix Courier Bold", etc. ) "\\|") "Regexp matching font families which should not be menu-selectable. E.g. cursor fonts.") (defun hack-font-truename (fn) ;; #### Are "font sets" XFontSets? ;; #### Is this useful if not configure'd --with-xfs? ;; #### This is duplicated in gtk-font-menu.el. "Filter the output of `font-instance-truename' to deal with font sets." (if (string-match "," (font-instance-truename fn)) (let ((fpnt (nth 8 (split-string (font-instance-name fn) "-"))) (flist (split-string (font-instance-truename fn) ",")) ret) (while flist (if (string-equal fpnt (nth 8 (split-string (car flist) "-"))) (progn (setq ret (car flist)) (setq flist nil)) (setq flist (cdr flist)) )) ret) (font-instance-truename fn))) (defvar x-font-regexp-ascii nil "This is used to filter out font families that can't display ASCII text. It must be set at run-time.") ;; #### move these to font-menu.el, and maybe make them defcustoms (defvar font-menu-common-sizes '(60 80 100 110 120 130 140 150 160 170 180 200 220 240 300 360) "List of commonly desired font sizes in decipoints.") ;;;###autoload (defun x-reset-device-font-menus (device &optional debug) (if (featurep 'xft-fonts) (x-reset-device-font-menus-xft device debug) (x-reset-device-font-menus-core device debug))) (defun fc-make-font-menu-entry (family) (let ((weights (fc-find-available-weights-for-family family))) (vector family (mapcar (lambda (weight-symbol) (let ((pair (assoc weight-symbol '((:light "Light") (:medium "Medium") (:demibold "Demibold") (:bold "Bold") (:black "Black"))))) (if pair (cadr pair)))) weights) '(0) nil))) (defun x-reset-device-font-menus-xft (device &optional debug) (let* ((families-1 (fc-find-available-font-families device)) (families (delete-if (lambda (x) (string-match x-fonts-menu-junk-families x)) (sort families-1 'string-lessp))) (data (vector (mapcar 'fc-make-font-menu-entry families) (mapcar (lambda (family) (vector family `(font-menu-set-font ,family nil nil) :style 'radio :active nil :selected nil)) families) (mapcar (lambda (size) (vector (number-to-string size) `(font-menu-set-font nil nil ,size) :style 'radio :active nil :selected nil)) ;; common size list in decipoints, fontconfig wants points (mapcar (lambda (x) (/ x 10)) font-menu-common-sizes)) (mapcar (lambda (weight) (vector weight `(font-menu-set-font nil ,weight nil) :style 'radio :active nil :selected nil)) '("Light" "Medium" "Demibold" "Bold" "Black")))) ;; get or initialize the entry for device (dev-cache (or (assq device device-fonts-cache) (car (push (list device) device-fonts-cache))))) ;; update the device-fonts-cache entry for device in place (setcdr dev-cache data) data)) (defun x-reset-device-font-menus-core (device &optional debug) "Generates the `Font', `Size', and `Weight' submenus for the Options menu. This is run the first time that a font-menu is needed for each device. If you don't like the lazy invocation of this function, you can add it to `create-device-hook' and that will make the font menus respond more quickly when they are selected for the first time. If you add fonts to your system, or if you change your font path, you can call this to re-initialize the menus." ;; by Stig@hackvan.com ;; #### - this should implement a `menus-only' option, which would ;; recalculate the menus from the cache w/o having to do font-list again. (unless x-font-regexp-ascii (setq x-font-regexp-ascii (if (fboundp 'charset-registries) (elt (charset-registries 'ascii) 0) "iso8859-1"))) (setq x-font-menu-registry-encoding (if (featurep 'mule) "*-*" "iso8859-1")) (let ((case-fold-search t) family size weight entry monospaced-p dev-cache cache families sizes weights) (dolist (name (cond ((null debug) ; debugging kludge (font-list "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device font-menu-max-number)) ((stringp debug) (split-string debug "\n")) (t debug))) (when (and (string-match x-font-regexp-ascii name) (string-match x-font-regexp name)) (setq weight (capitalize (match-string 1 name)) size (string-to-int (match-string 6 name))) (or (string-match x-font-regexp-foundry-and-family name) (error "internal error")) (setq family (capitalize (match-string 1 name))) (or (string-match x-font-regexp-spacing name) (error "internal error")) (setq monospaced-p (string= "m" (match-string 1 name))) (unless (string-match x-fonts-menu-junk-families family) (setq entry (or (vassoc family cache) (car (setq cache (cons (vector family nil nil t) cache))))) (or (member family families) (push family families)) (or (member weight weights) (push weight weights)) (or (member size sizes) (push size sizes)) (or (member weight (aref entry 1)) (push weight (aref entry 1))) (or (member size (aref entry 2)) (push size (aref entry 2))) (aset entry 3 (and (aref entry 3) monospaced-p))))) ;; ;; Hack scalable fonts. ;; Some fonts come only in scalable versions (the only size is 0) ;; and some fonts come in both scalable and non-scalable versions ;; (one size is 0). If there are any scalable fonts at all, make ;; sure that the union of all point sizes contains at least some ;; common sizes - it's possible that some sensible sizes might end ;; up not getting mentioned explicitly. ;; (if (member 0 sizes) (let ((common font-menu-common-sizes)) (while common (or;;(member (car common) sizes) ; not enough slack (let ((rest sizes) (done nil)) (while (and (not done) rest) (if (and (> (car common) (- (car rest) 5)) (< (car common) (+ (car rest) 5))) (setq done t)) (setq rest (cdr rest))) done) (setq sizes (cons (car common) sizes))) (setq common (cdr common))) (setq sizes (delq 0 sizes)))) (setq families (sort families 'string-lessp) weights (sort weights 'string-lessp) sizes (sort sizes '<)) (dolist (entry cache) (aset entry 1 (sort (aref entry 1) 'string-lessp)) (aset entry 2 (sort (aref entry 2) '<))) (setq dev-cache (assq device device-fonts-cache)) (or dev-cache (setq dev-cache (car (push (list device) device-fonts-cache)))) (setcdr dev-cache (vector cache (mapcar (lambda (x) (vector x (list 'font-menu-set-font x nil nil) ':style 'radio ':active nil ':selected nil)) families) (mapcar (lambda (x) (vector (if (/= 0 (% x 10)) (number-to-string (/ x 10.0)) (number-to-string (/ x 10))) (list 'font-menu-set-font nil nil x) ':style 'radio ':active nil ':selected nil)) sizes) (mapcar (lambda (x) (vector x (list 'font-menu-set-font nil x nil) ':style 'radio ':active nil ':selected nil)) weights))) (cdr dev-cache))) ;; Extract font information from a face. We examine both the ;; user-specified font name and the canonical (`true') font name. ;; These can appear to have totally different properties. ;; For examples, see the prolog above. ;; We use the user-specified one if possible, else use the truename. ;; If the user didn't specify one (with "-dt-*-*", for example) ;; get the truename and use the possibly suboptimal data from that. ;;;###autoload (defun x-font-menu-font-data (face dcache) (let* ((case-fold-search t) (domain (if font-menu-this-frame-only-p (selected-frame) (selected-device))) (name (font-instance-name (face-font-instance face domain)))) (if (featurep 'xft-fonts) (if (xlfd-font-name-p name) ;; #### this call to x-font-menu-font-data-core originally ;; had 4 args, and that's probably the right way to go (x-font-menu-font-data-core face dcache) (x-font-menu-font-data-xft face dcache name (selected-device))) ;; #### this one, too (x-font-menu-font-data-core face dcache)))) (defun x-font-menu-font-data-xft (face dcache name domain) ;; DOMAIN is expected to be a device. (let* ((truename (font-instance-truename (face-font-instance face domain (if (featurep 'mule) 'ascii)))) entry) (if (xlfd-font-name-p truename) (progn nil) (progn (let* ((pattern (fc-font-match domain (fc-name-parse name))) (family (and pattern (fc-pattern-get-family pattern 0)))) (if (fc-pattern-get-successp family) (setq entry (vassoc family (aref dcache 0)))) (if (null entry) (make-vector 5 nil) (let ((weight (fc-pattern-get-weight pattern 0)) (size (fc-pattern-get-size pattern 0)) (slant (fc-pattern-get-slant pattern 0))) (vector entry (if (fc-pattern-get-successp family) family) (if (fc-pattern-get-successp size) size) (if (fc-pattern-get-successp weight) (fc-font-weight-translate-to-string weight)) (if (fc-pattern-get-successp slant) (fc-font-slant-translate-to-string slant)))))))))) (defun x-font-menu-font-data-core (face dcache) (let* ((case-fold-search t) (domain (if font-menu-this-frame-only-p (selected-frame) (selected-device))) (name (font-instance-name (face-font-instance face domain))) (truename (font-instance-truename (face-font-instance face domain (if (featurep 'mule) 'ascii)))) family size weight entry slant) (when (string-match x-font-regexp-foundry-and-family name) (setq family (capitalize (match-string 1 name))) (setq entry (vassoc family (aref dcache 0)))) (when (and (null entry) (string-match x-font-regexp-foundry-and-family truename)) (setq family (capitalize (match-string 1 truename))) (setq entry (vassoc family (aref dcache 0)))) (if (null entry) (make-vector 5 nil) (when (string-match x-font-regexp name) (setq weight (capitalize (match-string 1 name))) (setq size (string-to-int (match-string 6 name)))) (when (string-match x-font-regexp truename) (when (not (member weight (aref entry 1))) (setq weight (capitalize (match-string 1 truename)))) (when (not (member size (aref entry 2))) (setq size (string-to-int (match-string 6 truename)))) (setq slant (capitalize (match-string 2 truename)))) (vector entry family size weight slant)))) (defun x-font-menu-load-font (family weight size slant resolution) (if (featurep 'xft-fonts) (x-font-menu-load-font-xft family weight size slant resolution) (x-font-menu-load-font-core family weight size slant resolution))) (defun x-font-menu-load-font-xft (family weight size slant resolution) (let ((pattern (make-fc-pattern))) (fc-pattern-add-family pattern family) (if weight (fc-pattern-add-weight pattern (fc-font-weight-translate-from-string weight))) (if size (fc-pattern-add-size pattern size)) (if slant (fc-pattern-add-slant pattern (fc-font-slant-translate-from-string slant))) (make-font-instance (fc-name-unparse pattern)))) (defun x-font-menu-load-font-core (family weight size slant resolution) "Try to load a font with the requested properties. The weight, slant and resolution are only hints." (when (integerp size) (setq size (int-to-string size))) (let (font) (catch 'got-font (dolist (weight (list weight "*")) (dolist (slant (cond ((string-equal slant "O") '("O" "I" "*")) ((string-equal slant "I") '("I" "O" "*")) ((string-equal slant "*") '("*")) (t (list slant "*")))) (dolist (resolution (if (string-equal resolution "*-*") (list resolution) (list resolution "*-*"))) (when (setq font (make-font-instance (concat "-*-" family "-" weight "-" slant "-*-*-*-" size "-" resolution "-*-*-" x-font-menu-registry-encoding) nil t)) (throw 'got-font font)))))))) (provide 'x-font-menu) ;;; x-font-menu.el ends here