Mercurial > hg > xemacs-beta
annotate lwlib/xlwscrollbarP.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 | 3ecd8885ac67 |
| children | ade4c7e2c6cb |
| rev | line source |
|---|---|
| 428 | 1 /* Implements a lightweight scrollbar widget. |
| 2 Copyright (C) 1992, 1993, 1994 Lucid, Inc. | |
| 3 | |
| 4 This file is part of the Lucid Widget Library. | |
| 5 | |
| 6 The Lucid Widget Library is free software; you can redistribute it and/or | |
| 7 modify it under the terms of the GNU General Public License as published by | |
| 8 the Free Software Foundation; either version 2, or (at your option) | |
| 9 any later version. | |
| 10 | |
| 11 The Lucid Widget Library is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License 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 /* Created by Douglas Keller <dkeller@vnet.ibm.com> */ | |
| 22 | |
| 23 #ifndef _XlwScrollBarP_h | |
| 24 #define _XlwScrollBarP_h | |
| 25 | |
| 26 | |
| 27 /* | |
| 28 ** Widget class | |
| 29 */ | |
| 30 typedef struct | |
| 31 { | |
| 32 int dummy_field; /* keep compiler happy */ | |
| 33 } XlwScrollBarClassPart; | |
| 34 | |
| 35 typedef struct _XlwScrollbarClassRec | |
| 36 { | |
| 37 CoreClassPart core_class; | |
| 38 XlwScrollBarClassPart scrollbar_class; | |
| 39 } XlwScrollBarClassRec; | |
| 40 | |
| 41 enum XlwScrollbarArm | |
| 42 { | |
| 43 ARM_NONE, | |
| 44 ARM_SLIDER, | |
| 45 ARM_UP, | |
| 46 ARM_DOWN, | |
| 47 ARM_PAGEUP, | |
| 48 ARM_PAGEDOWN | |
| 49 }; | |
| 50 | |
| 51 enum XlwScrollbarForcedScroll | |
| 52 { | |
| 53 FORCED_SCROLL_NONE, | |
| 54 FORCED_SCROLL_DOWNRIGHT, | |
| 55 FORCED_SCROLL_UPLEFT | |
| 56 }; | |
| 57 | |
| 58 /* | |
| 59 ** Widget instance | |
| 60 */ | |
| 61 typedef struct | |
| 62 { | |
| 63 /* resources */ | |
| 64 XtCallbackList valueChangedCBL; | |
| 65 XtCallbackList incrementCBL; | |
| 66 XtCallbackList decrementCBL; | |
| 67 XtCallbackList pageIncrementCBL; | |
| 68 XtCallbackList pageDecrementCBL; | |
| 69 XtCallbackList toTopCBL; | |
| 70 XtCallbackList toBottomCBL; | |
| 71 XtCallbackList dragCBL; | |
| 72 | |
| 73 Pixel foreground; | |
| 74 | |
| 75 Pixel topShadowColor; | |
| 76 Pixel bottomShadowColor; | |
| 77 | |
| 78 Pixel troughColor; | |
| 79 | |
| 80 Pixel armColor; | |
| 81 Pixel armTopShadowColor; | |
| 82 Pixel armBottomShadowColor; | |
| 83 | |
| 84 Pixmap topShadowPixmap; | |
| 85 Pixmap bottomShadowPixmap; | |
| 86 | |
| 87 int shadowThickness; | |
| 88 | |
| 89 Boolean showArrows; | |
| 90 | |
| 91 int minimum; | |
| 92 int maximum; | |
| 93 int sliderSize; | |
| 94 int value; | |
| 95 int pageIncrement; | |
| 96 int increment; | |
| 97 | |
| 98 int initialDelay; | |
| 99 int repeatDelay; | |
| 100 | |
| 101 unsigned char orientation; | |
| 102 | |
| 103 char *sliderStyle; | |
| 104 char *knobStyle; | |
| 105 char *arrowPosition; | |
| 106 | |
| 107 /* private */ | |
| 108 Pixmap grayPixmap; | |
| 109 | |
| 110 GC backgroundGC; | |
| 111 GC topShadowGC; | |
| 112 GC bottomShadowGC; | |
| 113 | |
| 114 int above, ss, below; | |
| 115 int lastY; | |
| 116 | |
| 117 enum XlwScrollbarArm armed; | |
| 118 | |
| 119 enum XlwScrollbarForcedScroll forced_scroll; | |
| 120 | |
| 121 int savedValue; | |
| 122 | |
| 123 Boolean fullRedrawNext; | |
| 124 | |
| 125 Boolean timerActive; | |
| 126 XtIntervalId timerId; | |
| 127 | |
| 128 } XlwScrollBarPart; | |
| 129 | |
| 130 typedef struct _XlwScrollBarRec | |
| 131 { | |
| 132 CorePart core; | |
| 133 XlwScrollBarPart sb; | |
| 134 } XlwScrollBarRec; | |
| 135 | |
| 136 #endif /* _XlwScrollBarP_h */ |