Mercurial > hg > xemacs-beta
view lwlib/lwlib-fonts.h @ 5059:c8f90d61dcf3
fix memory usage stats to include pdumped objects
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* diagnose.el:
* diagnose.el (show-object-memory-usage-stats):
Fix errors preventing this from working properly, account for
words like "entry" pluralized to "entries".
src/ChangeLog addition:
2010-02-21 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (struct):
* alloc.c (tick_lrecord_stats):
* alloc.c (tick_lcrecord_stats):
* alloc.c (sweep_lcrecords_1):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (gc_sweep_1):
* alloc.c (HACK_O_MATIC):
* alloc.c (FROB):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fgarbage_collect):
* dumper.c:
* dumper.c (pdump_objects_unmark):
* lrecord.h:
* lrecord.h (enum lrecord_alloc_status):
Fixes to memory-usage-tracking code, etc.
(1) Incorporate NEW_GC stuff into FREE_FIXED_TYPE_WHEN_NOT_IN_GC
to avoid duplication.
(2) Rewrite tick_lcrecord_stats() to include separate
tick_lrecord_stats(); use in dumper.c to note pdumped objects.
(3) Instead of handling frob-block objects specially in
object_memory_usage_stats(), have SWEEP_FIXED_TYPE_BLOCK_1
increment the stats in lrecord_stats[] so that they get handled
like other objects.
(4) Pluralize entry as entries, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 21 Feb 2010 15:29:12 -0600 |
| parents | a6c778975d7d |
| children | 308d34e9f07d |
line wrap: on
line source
/* Font data structures for X and Xft. Copyright (C) 2004 Free Software Foundation, Inc. Author: Stephen J. Turnbull <stephen@xemacs.org> Created: 24 Jul 2004 by Stephen J. Turnbull 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 GNU Emacs. */ #ifndef INCLUDED_lwlib_fonts_h_ #define INCLUDED_lwlib_fonts_h_ /* get headers */ #ifdef HAVE_XFT #define _XFT_NO_COMPAT_ /* shut up GCC */ #define face_index face_index_arg #define glyph_index glyph_index_arg #include <X11/Xft/Xft.h> #undef glyph_index #undef face_index #if XFT_MAJOR < 2 #error Xft versions < 2 not supported #endif #endif /* HAVE_XFT */ /* Xt name macros */ #ifdef HAVE_XFT #ifndef XtNxftFont #define XtNxftFont "xftFont" #define XtCXftFont "XftFont" #endif #ifndef XtNfcFont #define XtNfcFontName "fcFontName" #define XtCFcFontName "FcFontName" #endif #endif /* HAVE_XFT */ /* code 'n' stuff */ #ifdef HAVE_XFT #define FCSTRLEN 512 /* non-Lisp prototypes */ /* #### change this back to _open_name */ XftFont *xft_open_font_by_name (Display *dpy, char *name); #endif /* HAVE_XFT */ #endif /* INCLUDED_lwlib_fonts_h_ */