Mercurial > hg > xemacs-beta
annotate src/EmacsShellP.h @ 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 | 74fd4e045ea6 |
| children | 697ef44129c6 308d34e9f07d |
| rev | line source |
|---|---|
| 0 | 1 /* Emacs shell widget internal header file. |
| 2 Copyright (C) 1994, 1995 Sun Microsystems, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* Written by Ben Wing, May, 1994. */ | |
| 24 | |
| 398 | 25 #ifndef INCLUDED_EmacsShellP_h_ |
| 26 #define INCLUDED_EmacsShellP_h_ | |
| 0 | 27 |
| 28 #include "xintrinsic.h" | |
| 29 #include <X11/ShellP.h> | |
| 30 #include "EmacsShell.h" | |
| 31 | |
| 32 /****** TopLevelEmacsShell ******/ | |
| 33 | |
| 34 typedef struct { /* new fields for TopLevelEmacsShell class */ | |
| 35 int dummy; | |
| 36 } TopLevelEmacsShellClassPart; | |
| 37 | |
| 38 /* full class record declaration */ | |
| 39 typedef struct _TopLevelEmacsShellClassRec { | |
| 40 CoreClassPart core_class; | |
| 41 CompositeClassPart composite_class; | |
| 42 ShellClassPart shell_class; | |
| 43 WMShellClassPart wm_shell_class; | |
| 44 VendorShellClassPart vendor_shell_class; | |
| 45 TopLevelShellClassPart top_level_shell_class; | |
| 46 TopLevelEmacsShellClassPart emacs_shell_class; | |
| 47 } TopLevelEmacsShellClassRec; | |
| 48 | |
| 49 typedef struct { /* new fields for TopLevelEmacsShell widget */ | |
| 50 int width_cells, height_cells; | |
| 51 int min_width_cells, min_height_cells; | |
| 52 } TopLevelEmacsShellPart; | |
| 53 | |
| 54 typedef struct _TopLevelEmacsShellRec { /* full instance record */ | |
| 55 CorePart core; | |
| 56 CompositePart composite; | |
| 57 ShellPart shell; | |
| 58 WMShellPart wm; | |
| 59 VendorShellPart vendor; | |
| 60 TopLevelShellPart top_level; | |
| 61 TopLevelEmacsShellPart emacs_shell; | |
| 62 } TopLevelEmacsShellRec; | |
| 63 | |
| 64 /* class pointer */ | |
| 65 extern TopLevelEmacsShellClassRec topLevelEmacsShellClassRec; | |
| 66 | |
| 67 /****** TransientEmacsShell ******/ | |
| 68 | |
| 69 typedef struct { /* new fields for TransientEmacsShell class */ | |
| 70 int dummy; | |
| 71 } TransientEmacsShellClassPart; | |
| 72 | |
| 73 /* full class record declaration */ | |
| 74 typedef struct _TransientEmacsShellClassRec { | |
| 75 CoreClassPart core_class; | |
| 76 CompositeClassPart composite_class; | |
| 77 ShellClassPart shell_class; | |
| 78 WMShellClassPart wm_shell_class; | |
| 79 VendorShellClassPart vendor_shell_class; | |
| 80 TransientShellClassPart transient_shell_class; | |
| 81 TransientEmacsShellClassPart emacs_shell_class; | |
| 82 } TransientEmacsShellClassRec; | |
| 83 | |
| 84 typedef struct { /* new fields for TransientEmacsShell widget */ | |
| 85 int width_cells, height_cells; | |
| 86 int min_width_cells, min_height_cells; | |
| 87 } TransientEmacsShellPart; | |
| 88 | |
| 89 typedef struct _TransientEmacsShellRec { /* full instance record */ | |
| 90 CorePart core; | |
| 91 CompositePart composite; | |
| 92 ShellPart shell; | |
| 93 WMShellPart wm; | |
| 94 VendorShellPart vendor; | |
| 95 TransientShellPart transient; | |
| 96 TransientEmacsShellPart emacs_shell; | |
| 97 } TransientEmacsShellRec; | |
| 98 | |
| 99 /* class pointer */ | |
| 100 extern TransientEmacsShellClassRec transientEmacsShellClassRec; | |
| 101 | |
| 398 | 102 #endif /* INCLUDED_EmacsShellP_h_ */ |