Mercurial > hg > xemacs-beta
annotate lib-src/config.values.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 | 3580ae2ce979 |
| children | e6508b64ee08 308d34e9f07d |
| rev | line source |
|---|---|
| 434 | 1 : #-*- Perl -*- |
| 2 eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge | |
| 3 if 0; | |
| 4 | |
| 428 | 5 # config.values.sh --- create config.values.in from ../configure |
| 6 | |
| 7 # Author: Martin Buchholz | |
| 8 # Maintainer: Martin Buchholz | |
| 9 # Keywords: configure elisp report-xemacs-bugs | |
| 10 | |
| 11 # This file is part of XEmacs. | |
| 12 | |
| 13 # XEmacs is free software; you can redistribute it and/or modify it | |
| 14 # under the terms of the GNU General Public License as published by | |
| 15 # the Free Software Foundation; either version 2, or (at your option) | |
| 16 # any later version. | |
| 17 | |
| 18 # XEmacs is distributed in the hope that it will be useful, but | |
| 19 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 # General Public License for more details. | |
| 22 | |
| 23 # You should have received a copy of the GNU General Public License | |
| 24 # along with XEmacs; see the file COPYING. If not, write to | |
| 25 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 # Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ### Commentary: | |
| 29 | |
| 30 ## Extract all the @foo@ configuration symbols from ../configure | |
| 31 ## to make them available to elisp later (see util/config.el) | |
| 32 ## Primarily useful for creating ridiculously verbose bug reports. | |
| 33 ## | |
| 543 | 34 ## See lisp/config.el, ../configure.in, |
| 428 | 35 ## and the Autoconf documentation on AC_OUTPUT, for more details. |
| 36 ## | |
| 37 ## This script needs only to be run occasionally (before a Net release) | |
| 38 ## by an XEmacs Maintainer (consider yourself so blessed, if you are | |
| 39 ## actually reading this commentary). | |
| 40 ## | |
| 434 | 41 |
| 42 if (! -r "./configure") { | |
| 43 chdir ".." or die "Can't chdir: $!"; | |
| 44 if (! -r "./configure") { | |
| 45 die "Can't find configure!"; | |
| 46 } | |
| 47 } | |
| 428 | 48 |
| 434 | 49 sub FileContents { |
| 50 local $/ = undef; # Slurp mode | |
| 51 open (FILE, "< $_[0]") or die "$_[0]: $!"; | |
| 52 my $contents = <FILE>; | |
| 53 close FILE or die "$_[0]: $!"; | |
| 54 return $contents; | |
| 55 } | |
| 56 | |
| 57 my $configure_contents = FileContents "./configure"; | |
| 58 my $cvi_contents = FileContents "lib-src/config.values.in"; | |
| 59 | |
| 60 my $new_cvi_contents = | |
| 61 ";;; Do not edit this file! | |
| 428 | 62 ;;; This file was automatically generated, by the config.values.sh script, |
| 63 ;;; from configure, which was itself automatically generated from configure.in. | |
| 64 ;;; | |
| 543 | 65 ;;; See lisp/config.el for details on how this file is used. |
| 428 | 66 ;;; |
| 67 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated... | |
| 68 | |
| 69 ;;; configure is created, from configure.in, by autoconf | |
| 70 ;;; config.values.in is created, from configure, by config.values.sh | |
| 71 ;;; config.values is created, from config.values.in, by configure | |
| 543 | 72 ;;; config.values is read by lisp/config.el, |
| 428 | 73 ;;; to create the (Lisp object) config-value-hash-table |
| 74 | |
| 75 ;;; Variables defined in configure by AC_SUBST follow: | |
| 76 ;;; (These are used in Makefiles) | |
| 77 | |
| 434 | 78 "; |
| 428 | 79 |
| 434 | 80 my %done; |
| 81 for my $var (sort { $a cmp $b } | |
| 82 $configure_contents =~ | |
| 2651 | 83 /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) { |
| 434 | 84 $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var}; |
| 85 $done{$var} = 1; | |
| 86 } | |
| 87 | |
| 88 $new_cvi_contents .= " | |
| 428 | 89 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow: |
| 90 ;;; (These are used in C code) | |
| 91 | |
| 434 | 92 "; |
| 93 | |
| 94 if ($cvi_contents ne $new_cvi_contents) { | |
| 95 unlink "lib-src/config.values.in"; | |
| 96 open (CVI, "> lib-src/config.values.in") | |
| 97 or die "lib-src/config.values.in: $!"; | |
| 98 print CVI $new_cvi_contents; | |
| 99 close CVI | |
| 100 or die "lib-src/config.values.in: $!"; | |
| 101 } |