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.

/* Implements a lightweight scrollbar widget.
   Copyright (C) 1992, 1993, 1994 Lucid, Inc.

This file is part of the Lucid Widget Library.

The Lucid Widget Library 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.

The Lucid Widget Library 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.  */

/* Created by Douglas Keller <dkeller@vnet.ibm.com> */

#ifndef _XlwScrollBarP_h
#define _XlwScrollBarP_h


/*
** Widget class
*/
typedef struct
{
  int dummy_field;	/* keep compiler happy */
} XlwScrollBarClassPart;

typedef struct _XlwScrollbarClassRec
{
  CoreClassPart	core_class;
  XlwScrollBarClassPart scrollbar_class;
} XlwScrollBarClassRec;

enum XlwScrollbarArm
{
  ARM_NONE,
  ARM_SLIDER,
  ARM_UP,
  ARM_DOWN,
  ARM_PAGEUP,
  ARM_PAGEDOWN
};

enum XlwScrollbarForcedScroll
{
  FORCED_SCROLL_NONE,
  FORCED_SCROLL_DOWNRIGHT,
  FORCED_SCROLL_UPLEFT
};

/*
** Widget instance
*/
typedef struct
{
  /* resources */
  XtCallbackList valueChangedCBL;
  XtCallbackList incrementCBL;
  XtCallbackList decrementCBL;
  XtCallbackList pageIncrementCBL;
  XtCallbackList pageDecrementCBL;
  XtCallbackList toTopCBL;
  XtCallbackList toBottomCBL;
  XtCallbackList dragCBL;

  Pixel		foreground;

  Pixel		topShadowColor;
  Pixel		bottomShadowColor;

  Pixel		troughColor;

  Pixel		armColor;
  Pixel		armTopShadowColor;
  Pixel		armBottomShadowColor;

  Pixmap	topShadowPixmap;
  Pixmap	bottomShadowPixmap;

  int		shadowThickness;

  Boolean	showArrows;

  int		minimum;
  int		maximum;
  int		sliderSize;
  int		value;
  int		pageIncrement;
  int		increment;

  int		initialDelay;
  int		repeatDelay;

  unsigned char	orientation;

  char		*sliderStyle;
  char		*knobStyle;
  char		*arrowPosition;

  /* private */
  Pixmap	grayPixmap;

  GC		backgroundGC;
  GC		topShadowGC;
  GC		bottomShadowGC;

  int		above, ss, below;
  int		lastY;

  enum XlwScrollbarArm armed;

  enum XlwScrollbarForcedScroll forced_scroll;

  int		savedValue;

  Boolean	fullRedrawNext;

  Boolean	timerActive;
  XtIntervalId	timerId;

} XlwScrollBarPart;

typedef struct _XlwScrollBarRec
{
  CorePart          core;
  XlwScrollBarPart  sb;
} XlwScrollBarRec;

#endif /* _XlwScrollBarP_h */