Mercurial > hg > xemacs-beta
view lisp/package-net.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-net.el --- Installation and Maintenance of XEmacs packages ;; Copyright (C) 2000 Andy Piper. ;; 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: ;; Manipulate packages for the netinstall setup utility ;; The process should be so: ;; 1. The package maintainer or release manager makes a release ;; announcement. ;; ;; 2. For a new package releases the netinstall maintainer simply ;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is ;; harder than it sounds because the file also includes information ;; about the binary releases. At the moment going to the netinstall ;; directory and typing: ;; ;; `make XEMACS=<current executable location> setup.ini' ;; ;; will do the right thing provided that: ;; ;; (a) `package-net-cygwin32-binary-size' and ;; `package-net-win32-binary-size' are set correctly. ;; ;; (b) The binary pointed to by `XEMACS' has a current ;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS= ;; part then you will get whatever is current for your build tree - ;; which is probably not what you want. ;; ;; You can run `package-net-convert-index-to-ini' manually and specify ;; REMOTE but I generally found that to be inconvenient and error-prone. ;; ;; 3. For package releases that's all you need to do. For binary ;; releases you need to build both cygwin and win32 binaries and put ;; them in appropriate tarballs: This can be achieved by running ;; build-msw-release.sh ;; (require 'package-admin) (require 'package-get) ;; What path should we use from the myriad available? ;; For netinstall we just want something simple, and anyway this is only to ;; bootstrap the process. This will be: ;; <root>/setup/ for native windows ;; <root>/lib/xemacs/setup for cygwin. ;; ;;; To Do: ;; ;; 1. Package update functions should also update the installed ;; database so that running setup.exe again does not reinstall ;; packages. ;; ;; 2. Generating setup.ini should be more automatic. (defvar package-net-cygwin32-binary-size 0 "The size in bytes of the cygwin32 binary distribution.") (defvar package-net-win32-binary-size 0 "The size in bytes of the win32 binary distribution.") (defvar package-net-kit-version "" "XEmacs kitting revision, usually empty.") (defvar package-net-setup-version "1.0" "The version string of setup.") ;;;###autoload (defun package-net-setup-directory () (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32) "xemacs/setup/" "setup/")))) (defun package-net-generate-bin-ini (&optional version) "Convert the package index to ini file format in the current directory." (let ((buf (get-buffer-create "*setup-bin.ini*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) (insert "# This file is automatically generated. If you edit it, your\n") (insert "# edits will be discarded next time the file is generated.\n") (insert "#\n\n") (insert (format "setup-timestamp: %d\n" (+ (* (car (current-time)) 65536) (car (cdr (current-time)))))) (insert (format "setup-version: %s\n\n" (or version "1.0"))) ;; Native version (insert (format "@ %s\n" "xemacs-i586-pc-win32")) (insert (format "version: %s%s\n" emacs-program-version package-net-kit-version)) (insert "type: native\n") (insert (format "install: win32/%s %d\n\n" (concat emacs-program-name "-i586-pc-win32-" emacs-program-version package-net-kit-version ".tar.gz") package-net-win32-binary-size)) ;; Cygwin version (insert (format "@ %s\n" "xemacs-i686-pc-cygwin")) (insert (format "version: %s%s\n" emacs-program-version package-net-kit-version)) (insert "type: cygwin\n") (insert (format "install: cygwin32/%s %d\n\n" (concat emacs-program-name "-i686-pc-cygwin-" emacs-program-version package-net-kit-version ".tar.gz") package-net-cygwin32-binary-size)) (insert "# setup.ini file ends here\n") (write-region (point-min) (point-max) "setup-bin.ini"))) (kill-buffer buf))) (defun package-net-batch-generate-bin-ini () "Convert the package index to ini file format." (unless noninteractive (error 'invalid-operation "`package-net-batch-generate-bin-ini' is to be used only with -batch")) (package-net-generate-bin-ini package-net-setup-version)) ;;;###autoload (defun package-net-update-installed-db (&optional destdir) "Write out the installed package index in a net install suitable format. If DESTDIR is non-nil then use that as the destination directory. DESTDIR defaults to the value of `package-net-setup-directory'." (when (or (eq system-type 'cygwin32) (eq system-type 'window-nt)) (setq destdir (file-name-as-directory (or destdir (package-net-setup-directory)))) (let ((buf (get-buffer-create "*installed.db*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) ;; we use packages-package-list here as we actually want to ;; update relative to the installed reality (let ((entries packages-package-list) entry version) (while entries (setq entry (car entries)) (setq version (plist-get (cdr entry) :version)) ;; Unfortunately we can't read the size from this (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry)) (symbol-name (car entry)) version)) (setq entries (cdr entries)))) (make-directory-path destdir) (write-region (point-min) (point-max) (concat destdir "installed.db"))) (kill-buffer buf))))) (defun package-net-convert-download-sites-to-mirrors (&optional destdir) "Write out the download site list in a net install suitable format. If DESTDIR is non-nil then use that as the destination directory. DESTDIR defaults to the value of `data-directory'." (setq destdir (file-name-as-directory (or destdir data-directory))) (let ((buf (get-buffer-create "*mirrors.lst*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) (let ((entries package-get-download-sites) entry) (while entries (setq entry (car entries)) (insert (format "ftp://%s/%s;%s;%s\n" (nth 1 entry) (substring (nth 2 entry) 0 -9) (nth 0 entry) (nth 0 entry))) (setq entries (cdr entries)))) (write-region (point-min) (point-max) (concat destdir "mirrors.lst"))) (kill-buffer buf))))