Mercurial > hg > xemacs-beta
view lisp/msw-faces.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 | 58cd1008908c |
children | 668c73e222fd |
line wrap: on
line source
;;; msw-faces.el --- mswindows-specific face stuff. ;;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. ;;; Copyright (C) 1995, 1996, 2002 Ben Wing. ;; Author: Jamie Zawinski ;; Modified by: Chuck Thompson ;; Modified by: Ben Wing ;; Modified by: Martin Buchholz ;; Rewritten for mswindows by: Jonathan Harris ;; 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. ;; This file does the magic to parse mswindows font names, and make sure that ;; the default and modeline attributes of new frames are specified enough. (globally-declare-boundp '(mswindows-font-regexp mswindows-font-regexp-missing-1 mswindows-font-regexp-missing-2 mswindows-font-regexp-missing-3 mswindows-font-regexp-missing-4)) (defun mswindows-init-global-faces () (set-face-font 'gui-element "MS Sans Serif:Regular:8" nil 'mswindows)) (defun mswindows-init-device-faces (device) (let ((color-default (device-system-metric device 'color-default)) (color-3d-face (device-system-metric device 'color-3d-face))) ; Force creation of the default face font so that if it fails we get ; an error now instead of a crash at frame creation. (unless (face-font-instance 'default device) (error "Can't find a suitable default font")) ;; Don't set them on the device because then the global setting won't ;; override them. ;; #### Use device tags if we have multiple msprinter devices. (can we?) (if (car color-default) (set-face-foreground 'default (car color-default) nil (device-type device))) (if (cdr color-default) (set-face-background 'default (cdr color-default) nil (device-type device))) (if (car color-3d-face) (set-face-foreground 'gui-element (car color-3d-face) nil (device-type device))) (if (cdr color-3d-face) (set-face-background 'gui-element (cdr color-3d-face) nil (device-type device))) )) (defun mswindows-init-frame-faces (frame) ) ;; Other functions expect these regexps (let ((- ":") ;; What happens if a font family contains a colon? I can't find any ;; documentation on that, and don't have a font editor to hand to test. (fontname "\\([^:]*\\)") ; 1 (style "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 2 (pointsize "\\([0-9]*\\)") ; 3 (effects "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 4 ;; must match "OEM/DOS" (charset "\\([a-zA-Z/ ]*\\)") ; 5 ) (defconst mswindows-font-regexp (concat "^" fontname - style - pointsize - effects - charset "$")) (defconst mswindows-font-regexp-missing-1 (concat "^" fontname - style - pointsize - effects "$")) (defconst mswindows-font-regexp-missing-2 (concat "^" fontname - style - pointsize "$")) (defconst mswindows-font-regexp-missing-3 (concat "^" fontname - style "$")) (defconst mswindows-font-regexp-missing-4 (concat "^" fontname "$")) ) ;;; Fill in missing parts of a font spec. This is primarily intended as a ;;; helper function for the functions below. ;;; mswindows fonts look like: ;;; fontname[:[weight][ slant][:pointsize[:effects]]][:charset] ;;; A minimal mswindows font spec looks like: ;;; Courier New ;;; A maximal mswindows font spec looks like: ;;; Courier New:Bold Italic:10:underline strikeout:Western (defun mswindows-canonicalize-font-name (font) "Given a mswindows font or font name, return its name in canonical form. This adds missing colons and fills in the style field with \"Regular\". This does *NOT* fill in the point size or charset fields, because in those cases an empty field is not equivalent to any particular field value, but a wildcard allowing for any possible value (charset Western and point size 10 are chosen first, if they exist)." (if (font-instance-p font) (setq font (font-instance-name font))) ;; fill in missing colons (setq font (cond ((string-match mswindows-font-regexp font) font) ((string-match mswindows-font-regexp-missing-1 font) (concat font ":")) ((string-match mswindows-font-regexp-missing-2 font) (concat font "::")) ((string-match mswindows-font-regexp-missing-3 font) (concat font ":::")) ((string-match mswindows-font-regexp-missing-4 font) (concat font "::::")) (t "::::"))) (or (string-match mswindows-font-regexp font) (error "can't parse %S" font)) (if (equal "" (match-string 2 font)) (concat (substring font 0 (match-beginning 2)) "Regular" (substring font (match-beginning 2))) font)) (defun mswindows-parse-font-style (style) ;; Parse a style into a cons (WEIGHT . SLANT). WEIGHT will never be the ;; empty string (it may be "Regular"), but SLANT will be empty for ;; non-italic. (save-match-data (let ((case-fold-search t)) (cond ((equalp style "Italic") '("Regular" . "Italic")) ((string-match "^\\([a-zA-Z ]+?\\) +Italic$" style) (cons (match-string 1 style) "Italic")) (t (cons style "")))))) (defun mswindows-construct-font-style (weight slant) ;; Construct the style from WEIGHT and SLANT. Opposite of ;; mswindows-parse-font-style. (cond ((and (equal slant "") (equal weight "")) "Regular") ((equal slant "") weight) ((or (equalp weight "Regular") (equal weight "")) slant) (t (concat weight " " slant)))) (defun mswindows-frob-font-style (font which) ;; Given a font name or font instance, return a name with the style field ;; (which includes weight and/or slant) changed according to WHICH, a plist. ;; If no entry found, don't change. (if (null font) nil (setq font (mswindows-canonicalize-font-name font)) (or (string-match mswindows-font-regexp font) (error "can't parse %S" font)) (let* ((style (match-string 2 font)) (style-rep (save-match-data (or (loop for (x y) on which by #'cddr if (string-match (concat "^" x "$") style) return (replace-match y nil nil style)) style)))) (concat (substring font 0 (match-beginning 2)) style-rep (substring font (match-end 2)))))) (defun mswindows-frob-font-style-and-sizify (font which &optional device) (if (null font) nil (let* ((oldwidth (if (font-instance-p font) (font-instance-width font) (let ((fi (make-font-instance font device t))) (and fi (font-instance-width fi))))) (newname (mswindows-frob-font-style font which)) (newfont (make-font-instance newname device t))) ;; Hack! On MS Windows, bold fonts (even monospaced) are often wider ;; than the equivalent non-bold font. Making the bold font one point ;; smaller usually makes it the same width (maybe at the expense of ;; making it one pixel shorter). Do the same trick in both directions. (when (font-instance-p newfont) (let ((newerfont newfont)) (block nil (while (and newerfont oldwidth) (setq newfont newerfont) (cond ((< (font-instance-width newfont) oldwidth) (setq newerfont (make-font-instance (mswindows-find-larger-font newfont device) device t)) (if (and newerfont (> (font-instance-width newerfont) oldwidth)) (return nil))) ((> (font-instance-width newfont) oldwidth) (setq newerfont (make-font-instance (mswindows-find-smaller-font newfont device) device t)) (if (and newerfont (< (font-instance-width newerfont) oldwidth)) (return nil))) (t (return nil)))))) (if (font-instance-p newfont) (font-instance-name newfont) newfont))))) (defconst mswindows-nonbold-weight-regexp ;; He looked so, so cool with the ultra light dangling from his mouth as ;; his fingers spun out demisemiquavers from the keyboard ... "\\(Regular\\|Thin\\|Extra Light\\|Ultra Light\\|Light\\|Normal\\|Medium\\|Semi Bold\\|Demi Bold\\)" ) (defconst mswindows-bold-weight-regexp "\\(Semi Bold\\|Demi Bold\\|Bold\\|Extra Bold\\|Ultra Bold\\|Heavy\\|Black\\)" ) (defconst mswindows-make-font-bold-mapper `(,mswindows-nonbold-weight-regexp "Bold" "Italic" "Bold Italic" ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic")) (defconst mswindows-make-font-nonbold-mapper `(,mswindows-bold-weight-regexp "Regular" ,(concat mswindows-bold-weight-regexp " Italic") "Italic")) (defconst mswindows-make-font-italic-mapper '("\\(.*\\)Italic" "\\1Italic" "\\(.*\\)" "\\1 Italic")) (defconst mswindows-make-font-unitalic-mapper '("Italic" "Regular" "\\(.*\\) Italic" "\\1")) (defconst mswindows-make-font-bold-italic-mapper `(,mswindows-nonbold-weight-regexp "Bold Italic" ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic" "Italic" "Bold Italic" ,mswindows-bold-weight-regexp "\\1 Italic")) (defun mswindows-make-font-bold (font &optional device) "Given a mswindows font specification, this attempts to make a bold font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-mapper device)) (defun mswindows-make-font-unbold (font &optional device) "Given a mswindows font specification, this attempts to make a non-bold font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-nonbold-mapper device)) (defun mswindows-make-font-italic (font &optional device) "Given a mswindows font specification, this attempts to make an `italic' font. If it fails, it returns nil." (try-font-name (mswindows-frob-font-style font mswindows-make-font-italic-mapper) device)) (defun mswindows-make-font-unitalic (font &optional device) "Given a mswindows font specification, this attempts to make a non-italic font. If it fails, it returns nil." (try-font-name (mswindows-frob-font-style font mswindows-make-font-unitalic-mapper) device)) (defun mswindows-make-font-bold-italic (font &optional device) "Given a mswindows font specification, this attempts to make a `bold-italic' font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-italic-mapper device)) (defun mswindows-available-font-sizes (font device) (if (font-instance-p font) (setq font (font-instance-name font))) (setq font (mswindows-canonicalize-font-name font)) (or (string-match mswindows-font-regexp font) (error "Can't parse %S" font)) ;; turn pointsize into wildcard (setq font (concat (substring font 0 (match-beginning 3)) (substring font (match-end 3) (match-end 0)))) (sort (delq nil (mapcar #'(lambda (name) (and (string-match mswindows-font-regexp name) (string-to-int (substring name (match-beginning 3) (match-end 3))))) (font-list font device))) #'<)) (defun mswindows-frob-font-size (font up-p device) (if (stringp font) (setq font (make-font-instance font device))) (let* ((name (font-instance-name font)) (truename (font-instance-truename font)) (available (and truename (mswindows-available-font-sizes truename device)))) (if (null available) nil (or (string-match mswindows-font-regexp truename) (error "can't parse %S" truename)) (let ((old-size (string-to-int (substring truename (match-beginning 3) (match-end 3))))) (or (> old-size 0) (error "font truename has 0 pointsize?")) (or (string-match mswindows-font-regexp name) (error "can't parse %S" name)) (let ((newsize ;; scalable fonts: change size by 1 point. (if (= 0 (car available)) (if (and (not up-p) (= 1 old-size)) nil (if up-p (1+ old-size) (1- old-size))) ;; non-scalable fonts: take the next available size. (if up-p (loop for tail on available if (eql (car tail) old-size) return (cadr tail)) (loop for tail on available if (eql (cadr tail) old-size) return (car tail)))))) (and newsize (concat (substring name 0 (match-beginning 3)) (int-to-string newsize) (substring name (match-end 3) (match-end 0))))))))) (defun mswindows-find-smaller-font (font &optional device) "Loads a new version of the given font (or font name) 1 point smaller. Returns the font if it succeeds, nil otherwise." (mswindows-frob-font-size font nil device)) (defun mswindows-find-larger-font (font &optional device) "Loads a new version of the given font (or font name) 1 point larger. Returns the font if it succeeds, nil otherwise." (mswindows-frob-font-size font t device))