Mercurial > hg > xemacs-beta
annotate lib-src/update-custom.sh @ 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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 #!/bin/sh |
| 2 ### update-custom.sh --- update Customize group dependencies | |
| 3 | |
| 4 # Author: Hrvoje Niksic, based on update-autoloads.el by | |
| 5 # Jamie Zawinski, Ben Wing, Martin Buchholz, and Steve Baur | |
| 6 # Maintainer: Hrvoje Niksic | |
| 7 # Keywords: internal | |
| 8 | |
| 9 # This file is part of XEmacs. | |
| 10 | |
| 11 # XEmacs is free software; you can redistribute it and/or modify it | |
| 12 # under the terms of the GNU General Public License as published by | |
| 13 # the Free Software Foundation; either version 2, or (at your option) | |
| 14 # any later version. | |
| 15 | |
| 16 # XEmacs is distributed in the hope that it will be useful, but | |
| 17 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 # General Public License for more details. | |
| 20 | |
| 21 # You should have received a copy of the GNU General Public License | |
| 22 # along with XEmacs; see the file COPYING. If not, write to | |
| 23 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 # Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ### Commentary: | |
| 27 | |
| 28 # This is much simpler than update-autoloads.el. All we need to do is | |
| 29 # compute a list of directories we want to use, and feed it to | |
| 30 # Custom-make-dependencies. End of story. | |
| 31 | |
| 32 ### Code: | |
| 33 | |
| 34 set -eu | |
| 35 | |
| 36 # get to the right directory | |
| 37 test ! -d ./lisp -a -d ../lisp && cd .. | |
| 38 if test ! -d ./lisp ; then | |
| 39 echo $0: neither ./lisp/ nor ../lisp/ exist | |
| 40 exit 1 | |
| 41 fi | |
| 42 | |
| 43 test -z "$EMACS" && EMACS="./src/xemacs" | |
| 44 echo " (using $EMACS)" | |
| 45 | |
| 46 export EMACS | |
| 47 | |
| 48 EMACS_DIR=`cd \`dirname $EMACS\` && pwd`; | |
| 49 # Account for various system automounter configurations | |
| 50 if test -d "/net"; then | |
| 51 if test -d "/tmp_mnt/net"; then tdir="/tmp_mnt/net"; else tdir="/tmp_mnt"; fi | |
| 52 EMACS_DIR=`echo "$EMACS_DIR" | \ | |
| 53 sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"` | |
| 54 fi | |
| 55 REAL="$EMACS_DIR/`basename $EMACS`" | |
| 56 | |
| 57 echo "Rebuilding custom-loads with $REAL..." | |
| 58 | |
| 59 if [ "`uname -r | sed 's/\(.\).*/\1/'`" -gt 4 ]; then | |
| 60 echon() | |
| 61 { | |
| 62 /bin/echo $* '\c' | |
| 63 } | |
| 64 else | |
| 65 echon() | |
| 66 { | |
| 67 echo -n $* | |
| 68 } | |
| 69 fi | |
| 70 | |
| 71 # Compute patterns to ignore when searching for files | |
| 72 ignore_dirs="" | |
| 73 | |
| 74 # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. | |
| 75 echon "Checking for Mule support..." | |
| 76 lisp_prog='(princ (featurep (quote mule)))' | |
| 77 mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" | |
| 78 if test "$mule_p" = nil ; then | |
| 79 echo No | |
| 80 ignore_dirs="$ignore_dirs mule" | |
| 81 else | |
| 82 echo Yes | |
| 83 fi | |
| 84 | |
| 85 echon "Checking directories..." | |
| 86 dirs=lisp/ | |
| 87 for dir in lisp/*; do | |
| 88 if test -d $dir \ | |
| 89 -a $dir != lisp/CVS \ | |
| 90 -a $dir != lisp/SCCS; then | |
| 91 for ignore in $ignore_dirs; do | |
| 92 if test $dir = lisp/$ignore; then | |
| 93 continue 2 | |
| 94 fi | |
| 95 done | |
| 96 rm -f "$dir/custom-load.elc" | |
| 97 dirs="$dirs $dir" | |
| 98 fi | |
| 99 done | |
| 100 echo done | |
| 101 | |
| 102 $EMACS -batch -q -no-site-file -l cus-dep -f Custom-make-dependencies $dirs |