Mercurial > hg > xemacs-beta
annotate nt/make-nt-depend @ 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 | 4542b72c005e |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 796 | 1 : #-*- Perl -*- |
| 2 | |
| 3 # Generate dependency info in a form acceptable to nmake | |
| 4 # | |
| 5 # Copyright (C) 2000, 2002 Jonathan Harris. | |
| 6 # | |
| 7 # This file is part of XEmacs. | |
| 8 # | |
| 9 # XEmacs is free software; you can redistribute it and/or modify it | |
| 10 # under the terms of the GNU General Public License as published by the | |
| 11 # Free Software Foundation; either version 2, or (at your option) any | |
| 12 # later version. | |
| 13 # | |
| 14 # XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 # for more details. | |
| 18 # | |
| 19 # You should have received a copy of the GNU General Public License | |
| 20 # along with XEmacs; see the file COPYING. If not, write to | |
| 21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 # Boston, MA 02111-1307, USA. | |
| 23 # | |
| 24 # Author: Jonathan Harris <jonathan@xemacs.org> | |
| 25 # | |
| 26 # Synched up with: Not in FSF. | |
| 27 | |
| 28 use Getopt::Long; | |
| 29 | |
| 30 my $optsok = GetOptions ('src=s' => \$src, | |
| 31 'config=s' => \$config, | |
| 32 'obj=s' => \$obj); | |
| 33 | |
| 34 die "Generates nmake dependencies for the XEmacs src directory. | |
| 35 | |
| 36 Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR | |
| 37 | |
| 38 SRCDIR Location of XEmacs sources | |
| 39 CONFIGDIR Location of config.inc | |
| 40 OBJDIR Location for compiler-generated object files | |
| 41 | |
| 42 Expects output from src/make-src-depend on stdin. | |
| 43 The dependencies are written to stdout. | |
| 44 " if (@ARGV || !$optsok | |
| 45 || !defined ($src) || !defined ($config) || !defined ($obj)); | |
| 46 | |
| 47 while (<>) | |
| 48 { | |
| 1111 | 49 # must hack away CRLF junk. wouldn't it be nice if perl handled this |
| 50 # right?? really can't be that hard!!! | |
| 51 s/\r\n/\n/g; | |
| 52 | |
| 796 | 53 # rewrite references to generating script |
| 54 s/make-src-depend/make-nt-depend/; | |
| 55 | |
| 56 # rewrite '#if defined(...)' into nmake syntax | |
| 57 s/^#if defined(.+)/!if defined$1/; | |
| 58 | |
| 59 # rewrite '#else' and '#endif' into nmake syntax | |
| 60 s/^#e/!e/; | |
| 61 | |
| 62 # add src path to source filenames | |
| 63 # allow for source filename being used in variable assignment | |
| 64 s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g; | |
| 65 | |
| 66 # add obj path to object filenames | |
| 67 # rewrite .o to .obj | |
| 1330 | 68 s/^(.+)\.o:(.+)/$obj\\$1.obj:$2/; |
| 796 | 69 |
| 1330 | 70 # add dependency on config.inc wherever config.h is. |
| 71 s/\\config.h/\\config.h $config\\config.inc/; | |
| 1111 | 72 print; |
| 796 | 73 } |