Mercurial > hg > xemacs-beta
view src/EmacsFrameP.h @ 5158:9e0b43d3095c
more cleanups to object-memory-usage stuff
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-19 Ben Wing <ben@xemacs.org>
* diagnose.el (show-object-memory-usage-stats):
Rewrite to take into account non-lisp-storage statistics
returned by garbage-collect-1 and friends.
src/ChangeLog addition:
2010-03-19 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (struct):
* alloc.c (tick_lrecord_stats):
* alloc.c (gc_sweep_1):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (compute_memusage_stats_length):
Call new memory-usage mechanism at sweep time to compute extra
memory utilization for all objects. Add up the values element-by-
element to get an aggregrate set of statistics, where each is the
sum of the values of a single statistic across different objects
of the same type. At end of sweep time, call
finish_object_memory_usage_stats() to add up all the aggreggrate
stats that are related to non-Lisp memory storage to compute
a single value, and add it to the list of values returned by
`garbage-collect' and `object-memory-usage-stats'.
* buffer.c (compute_buffer_text_usage):
Don't crash on buffers without text (killed buffers?) and don't
double-count indirect buffers.
* elhash.c:
* elhash.c (hash_table_objects_create):
* elhash.c (vars_of_elhash):
* symsinit.h:
Add memory-usage method to count the size of `hentries'.
* emacs.c (main_1):
Call new functions in elhash.c, frame.c at init.
* frame.c:
* frame.c (compute_frame_usage):
* frame.c (frame_memory_usage):
* frame.c (frame_objects_create):
* symsinit.h:
Add memory-usage method to count gutter display structures,
subwindow exposures.
* gc.c (gc_finish):
* lisp.h:
Declare finish_object_memory_usage_stats(), call it in gc_finish().
* lrecord.h (struct lrecord_implementation):
* lrecord.h (INIT_MEMORY_USAGE_STATS):
New value in implementation struct to track number of non-Lisp-memory
statistics. Computed in alloc.c.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 19 Mar 2010 14:47:44 -0500 |
parents | 374186f156d5 |
children | 308d34e9f07d |
line wrap: on
line source
/* Private header for the Emacs frame widget. Copyright (C) 1993-1995 Sun Microsystems, Inc. Copyright (C) 1995 Ben Wing. 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: Not in FSF. */ #ifndef INCLUDED_EmacsFrameP_h_ #define INCLUDED_EmacsFrameP_h_ #include "xintrinsicp.h" #include <X11/CoreP.h> #ifdef LWLIB_USES_MOTIF #include "xmprimitivep.h" #endif #include "EmacsFrame.h" typedef struct { #ifdef LWLIB_USES_MOTIF #if XmVERSION < 2 /* It's easy to erroneously compile with Motif 1 headers, but link with Motif 2 libraries. For example, AIX stupidly provides Motif headers in /usr/dt/include, but fails to provide the corresponding libraries in /usr/dt/lib. We actually try to survive such a version mismatch, since Motif 2 is _almost_ binary compatible with Motif 1. Motif 2's XmPrimitivePart has some trailing data members which overlay the start of this struct. We create dummy members to make space for XmPrimitivePart's added members. These must, of course, be at the beginning of this struct. Delete this kludge when no one has Motif1 on their system anymore, perhaps in 2010. */ XtCallbackList Motif2_dummy_convert_callback; XtCallbackList Motif2_dummy_popup_handler_callback; long Motif2_dummy_layout_direction; #endif #endif struct frame* frame; /* the *emacs* frame object */ /* Resources that can't be done from lisp. */ char* geometry; /* geometry spec of this frame */ Boolean iconic; /* whether this frame is iconic */ /* The rest of this is crap and should be deleted. #### Comments that start with + are fields that actually get referred to somewhere aside from the init function. I guess the "crap" has mostly moved to specifiers? */ Boolean minibuffer; /* 0: normal frames with minibuffers. * 1: frames without minibuffers * 2: minibuffer only. */ Boolean unsplittable; /* frame can only have one window */ int internal_border_width; /* + internal borders */ int scrollbar_width; /* width of frame vertical sb's */ int scrollbar_height; /* height of frame horizontal sb's */ int top_toolbar_height; /* height of top toolbar */ int bottom_toolbar_height; /* height of bottom toolbar */ int left_toolbar_width; /* width of left toolbar */ int right_toolbar_width; /* width of right toolbar */ int top_toolbar_border_width; /* border width */ int bottom_toolbar_border_width; /* ... of bottom toolbar */ int left_toolbar_border_width; /* ... of left toolbar */ int right_toolbar_border_width; /* ... of right toolbar */ Dimension toolbar_shadow_thickness; /* + of shadows */ unsigned char scrollbar_placement; int interline; /* + skips between lines */ XFontStruct* font; /* font */ Pixel foreground_pixel; /* foreground */ Pixel background_pixel; /* background */ Pixel cursor_color; /* text cursor color */ Boolean bar_cursor; /* 1 if bar, 0 if block */ Boolean visual_bell; /* flash instead of beep */ int bell_volume; /* how loud is beep */ Boolean menubar_p; /* initially show a menubar? */ Boolean initially_unmapped; /* + inhibit initial window mapping */ Boolean use_backing_store; /* backing store for menubar & ew? */ Dimension preferred_width; /* if non-zero, preferred size for */ Dimension preferred_height; /* QueryGeometry() */ /* private state */ } EmacsFramePart; typedef struct _EmacsFrameRec { /* full instance record */ CorePart core; #ifdef LWLIB_USES_MOTIF XmPrimitivePart primitive; #endif EmacsFramePart emacs_frame; } EmacsFrameRec; typedef struct { /* new fields for EmacsFrame class */ int dummy; } EmacsFrameClassPart; typedef struct _EmacsFrameClassRec { /* full class record declaration */ CoreClassPart core_class; #ifdef LWLIB_USES_MOTIF XmPrimitiveClassPart primitive_class; #endif EmacsFrameClassPart emacs_frame_class; } EmacsFrameClassRec; extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */ #endif /* INCLUDED_EmacsFrameP_h_ */