Mercurial > hg > xemacs-beta
view lwlib/xlwgcs.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 | 5460287a3327 |
children | 308d34e9f07d |
line wrap: on
line source
/* Tabs Widget for XEmacs. Copyright (C) 1999 Edward A. Falk This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Gcs 1.7 */ #ifndef GCS_H #define GCS_H /* Overview of functions provided here: * * AllocFgGC() * Given a foreground pixel & a font, return an appropriate GC * * AllocBackgroundGC() * Given a widget, return a GC for painting the background color * * AllocShadeGC() * Given foreground, background, a contrast value & be_nice_to_colormap * flag, return a GC suitable for rendering in an intermediate color, * as determined by contrast. May return a dither pattern or a * solid color, as appropriate. * * Contrast 0 = background color, 100 = foreground color. It is legal * for contrast to be more than 100 or less than 0. * * AllocGreyGC() * Given widget, foreground, font, contrast & be_nice_to_colormap, * return a shade GC (see above) based on foreground and widget * background. * * AllocTopShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the top shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use brighter * colors. * * AllocBotShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the bottom shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocArmShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the "armed" shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocShadowPixel() * Given a widget & scale factor, allocate & return a color darker * or lighter than the background pixel, as determined by scale. * * Scale 100 = use background pixel. Scale > 100 = brighter color, * Scale < 100 = darker color. * * AllocGreyPixel() * Given two pixel values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * * AllocGreyPixelC() * Given two color values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * Draw3dBox() * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, * draw a 3-d box. */ #if NeedFunctionPrototypes extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; extern GC AllocBackgroundGC( Widget w, Font font) ; extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, int contrast, Bool ) ; extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; extern GC AllocArmGC( Widget w, int contrast, int) ; extern Pixel AllocShadowPixel(Widget, int scale) ; extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; #else extern GC AllocFgGC() ; extern GC AllocBackgroundGC() ; extern GC AllocShadeGC() ; extern GC AllocGreyGC() ; extern GC AllocTopShadowGC() ; extern GC AllocBotShadowGC() ; extern GC AllocArmGC() ; extern Pixel AllocShadowPixel() ; extern Pixel AllocGreyPixel() ; extern Pixel AllocGreyPixelC() ; extern void Draw3dBox() ; #endif #endif /* GCS_H */