Mercurial > hg > xemacs-beta
annotate lisp/version.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 | 788c38f20376 |
| children | 5efbd1253905 |
| rev | line source |
|---|---|
| 428 | 1 ;; version.el --- Record version number of Emacs. |
| 2 | |
| 3 ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: XEmacs Development Team | |
| 6 ;; Keywords: internal, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 613 | 21 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 22 ;; Free Software Foundation Inc., 59 Temple Place - Suite 330, |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: FSF 19.34. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs. | |
| 30 | |
| 31 ;;; Code: | |
| 32 | |
| 33 (defconst xemacs-betaname | |
| 34 (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) | |
| 35 "Non-nil when this is a test (beta) version of XEmacs. | |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
36 Warning, this variable did not exist in XEmacs versions prior to 20.3. |
|
4523
6a3006b37260
Fix docstring typo (and commit only this fix).
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4522
diff
changeset
|
37 Its value is derived from `emacs-beta-version'. It is mutually exclusive |
|
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
38 with `emacs-patch-level'.") |
| 428 | 39 |
| 40 (defconst emacs-version | |
| 975 | 41 (format "%d.%d %s%s%s%s%s" |
| 444 | 42 emacs-major-version |
| 43 emacs-minor-version | |
| 44 (if emacs-patch-level | |
| 45 (format "(patch %d)" emacs-patch-level) | |
| 46 "") | |
| 47 (if xemacs-betaname | |
| 48 (concat " " xemacs-betaname) | |
| 49 "") | |
| 50 (if xemacs-codename | |
| 51 (concat " \"" xemacs-codename "\"") | |
| 52 "") | |
| 975 | 53 (if xemacs-extra-name |
| 54 (concat " " xemacs-extra-name) | |
| 55 "") | |
| 444 | 56 " XEmacs Lucid") |
| 428 | 57 "Version numbers of this version of XEmacs.") |
| 58 | |
| 59 (if (featurep 'infodock) | |
| 60 (require 'id-vers)) | |
| 61 | |
| 62 ;; Moved to C code as of XEmacs 20.3 | |
| 63 ;(defconst emacs-major-version | |
| 64 ; (progn (or (string-match "^[0-9]+" emacs-version) | |
| 65 ; (error "emacs-version unparsable")) | |
| 66 ; (string-to-int (match-string 0 emacs-version))) | |
| 67 ; "Major version number of this version of Emacs, as an integer. | |
| 68 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 69 ; FSF Emacs: 19.23 | |
| 70 ; XEmacs: 19.10") | |
| 71 | |
| 72 ;; Moved to C code as of XEmacs 20.3 | |
| 73 ;(defconst emacs-minor-version | |
| 74 ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) | |
| 75 ; (error "emacs-version unparsable")) | |
| 76 ; (string-to-int (match-string 1 emacs-version))) | |
| 77 ; "Minor version number of this version of Emacs, as an integer. | |
| 78 ;Warning, this variable did not exist in Emacs versions earlier than: | |
| 79 ; FSF Emacs: 19.23 | |
| 80 ; XEmacs: 19.10") | |
| 81 | |
| 82 (defconst emacs-build-time (current-time-string) | |
| 83 "Time at which Emacs was dumped out.") | |
| 84 | |
| 85 (defconst emacs-build-system (system-name)) | |
| 86 | |
| 87 (defun emacs-version (&optional arg) | |
| 88 "Return string describing the version of Emacs that is running. | |
| 89 When called interactively with a prefix argument, insert string at point. | |
| 90 Don't use this function in programs to choose actions according | |
| 91 to the system configuration; look at `system-configuration' instead." | |
| 92 (interactive "p") | |
| 93 (save-match-data | |
| 94 (let ((version-string | |
| 95 (format | |
| 96 "XEmacs %s %s(%s%s) of %s %s on %s" | |
| 97 (substring emacs-version 0 (string-match " XEmacs" emacs-version)) | |
| 98 (if (not (featurep 'infodock)) | |
| 99 "[Lucid] " | |
| 100 "") | |
| 101 system-configuration | |
| 102 (cond ((or (and (fboundp 'featurep) | |
| 103 (featurep 'mule)) | |
| 104 (memq 'mule features)) ", Mule") | |
| 105 (t "")) | |
| 106 (substring emacs-build-time 0 | |
| 107 (string-match " *[0-9]*:" emacs-build-time)) | |
| 108 (substring emacs-build-time | |
| 109 (string-match "[0-9]*$" emacs-build-time)) | |
| 110 emacs-build-system))) | |
| 111 (cond | |
| 112 ((null arg) version-string) | |
| 113 ((eq arg 1) (message "%s" version-string)) | |
| 114 (t (insert version-string)))))) | |
| 115 | |
| 116 ;; from emacs-vers.el | |
| 117 (defun emacs-version>= (major &optional minor patch) | |
| 118 "Return true if the Emacs version is >= to the given MAJOR, MINOR, | |
| 119 and PATCH numbers. | |
| 120 The MAJOR version number argument is required, but the other arguments | |
| 121 argument are optional. Only the Non-nil arguments are used in the test." | |
| 122 (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) | |
| 123 (cond ((> emacs-major-version major)) | |
| 124 ((< emacs-major-version major) nil) | |
| 125 ((null minor)) | |
| 126 ((> emacs-minor-version minor)) | |
| 127 ((< emacs-minor-version minor) nil) | |
| 128 ((null patch)) | |
| 129 ((>= emacs-patch patch))))) | |
| 130 | |
| 131 ;;; We hope that this alias is easier for people to find. | |
| 132 (define-function 'version 'emacs-version) | |
| 133 | |
| 4246 | 134 (defvar Installation-file-coding-system |
| 135 (eval-when-compile `,(coding-system-name (find-coding-system 'native))) | |
| 136 "The coding system used to create the `Installation' file. | |
| 137 | |
| 138 The `Installation' file is created by configure, and the | |
| 139 `Installation-string' variable reflects its contents. | |
| 140 | |
| 141 This is initialized to reflect the native coding system at the time | |
| 142 version.el was byte-compiled; ideally it would reflect the native coding | |
| 143 system of the environment when XEmacs was dumped, but the locale | |
| 144 initialization code isn't called at dump time, and the appropriate value | |
| 145 at byte-compile time should be close enough. Note that this means that the | |
| 146 value of `Installation-string' during dump time thus reflects loading the | |
| 147 file using the `binary' coding system. ") | |
| 428 | 148 |
| 4246 | 149 (defvar Installation-string |
| 150 ;; Initialize Installation-string. We do it before loading | |
| 151 ;; anything so that dumped code can make use of its value. | |
| 152 (save-current-buffer | |
| 153 (set-buffer (get-buffer-create (generate-new-buffer-name | |
| 154 " *temp*"))) | |
| 155 (insert-file-contents-internal | |
| 156 (expand-file-name "Installation" build-directory) | |
| 157 ;; Relies on our working out the system coding system | |
| 158 ;; correctly at startup. | |
| 159 nil nil nil nil | |
| 160 ;; Installation-file-coding-system is actually respected in | |
| 161 ;; mule/general-late.el, after all the dumped coding systems have been | |
| 162 ;; loaded. | |
| 163 'binary) | |
| 164 (prog1 (buffer-substring) | |
| 165 (kill-buffer (current-buffer)))) | |
| 166 "Description of XEmacs installation. | |
| 428 | 167 |
| 4246 | 168 This reflects the values that the configure script worked out at build time, |
| 169 including things like the C code features included at compile time and the | |
| 170 installation prefix. Normally used when submitting a bug report; | |
| 171 occasionally used, in a way the XEmacs developers don't endorse, to work out | |
| 172 version information. ") | |
| 173 | |
|
5004
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4523
diff
changeset
|
174 ;;; version.el ends here |