Mercurial > hg > xemacs-beta
view src/emodules.h @ 5170:5ddbab03b0e6
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.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 25 Mar 2010 06:07:25 -0500 |
parents | 3461165c79be |
children | 308d34e9f07d |
line wrap: on
line source
/* emodules.h - Declarations and definitions for XEmacs loadable modules. (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. 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. */ #ifndef EMODULES_HDR #ifndef EMODULES_GATHER_VERSION #define EMODULES_HDR #endif #define EMODULES_VERSION "1.1.0" #define EMODULES_MAJOR 1 #define EMODULES_MINOR 1 #define EMODULES_PATCH 0 #define EMODULES_REVISION (long)((EMODULES_MAJOR * 1000) + \ (EMODULES_MINOR * 10) + \ (EMODULES_PATCH)) #ifndef EMODULES_GATHER_VERSION #include <config.h> #include "lisp.h" #include "sysdep.h" #include "window.h" #include "buffer.h" #include "insdel.h" #include "frame.h" #include "lstream.h" #include "file-coding.h" /* Module loading technology version number */ extern Lisp_Object Vmodule_version; /* XEmacs version Information */ extern Lisp_Object Vemacs_major_version; extern Lisp_Object Vemacs_minor_version; /* * Load in a C module. The first argument is the name of the .so file, the * second is the name of the module, and the third is the module version. * If the module name is NULL, we will always reload the .so. If it is not * NULL, we check to make sure we haven't loaded it before. If the version * is specified, we check to make sure we didn't load the module of the * specified version before. We also use these as checks when we open the * module to make sure we have the right module. */ extern void emodules_load (const Ibyte *module, const Ibyte *modname, const Ibyte *modver); /* * Because subrs and symbols added by a dynamic module are not part of * the make-docfile process, we need a clean way to get the variables * and functions documented. Since people don't like the idea of making * shared modules use different versions of DEFSUBR() and DEFVAR_LISP() * and friends, we need these two functions to insert the documentation * into the right place. These functions will be called by the module * init code, generated by ellcc during initialization mode. */ EXTERN_C MODULE_API void emodules_doc_subr (const Ascbyte *objname, const Ascbyte *docstr); EXTERN_C MODULE_API void emodules_doc_sym (const Ascbyte *objname, const Ascbyte *docstr); #define CDOCSUBR(Fname, DOC) emodules_doc_subr (Fname, DOC) #define CDOCSYM(Sname, DOC) emodules_doc_sym (Sname, DOC) #endif /* EMODULES_GATHER_VERSION */ /* We should not expose module entities to the portable dumper. */ #if defined(PDUMP) && defined(EMACS_MODULE) #undef dump_add_root_block_ptr #define dump_add_root_block_ptr(varaddr,descaddr) DO_NOTHING #undef dump_add_opaque #define dump_add_opaque(varaddr,size) DO_NOTHING #undef dump_add_root_block #define dump_add_root_block(ptraddress,desc) DO_NOTHING #undef dump_add_opaque_int #define dump_add_opaque_int(int_varaddr) DO_NOTHING #undef dump_add_opaque_fixnum #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING #undef dump_add_root_lisp_object #define dump_add_root_lisp_object(varaddr) DO_NOTHING #undef dump_add_weak_object_chain #define dump_add_weak_object_chain(varaddr) DO_NOTHING #undef staticpro #define staticpro(DSF_location) staticpro_nodump(DSF_location) #undef unstaticpro #define unstaticpro(DSF_location) unstaticpro_nodump(DFS_location) #undef DEFSYMBOL #define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) #undef DEFSYMBOL_MULTIWORD_PREDICATE #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) #undef defsymbol #define defsymbol(location,name) defsymbol_nodump (location, name) #endif /* defined(PDUMP) && defined(EMACS_MODULE) */ #endif /* EMODULES_HDR */