Mercurial > hg > xemacs-beta
view etc/Emacs.ad @ 5157:1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-18 Ben Wing <ben@xemacs.org>
* diagnose.el (show-memory-usage):
Rewrite to take into account API changes in memory-usage functions.
src/ChangeLog addition:
2010-03-18 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (disksave_object_finalization_1):
* alloc.c (lisp_object_storage_size):
* alloc.c (listu):
* alloc.c (listn):
* alloc.c (Fobject_memory_usage_stats):
* alloc.c (compute_memusage_stats_length):
* alloc.c (Fobject_memory_usage):
* alloc.c (Ftotal_object_memory_usage):
* alloc.c (malloced_storage_size):
* alloc.c (common_init_alloc_early):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* alloc.c (init_alloc_once_early):
* alloc.c (syms_of_alloc):
* alloc.c (reinit_vars_of_alloc):
* buffer.c:
* buffer.c (struct buffer_stats):
* buffer.c (compute_buffer_text_usage):
* buffer.c (compute_buffer_usage):
* buffer.c (buffer_memory_usage):
* buffer.c (buffer_objects_create):
* buffer.c (syms_of_buffer):
* buffer.c (vars_of_buffer):
* console-impl.h (struct console_methods):
* dynarr.c (Dynarr_memory_usage):
* emacs.c (main_1):
* events.c (clear_event_resource):
* extents.c:
* extents.c (compute_buffer_extent_usage):
* extents.c (extent_objects_create):
* extents.h:
* faces.c:
* faces.c (compute_face_cachel_usage):
* faces.c (face_objects_create):
* faces.h:
* general-slots.h:
* glyphs.c:
* glyphs.c (compute_glyph_cachel_usage):
* glyphs.c (glyph_objects_create):
* glyphs.h:
* lisp.h:
* lisp.h (struct usage_stats):
* lrecord.h:
* lrecord.h (enum lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lrecord.h (INIT_LISP_OBJECT):
* lrecord.h (INIT_MODULE_LISP_OBJECT):
* lrecord.h (UNDEF_LISP_OBJECT):
* lrecord.h (UNDEF_MODULE_LISP_OBJECT):
* lrecord.h (DECLARE_LISP_OBJECT):
* lrecord.h (DECLARE_MODULE_API_LISP_OBJECT):
* lrecord.h (DECLARE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (syms_of_lstream):
* lstream.c (vars_of_lstream):
* marker.c:
* marker.c (compute_buffer_marker_usage):
* mc-alloc.c (mc_alloced_storage_size):
* mc-alloc.h:
* mule-charset.c:
* mule-charset.c (struct charset_stats):
* mule-charset.c (compute_charset_usage):
* mule-charset.c (charset_memory_usage):
* mule-charset.c (mule_charset_objects_create):
* mule-charset.c (syms_of_mule_charset):
* mule-charset.c (vars_of_mule_charset):
* redisplay.c:
* redisplay.c (compute_rune_dynarr_usage):
* redisplay.c (compute_display_block_dynarr_usage):
* redisplay.c (compute_glyph_block_dynarr_usage):
* redisplay.c (compute_display_line_dynarr_usage):
* redisplay.c (compute_line_start_cache_dynarr_usage):
* redisplay.h:
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
* scrollbar-x.c (x_compute_scrollbar_instance_usage):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h:
* symbols.c:
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symbols.c (defsymbol_massage_name_1):
* symsinit.h:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_getprop):
* ui-gtk.c (emacs_gtk_object_putprop):
* ui-gtk.c (ui_gtk_objects_create):
* unicode.c (compute_from_unicode_table_size_1):
* unicode.c (compute_to_unicode_table_size_1):
* unicode.c (compute_from_unicode_table_size):
* unicode.c (compute_to_unicode_table_size):
* window.c:
* window.c (struct window_stats):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
* window.c (window_memory_usage):
* window.c (window_objects_create):
* window.c (syms_of_window):
* window.c (vars_of_window):
* window.h:
Redo memory-usage mechanism, make it general; add way of dynamically
initializing Lisp object types -- OBJECT_HAS_METHOD(), similar to
CONSOLE_HAS_METHOD().
(1) Create OBJECT_HAS_METHOD(), OBJECT_HAS_PROPERTY() etc. for
specifying that a Lisp object type has a particular method or
property. Call such methods with OBJECT_METH, MAYBE_OBJECT_METH,
OBJECT_METH_OR_GIVEN; retrieve properties with OBJECT_PROPERTY.
Methods that formerly required a DEFINE_*GENERAL_LISP_OBJECT() to
specify them (getprop, putprop, remprop, plist, disksave) now
instead use the dynamic-method mechanism. The main benefit of
this is that new methods or properties can be added without
requiring that the declaration statements of all existing methods
be modified. We have to make the `struct lrecord_implementation'
non-const, but I don't think this should have any effect on speed --
the only possible method that's really speed-critical is the
mark method, and we already extract those out into a separate
(non-const) array for increased cache locality.
Object methods need to be reinitialized after pdump, so we put
them in separate functions such as face_objects_create(),
extent_objects_create() and call them appropriately from emacs.c
The only current object property (`memusage_stats_list') that
objects can specify is a Lisp object and gets staticpro()ed so it
only needs to be set during dump time, but because it references
symbols that might not exist in a syms_of_() function, we
initialize it in vars_of_(). There is also an object property
(`num_extra_memusage_stats') that is automatically initialized based
on `memusage_stats_list'; we do that in reinit_vars_of_alloc(),
which is called after all vars_of_() functions are called.
`disksaver' method was renamed `disksave' to correspond with the
name normally given to the function (e.g. disksave_lstream()).
(2) Generalize the memory-usage mechanism in `buffer-memory-usage',
`window-memory-usage', `charset-memory-usage' into an object-type-
specific mechanism called by a single function
`object-memory-usage'. (Former function `object-memory-usage'
renamed to `total-object-memory-usage'). Generalize the mechanism
of different "slices" so that we can have different "classes" of
memory described and different "slices" onto each class; `t'
separates classes, `nil' separates slices. Currently we have
three classes defined: the memory of an object itself,
non-Lisp-object memory associated with the object (e.g. arrays or
dynarrs stored as fields in the object), and Lisp-object memory
associated with the object (other internal Lisp objects stored in
the object). This isn't completely finished yet and we might need
to further separate the "other internal Lisp objects" class into
two classes.
The memory-usage mechanism uses a `struct usage_stats' (renamed
from `struct overhead_stats') to describe a malloc-view onto a set
of allocated memory (listing how much was requested and various
types of overhead) and a more general `struct generic_usage_stats'
(with a `struct usage_stats' in it) to hold all statistics about
object memory. `struct generic_usage_stats' contains an array of
32 Bytecounts, which are statistics of unspecified semantics. The
intention is that individual types declare a corresponding struct
(e.g. `struct window_stats') with the same structure but with
specific fields in place of the array, corresponding to specific
statistics. The number of such statistics is an object property
computed from the list of tags (Lisp symbols describing the
statistics) stored in `memusage_stats_list'. The idea here is to
allow particular object types to customize the number and
semantics of the statistics where completely avoiding consing.
This doesn't matter so much yet, but the intention is to have the
memory usage of all objects computed at the end of GC, at the same
time as other statistics are currently computed. The values for
all statistics for a single type would be added up to compute
aggregate values for all objects of a specific type. To make this
efficient, we can't allow any memory allocation at all.
(3) Create some additional functions for creating lists that
specify the elements directly as args rather than indirectly through
an array: listn() (number of args given), listu() (list terminated
by Qunbound).
(4) Delete a bit of remaining unused C window_config stuff, also
unused lrecord_type_popup_data.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 18 Mar 2010 10:50:06 -0500 |
| parents | ea7a6c12df45 |
| children | 388762703a21 |
line wrap: on
line source
! This is the app-defaults file for XEmacs. ! ! This used to be identical to sample.Xresources, but the resources ! below have been rewritten to be as general as possible to avoid ! overriding user resources. Other than the form rewriting, both ! files should be kept in sync. ! ! The resources below are loaded into the XEmacs executable at compile-time: ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no ! effect. ! ! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs ! (or whatever the standard app-defaults directory is at your site) to cause ! it to be consulted at run-time. (Do this only for site-wide customizations: ! personal customizations should be put into ~/.Xresources instead.) ! Note that the file must be named Emacs, not XEmacs. ! ! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of ! the various resources and the syntax for setting them. ! Colors and backgrounds. ! ====================== ! The contrasts of these colors will cause them to map to the appropriate ! one of "black" or "white" on monochrome systems. ! ! The valid color names on your system can be found by looking in the file ! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/. ! Set the modeline colors. !Emacs.modeline*attributeForeground: Black !Emacs.modeline*attributeBackground: Gray75 ! Set the color of the text cursor. !Emacs.text-cursor*attributeBackground: Red3 ! If you want to set the color of the mouse pointer, do this: ! Emacs.pointer*attributeForeground: Black ! If you want to set the background of the mouse pointer, do this: ! Emacs.pointer*attributeBackground: White ! Note that by default, the pointer foreground and background are the same ! as the default face. ! Set the menubar colors. This overrides the default foreground and ! background colors specified above. *menubar*Foreground: Gray30 *menubar*Background: Gray80 ! This is for buttons in the menubar. ! Yellow would be better, but that would map to white on monochrome. *menubar*buttonForeground: Blue *XlwMenu*highlightForeground: Red *XlwMenu*titleForeground: Maroon *XlwMenu*selectColor: ForestGreen *XmToggleButton*selectColor: ForestGreen ! Specify the colors of popup menus. *popup*Foreground: Black *popup*Background: Gray80 ! Specify the colors of the various sub-widgets of the dialog boxes. *dialog*Foreground: Black ! #A5C0C1 is a shade of blue *dialog*Background: #A5C0C1 ! The following three are for Motif dialog boxes ... *dialog*XmTextField*Background: WhiteSmoke *dialog*XmText*Background: WhiteSmoke *dialog*XmList*Background: WhiteSmoke ! While this one is for Athena dialog boxes. *dialog*Command*Background: WhiteSmoke ! Xlw Scrollbar colors *XlwScrollBar*Foreground: Gray30 *XlwScrollBar*Background: Gray80 *XmScrollBar*Foreground: Gray30 *XmScrollBar*Background: Gray80 ! ! The Lucid Scrollbar supports two added resources, SliderStyle is either ! "plain" (default) or "dimple". Dimple puts a small dimple in the middle ! of the slider that depresses when the slider is clicked on. ArrowPosition is ! either "opposite" (default) or "same". Opposite puts the arrows at opposite ! of the scrollbar, same puts both arrows at the same end, like the Amiga. ! ! Emacs*XlwScrollBar.SliderStyle: dimple ! Emacs*XlwScrollBar.ArrowPosition: opposite ! ! If you want to turn off a toolbar, set its height or width to 0. ! The correct size value is not really arbitrary. We only control it ! this way in order to avoid excess frame resizing when turning the ! toolbars on and off. ! ! To change the heights and widths of the toolbars: ! ! Emacs.topToolBarHeight: 37 ! Emacs.bottomToolBarHeight: 0 ! Emacs.leftToolBarWidth: 0 ! Emacs.rightToolBarWidth: 0 !*topToolBarShadowColor: Gray90 !*bottomToolBarShadowColor: Gray40 !*backgroundToolBarColor: Gray80 *toolBarShadowThickness: 2 ! If you want to turn off vertical scrollbars, or change the default ! pixel width of the vertical scrollbars, do it like this (0 width ! means no vertical scrollbars): ! ! Emacs.scrollBarWidth: 0 ! ! To change it for a particular frame, do this: ! ! Emacs*FRAME-NAME.scrollBarWidth: 0 ! If you want to turn off horizontal scrollbars, or change the default ! pixel height of the horizontal scrollbars, do it like this (0 height ! means no horizontal scrollbars): ! ! Emacs.scrollBarHeight: 0 ! ! To change it for a particular frame, do this: ! ! Emacs*FRAME-NAME.scrollBarHeight: 0 ! To dynamically change the labels used for menubar buttons... ! ! Emacs*XlwMenu.resourceLabels: True ! Emacs*XlwMenu.newFrame.labelString: Open Another Window ! To have the Motif scrollbars on the left instead of the right, do this: ! ! Emacs*scrollBarPlacement: BOTTOM_LEFT ! ! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead ! To have Motif scrollbars act more like Xt scrollbars... ! ! Emacs*XmScrollBar.translations: #override \n\ ! <Btn1Down>: PageDownOrRight(0) \n\ ! <Btn3Down>: PageUpOrLeft(0) ! Fonts. ! ====== ! XEmacs requires the use of XLFD (X Logical Font Description) format font ! names, which look like ! ! *-courier-medium-r-*-*-*-120-*-*-*-*-*-* ! ! if you use any of the other, less strict font name formats, some of which ! look like ! lucidasanstypewriter-12 ! and fixed ! and 9x13 ! ! then XEmacs won't be able to guess the names of the bold and italic versions. ! All X fonts can be referred to via XLFD-style names, so you should use those ! forms. See the man pages for X(1), xlsfonts(1), and xfontsel(1). ! The default font for the text area of XEmacs is chosen at run-time ! by lisp code which tries a number of different possibilities in order ! of preference. If you wish to override it, use this: ! ! Emacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! If you choose a font which does not have an italic version, you can specify ! some other font to use for it here: ! ! Emacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-* ! ! If you choose a font which does not have a bold-italic version, ! you can specify some other font to use for it here: ! ! Emacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-* ! ! And here is how you would set the background color of the `highlight' face, ! but only on the screen named `debugger': ! ! Emacs*debugger.highlight.attributeBackground: PaleTurquoise ! ! See the NEWS file (C-h n) for a more complete description of the resource ! syntax of faces. ! Font of the modeline, menubar and pop-up menus. ! Note that the menubar resources do not use the `face' syntax, since they ! are X toolkit widgets and thus outside the domain of XEmacs proper. ! ! When X Font Sets are enabled with ./configure --with-xfs (eg, for ! multilingual menubars and XIM), some .font resources (those specific to ! the Lucid widget set) are ignored in favor of .fontSet resources. This ! example shows how to add fonts for Japanese menubars: ! ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! *menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ! Gui elements share this font ! Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't ! know why you probably don't want to.) ! *XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* *XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* *XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! Font in the Athena dialog boxes. ! I think 14-point looks nicer than 12-point. ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. *Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ! Dialog box translations. ! ======================= ! This accelerator binds <return> in a dialog box to <activate> on button1 *dialog*button1.accelerators:#override\ <KeyPress>Return: ArmAndActivate()\n\ <KeyPress>KP_Enter: ArmAndActivate()\n\ Ctrl<KeyPress>m: ArmAndActivate()\n ! Translations to make the TextField widget behave more like XEmacs *XmTextField*translations: #override\n\ !<Key>osfBackSpace: delete-previous-character()\n\ !<Key>osfDelete: delete-previous-character()\n\ !Ctrl<Key>h: delete-previous-character()\n\ !Ctrl<Key>d: delete-next-character()\n\ !Meta<Key>osfDelete: delete-previous-word()\n\ !Meta<Key>osfBackSpace: delete-previous-word()\n\ !Meta<Key>d: delete-next-word()\n\ !Ctrl<Key>k: delete-to-end-of-line()\n\ !Ctrl<Key>g: process-cancel()\n\ !Ctrl<Key>b: backward-character()\n\ !<Key>osfLeft: backward-character()\n\ !Ctrl<Key>f: forward-character()\n\ !<Key>osfRight: forward-character()\n\ !Meta<Key>b: backward-word()\n\ !Meta<Key>osfLeft: backward-word()\n\ !Meta<Key>f: forward-word()\n\ !Meta<Key>osfRight: forward-word()\n\ !Ctrl<Key>e: end-of-line()\n\ !Ctrl<Key>a: beginning-of-line()\n\ !Ctrl<Key>w: cut-clipboard()\n\ !Meta<Key>w: copy-clipboard()\n\ <Btn2Up>: copy-primary()\n ! With the XEmacs typeahead it's better to not have space be bound to ! ArmAndActivate() for buttons that appear in dialog boxes. This is ! not 100% Motif compliant but the benefits far outweight the ! compliancy problem. *dialog*XmPushButton*translations:#override\n\ <Btn1Down>: Arm()\n\ <Btn1Down>,<Btn1Up>: Activate()\ Disarm()\n\ <Btn1Down>(2+): MultiArm()\n\ <Btn1Up>(2+): MultiActivate()\n\ <Btn1Up>: Activate()\ Disarm()\n\ <Key>osfSelect: ArmAndActivate()\n\ <Key>osfActivate: ArmAndActivate()\n\ <Key>osfHelp: Help()\n\ ~Shift ~Meta ~Alt <Key>Return: ArmAndActivate()\n\ <EnterWindow>: Enter()\n\ <LeaveWindow>: Leave()\n ! Native Widget translations ! ======================= Emacs*Text*translations: #override\n\ <Btn1Down>: widget-focus-in() select-start()\n ! XIM input method style ! ======================= ! ximStyles is a (whitespace or comma-separated) list of XIMStyles in ! order of user's preference. ! Choose a subset of the following styles or reorder to taste *ximStyles: XIMPreeditPosition|XIMStatusArea\ XIMPreeditPosition|XIMStatusNothing\ XIMPreeditPosition|XIMStatusNone\ XIMPreeditNothing|XIMStatusArea\ XIMPreeditNothing|XIMStatusNothing\ XIMPreeditNothing|XIMStatusNone\ XIMPreeditNone|XIMStatusArea\ XIMPreeditNone|XIMStatusNothing\ XIMPreeditNone|XIMStatusNone ! XIM Preedit and Status foreground and background *EmacsFrame.ximForeground: black *EmacsFrame.ximBackground: white ! XIM fontset (defaults to system fontset default) ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*