Mercurial > hg > xemacs-beta
annotate lisp/version.el @ 5170:5ddbab03b0e6
various fixes to memory-usage stats
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-25 Ben Wing <ben@xemacs.org>
* diagnose.el (show-memory-usage):
* diagnose.el (show-object-memory-usage-stats):
Further changes to correspond with changes in the C code;
add an additional column in show-object-memory-usage-stats showing
the ancillary Lisp overhead used with each type; shrink columns for
windows in show-memory-usage to get it to fit in 79 chars.
src/ChangeLog addition:
2010-03-25 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (struct):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fobject_memory_usage):
* alloc.c (lisp_object_memory_usage_full):
* alloc.c (compute_memusage_stats_length):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
Add fields to the `lrecord_implementation' structure to list an
offset into the array of extra statistics in a
`struct generic_usage_stats' and a length, listing the first slice
of ancillary Lisp-object memory. Compute automatically in
compute_memusage_stats_length(). Use to add an entry
`FOO-lisp-ancillary-storage' for object type FOO.
Don't crash when an int or char is given to object-memory-usage,
signal an error instead.
Add functions lisp_object_memory_usage_full() and
lisp_object_memory_usage() to compute the total memory usage of an
object (sum of object, non-Lisp attached, and Lisp ancillary
memory).
* array.c:
* array.c (gap_array_memory_usage):
* array.h:
Add function to return memory usage of a gap array.
* buffer.c (struct buffer_stats):
* buffer.c (compute_buffer_usage):
* buffer.c (vars_of_buffer):
* extents.c (compute_buffer_extent_usage):
* marker.c:
* marker.c (compute_buffer_marker_usage):
* extents.h:
* lisp.h:
Remove `struct usage_stats' arg from compute_buffer_marker_usage()
and compute_buffer_extent_usage() -- these are ancillary Lisp
objects and don't get accumulated into `struct usage_stats';
change the value of `memusage_stats_list' so that `markers' and
`extents' memory is in Lisp-ancillary, where it belongs.
In compute_buffer_marker_usage(), use lisp_object_memory_usage()
rather than lisp_object_storage_size().
* casetab.c:
* casetab.c (case_table_memory_usage):
* casetab.c (vars_of_casetab):
* emacs.c (main_1):
Add memory usage stats for case tables.
* lisp.h:
Add comment explaining the `struct generic_usage_stats' more,
as well as the new fields in lrecord_implementation.
* console-impl.h:
* console-impl.h (struct console_methods):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
* scrollbar-x.c:
* scrollbar-x.c (x_compute_scrollbar_instance_usage):
* scrollbar.c:
* scrollbar.c (struct scrollbar_instance_stats):
* scrollbar.c (compute_all_scrollbar_instance_usage):
* scrollbar.c (scrollbar_instance_memory_usage):
* scrollbar.c (scrollbar_objects_create):
* scrollbar.c (vars_of_scrollbar):
* scrollbar.h:
* symsinit.h:
* window.c:
* window.c (find_window_mirror_maybe):
* window.c (struct window_mirror_stats):
* window.c (compute_window_mirror_usage):
* window.c (window_mirror_memory_usage):
* window.c (compute_window_usage):
* window.c (window_objects_create):
* window.c (syms_of_window):
* window.c (vars_of_window):
Redo memory-usage associated with windows, window mirrors, and
scrollbar instances. Should fix crash in find_window_mirror,
among other things. Properly assign memo ry to object memory,
non-Lisp extra memory, and Lisp ancillary memory. For example,
redisplay structures are non-Lisp memory hanging off a window
mirror, not a window; make it an ancillary Lisp-object field.
Window mirrors and scrollbar instances have their own statistics,
among other things.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 25 Mar 2010 06:07:25 -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 |