Mercurial > hg > xemacs-beta
annotate src/libinterface.c @ 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 | 26a2f3423141 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 870 | 1 /* Interface to graphics/etc libraries, with cdecl calling convention. |
| 2 Copyright (C) 2002 Ben Wing | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include "lisp.h" | |
| 25 | |
| 26 #include "libinterface.h" | |
| 27 | |
| 28 /* YUUUUUUUUUUUUUUCK! | |
| 29 | |
| 30 This file exists only because VC++ lacks pragmas that let you change the | |
| 31 default calling convention in the middle of a file. With optimization, | |
| 32 we compile XEmacs using fastcall as the default convention; but | |
| 33 libraries are not compiled this way, and thus need __cdecl in their | |
| 34 declaration. Without the pragma, we either | |
| 35 | |
| 36 (a) depend on libraries that declare their external functions with | |
| 37 suitable preprocessor definitions that we can change; | |
| 38 | |
| 39 (b) force the user to recompile the library with fastcall (not | |
| 40 reasonable); | |
| 41 | |
| 42 (c) hack the headers manually (not reasonable); | |
| 43 | |
| 44 (d) put all calls to the library in a separate file where the default | |
| 45 calling convention is __cdecl (hence, this file). | |
| 46 | |
| 47 In fact, some libraries do make (a) feasible. This is the case with PNG | |
| 48 and ZLIB. JPEG almost does so, since all externs are wrapped with | |
| 49 EXTERN(); but they fail to wrap their definition of EXTERN with #ifndef | |
| 50 EXTERN, so we can't override it. XPM is similar, wrapping their externs | |
| 51 with FUNC() -- again, not overridable. With PNG, we define PNG_EXPORT; | |
| 52 with ZLIB, we define ZEXPORT and ZEXPORTVA. */ | |
| 53 | |
| 54 #ifdef HAVE_XPM | |
| 55 | |
| 56 void | |
| 57 qxe_XpmFreeXpmImage (XpmImage *image) | |
| 58 { | |
| 59 XpmFreeXpmImage (image); | |
| 60 } | |
| 61 | |
| 62 void | |
| 63 qxe_XpmFreeXpmInfo (XpmInfo *info) | |
| 64 { | |
| 65 XpmFreeXpmInfo (info); | |
| 66 } | |
| 67 | |
| 68 int | |
| 69 qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info) | |
| 70 { | |
| 71 return XpmCreateXpmImageFromBuffer (buffer, image, info); | |
| 72 } | |
| 73 | |
| 74 void | |
| 75 qxe_XpmFree (void *ptr) | |
| 76 { | |
| 77 XpmFree (ptr); | |
| 78 } | |
| 79 | |
| 80 int | |
| 81 qxe_XpmReadFileToData (char *filename, char ***data_return) | |
| 82 { | |
| 83 return XpmReadFileToData (filename, data_return); | |
| 84 } | |
| 85 | |
| 86 #endif /* HAVE_XPM */ | |
| 87 | |
| 88 #ifdef HAVE_JPEG | |
| 89 | |
| 90 boolean | |
| 91 qxe_jpeg_finish_decompress (j_decompress_ptr cinfo) | |
| 92 { | |
| 93 return jpeg_finish_decompress (cinfo); | |
| 94 } | |
| 95 | |
| 96 boolean | |
| 97 qxe_jpeg_start_decompress (j_decompress_ptr cinfo) | |
| 98 { | |
| 99 return jpeg_start_decompress (cinfo); | |
| 100 } | |
| 101 | |
| 102 JDIMENSION | |
| 103 qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, | |
| 104 JDIMENSION max_lines) | |
| 105 { | |
| 106 return jpeg_read_scanlines (cinfo, scanlines, max_lines); | |
| 107 } | |
| 108 | |
| 109 int | |
| 110 qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) | |
| 111 { | |
| 112 return jpeg_read_header (cinfo, require_image); | |
| 113 } | |
| 114 | |
| 115 void | |
| 116 qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 117 size_t structsize) | |
| 118 { | |
| 119 jpeg_CreateDecompress (cinfo, version, structsize); | |
| 120 } | |
| 121 | |
| 122 struct jpeg_error_mgr * | |
| 123 qxe_jpeg_std_error (struct jpeg_error_mgr *err) | |
| 124 { | |
| 125 return jpeg_std_error (err); | |
| 126 } | |
| 127 | |
| 128 void | |
| 129 qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo) | |
| 130 { | |
| 131 jpeg_destroy_decompress (cinfo); | |
| 132 } | |
| 133 | |
| 134 boolean | |
| 135 qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) | |
| 136 { | |
| 137 return jpeg_resync_to_restart (cinfo, desired); | |
| 138 } | |
| 139 | |
| 140 #endif /* HAVE_JPEG */ | |
| 141 | |
| 142 #ifdef HAVE_TIFF | |
| 143 | |
| 144 tdata_t | |
| 145 qxe_TIFFmalloc (tsize_t x1) | |
| 146 { | |
| 147 return _TIFFmalloc (x1); | |
| 148 } | |
| 149 | |
| 150 void | |
| 151 qxe_TIFFfree (tdata_t x1) | |
| 152 { | |
| 153 _TIFFfree (x1); | |
| 154 } | |
| 155 | |
| 156 void | |
| 157 qxe_TIFFClose (TIFF *x1) | |
| 158 { | |
| 159 TIFFClose (x1); | |
| 160 } | |
| 161 | |
| 162 int | |
| 163 qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3) | |
| 164 { | |
| 165 return TIFFGetField (x1, x2, x3); | |
| 166 } | |
| 167 | |
| 168 TIFF * | |
| 169 qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 170 thandle_t x3, | |
| 171 TIFFReadWriteProc x4, TIFFReadWriteProc x5, | |
| 172 TIFFSeekProc x6, TIFFCloseProc x7, | |
| 173 TIFFSizeProc x8, | |
| 174 TIFFMapFileProc x9, TIFFUnmapFileProc x10) | |
| 175 { | |
| 176 return TIFFClientOpen (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); | |
| 177 } | |
| 178 | |
| 179 TIFFErrorHandler | |
| 180 qxe_TIFFSetErrorHandler (TIFFErrorHandler x1) | |
| 181 { | |
| 182 return TIFFSetErrorHandler (x1); | |
| 183 } | |
| 184 | |
| 185 TIFFErrorHandler | |
| 186 qxe_TIFFSetWarningHandler (TIFFErrorHandler x1) | |
| 187 { | |
| 188 return TIFFSetWarningHandler (x1); | |
| 189 } | |
| 190 | |
| 191 int | |
| 192 qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5) | |
| 193 { | |
| 194 return TIFFReadRGBAImage (x1, x2, x3, x4, x5); | |
| 195 } | |
| 196 | |
| 197 #endif /* HAVE_TIFF */ |