Mercurial > hg > xemacs-beta
view lisp/package-info.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 | 44de306310b8 |
children | 308d34e9f07d |
line wrap: on
line source
;;; package-info.el --- Generate information about an XEmacs package ;; Copyright (C) 1998 by Free Software Foundation, Inc. ;; Author: SL Baur <steve@xemacs.org> ;; Keywords: internal ;; 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 in FSF ;;; Commentary: ;; This file is used for building package distributions. ;;; Change Log: ;;; Code: (defvar package-info "package-info" "File used to write out Package info") (defvar package-info-template "package-info.in" "Template file for package-get info.") ;; Loses with Mule ;(defun pi-md5sum (file) ; (let (result) ; (with-temp-buffer ; (let ((buffer-file-coding-system-for-read 'binary)) ; (insert-file-contents-literally file)) ; ;; (write-file "/tmp/x.x") ; (setq result (md5 (current-buffer)))) ; result)) ;;; APA: Stolen from package-get in package-get.el (defun pi-md5sum (file) (with-temp-buffer (insert-file-contents-literally file) (md5 (current-buffer)))) (defun pi-update-key (key value) (save-excursion (goto-char (point-min)) (let ((case-fold-search nil)) (when (search-forward key) (replace-match value t))))) (defun pi-author-version (author-version) (if (> (length author-version) 0) (format "\"%s\"" author-version) (format "\"%d.%d%s\"" emacs-major-version emacs-minor-version (if (and (boundp 'xemacs-betaname) xemacs-betaname) (progn (string-match "[0-9]+" xemacs-betaname) (concat "b" (match-string 0 xemacs-betaname))) "")))) (defun pi-last-mod-date () (condition-case nil (save-excursion (with-temp-buffer (insert-file-contents-literally "ChangeLog") (goto-char (point-min)) (looking-at "[-0-9]+") (format "\"%s\"" (buffer-substring (match-beginning 0) (match-end 0))))) ;; Fallback on current date if no valid ChangeLog entry (t (format-time-string "\"%Y-%m-%d\"")))) (defun batch-update-package-info () "Generate a package-info file for use by package-get.el. Parameters are: version -- Package version number filename -- Filename of tarball to generate info for. requires -- Packages necessary for bytecompiling. author-version -- The original Author's version #. maintainer -- The package maintainer. category -- The build category." (unless noninteractive (error 'invalid-operation "`batch-update-package-info' is to be used only with -batch")) (let ((version (nth 0 command-line-args-left)) (filename (nth 1 command-line-args-left)) (requires (nth 2 command-line-args-left)) (author-version (nth 3 command-line-args-left)) (maintainer (nth 4 command-line-args-left)) (category (nth 5 command-line-args-left))) (unless requires (setq requires "")) (find-file package-info) (erase-buffer) (insert-file-contents-literally package-info-template) (goto-char (point-min)) (pi-update-key "VERSION" (format "\"%s\"" version)) (pi-update-key "MD5SUM" (format "\"%s\"" (pi-md5sum filename))) (pi-update-key "FILENAME" (format "\"%s\"" (file-name-nondirectory filename))) (pi-update-key "SIZE" (format "%d" (nth 7 (file-attributes filename)))) (pi-update-key "REQUIRES" requires) (pi-update-key "AUTHOR_VERSION" (pi-author-version author-version)) (pi-update-key "MAINTAINER" (format "\"%s\"" maintainer)) (pi-update-key "CATEGORY" (format "\"%s\"" category)) (pi-update-key "BUILD_DATE" (format-time-string "\"%Y-%m-%d\"")) (pi-update-key "DATE" (pi-last-mod-date)) (save-buffers-kill-emacs 0))) (provide 'package-info) ;;; package-info.el ends here