Mercurial > hg > xemacs-beta
view src/xemacs.def.in.in @ 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 | f965e31a35f0 |
| children | 41ac827cb71b |
line wrap: on
line source
/* The module API: core symbols that are visible to modules. Copyright (C) 2008 Jerry James Copyright (C) 2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* The symbol to import/export is on the left. If the symbol is not meant to be used directly, but a macro or inline function in the API expands to a form containing the symbol, then the macro or inline function is named in a comment to the right. */ #define NOT_C_CODE #include <config.h> #if defined (ERROR_CHECK_TYPES) && defined (XEMACS_DEFS_NEEDS_INLINE_DECLS) #define XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS #endif NAME xemacs.exe EXPORTS /* Exported functions */ acons #ifdef NEW_GC alloc_lrecord /* ALLOC_LISP_OBJECT */ alloc_sized_lrecord /* ALLOC_SIZED_LISP_OBJECT */ lrecord_subr /* DEFSUBR */ lrecord_symbol_value_forward /* DEFVAR_SYMVAL_FWD */ #ifdef DEBUG_XEMACS mcpro_1 /* mcpro */ #endif mc_alloc /* DEFSUBR */ #else /* not NEW_GC */ alloc_automanaged_lcrecord /* ALLOC_LISP_OBJECT */ old_alloc_sized_lcrecord /* ALLOC_SIZED_LISP_OBJECT */ #endif /* not NEW_GC */ apply1 #ifdef USE_ASSERTIONS assert_failed /* abort(), assert(), etc. */ #endif build_extstring build_istring build_cistring build_ascstring build_msg_istring build_msg_cistring build_msg_ascstring #ifdef MULE bytecount_to_charcount_fun /* bytecount_to_charcount */ #endif call0 call1 call2 call3 call4 call5 call6 call7 call8 #ifdef MULE charcount_to_bytecount_fun /* charcount_to_bytecount */ #endif check_quit /* QUITP */ check_what_happened /* QUIT */ concat2 concat3 cons3 copy_lisp_object dead_wrong_type_argument /* CHECK_xxx */ #ifdef DEBUG_GCPRO debug_gcpro1 /* GCPRO1 */ debug_gcpro2 /* GCPRO2 */ debug_gcpro3 /* GCPRO3 */ debug_gcpro4 /* GCPRO4 */ debug_gcpro5 /* GCPRO5 */ debug_ungcpro /* UNGCPRO */ #endif deferror deferror_massage_name /* DEFERROR */ deferror_massage_name_and_message /* DEFERROR_STANDARD */ defkeyword defkeyword_massage_name /* DEFKEYWORD */ defsubr /* DEFSUBR */ defsubr_macro /* DEFSUBR_MACRO */ defsymbol defsymbol_nodump /* == defsymbol in modules */ defsymbol_massage_multiword_predicate /* DEFSYMBOL_MULTIWORD_PREDICATE */ defsymbol_massage_multiword_predicate_nodump /* DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP */ defsymbol_massage_name /* DEFSYMBOL */ defsymbol_massage_name_nodump /* DEFSYMBOL_NO_DUMP == DEFSYMBOL in modules */ defvar_magic /* DEFVAR_LISP, DEFVAR_INT, ... */ dfc_coding_system_is_unicode /* TO_INTERNAL_FORMAT */ dfc_convert_to_external_format /* TO_EXTERNAL_FORMAT */ dfc_convert_to_internal_format /* TO_INTERNAL_FORMAT */ egetenv #ifndef EMODULES_GATHER_VERSION emodules_doc_subr /* CDOCSUBR */ emodules_doc_sym /* CDOCSYM */ #endif eputenv #ifdef DEBUG_XEMACS eq_with_ebola_notice /* EQ_WITH_EBOLA_NOTICE */ #endif #ifdef XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS error_check_cons #ifdef HAVE_LDAP error_check_ldap #endif error_check_opaque_ptr #ifdef HAVE_POSTGRESQL error_check_pgconn error_check_pgresult #endif error_check_string #ifdef NEW_GC error_check_string_direct_data error_check_string_indirect_data #endif error_check_symbol_value_forward #endif /* XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS */ free_opaque_ptr get_coding_system_for_text_file intern invalid_argument invalid_argument_2 invalid_constant invalid_operation invalid_operation_2 list1 list2 list3 list4 list5 list6 make_extstring make_float make_opaque_ptr make_string make_vector maybe_invalid_operation message nconc2 new_dfc_convert_copy_data /* C_STRING_TO_EXTERNAL, ... */ new_dfc_convert_malloc /* C_STRING_TO_EXTERNAL_MALLOC, ... */ new_dfc_convert_size /* C_STRING_TO_EXTERNAL, ... */ #ifdef MULE non_ascii_itext_copy_ichar /* itext_copy_ichar */ non_ascii_itext_ichar /* itext_ichar */ non_ascii_set_itext_ichar /* set_itext_ichar */ non_ascii_valid_ichar_p /* valid_ichar_p */ #endif out_of_memory /* The postgresql module uses this */ printing_unreadable_lisp_object printing_unreadable_object_fmt #ifdef XEMACS_DEFS_NEEDS_INLINE_DECLS qxestrdup qxestrlen qxestrcharlen qxestrcmp qxestrcmp_ascii qxestrncmp qxestrncmp_ascii qxestrcpy qxestrcpy_ascii qxestrncpy qxestrncpy_ascii qxestrcat qxestrcat_ascii qxestrncat qxestrncat_ascii qxestrchr qxestrrchr qxestrstr qxestrcspn qxestrspn qxestrpbrk qxestrtok qxestrtod qxestrtol qxestrtoul qxeatoi qxestrupr qxestrlwr qxesprintf qxesscanf_ascii_1 #endif /* XEMACS_DEFS_NEEDS_INLINE_DECLS */ record_unwind_protect record_unwind_protect_freeing report_process_error signal_circular_list_error /* EXTERNAL_LIST_LOOP* */ signal_circular_property_list_error /* EXTERNAL_PROPERTY_LIST_LOOP* */ signal_error signal_ferror signal_malformed_list_error /* EXTERNAL_LIST_LOOP* */ signal_malformed_property_list_error /* EXTERNAL_PROPERTY_LIST_LOOP* */ signal_quit /* QUIT */ slow_down_interrupts speed_up_interrupts #ifndef DEBUG_XEMACS staticpro staticpro_nodump #else staticpro_1 staticpro_nodump_1 #endif unbind_to_1 /* unbind_to */ #ifndef DEBUG_XEMACS unstaticpro_nodump #else unstaticpro_nodump_1 #endif vconcat2 vconcat3 vector1 vector2 vector3 warn_when_safe #ifdef XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS wrap_record_1 #endif write_cistring write_fmt_string write_fmt_string_lisp write_istring write_ascstring wrong_type_argument /* CONCHECK_xxx */ xemacs_c_alloca /* ALLOCA */ xfree_1 /* xfree */ xmalloc xmalloc_and_zero xrealloc xstrdup Dynarr_delete_many /* Dynarr_delete, Dynarr_delete_object, ... */ Dynarr_free Dynarr_insert_many /* Dynarr_add_{literal,lisp}_string */ Dynarr_newf /* Dynarr_new, Dynarr_new2 */ Dynarr_resize /* Dynarr_add */ Fappend Fapply Fbuffer_modified_p Fbuffer_name Fcall_with_condition_handler Fcons Fcurrent_buffer Fequal Feval Fexpand_abbrev Ffuncall Fget Fkill_buffer Flength Flist Fmake_list Fmake_string Fmake_symbol Fmake_vector Fnreverse Fprovide Fput Freverse Fset_buffer Fsignal Fthrow Fvector #ifdef XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS XINT_1 #endif /* Exported variables */ __temp_alloca_size__ /* ALLOCA */ #ifdef DEBUG_XEMACS debug_issue_ebola_notices /* EQ_WITH_EBOLA_NOTICE */ #endif dont_check_for_quit /* QUITP, QUIT */ gcprolist /* GCPRO1, GCPRO2, ... */ initialized /* LOADHIST_ATTACH */ lrecord_cons /* CONSP */ lrecord_implementations_table /* RECORD_DUMPABLE */ lrecord_marker /* MARKERP */ #ifdef USE_KKCC lrecord_memory_descriptions /* INIT_LRECORD_IMPLEMENTATION */ #else lrecord_markers /* INIT_LRECORD_IMPLEMENTATION */ #endif lrecord_string /* STRINGP */ lrecord_symbol /* SYMBOLP */ lrecord_type_count /* INIT_EXTERNAL_LRECORD_IMPLEMENTATION */ lrecord_uid_counter need_to_check_c_alloca /* ALLOCA */ print_readably quit_check_signal_happened /* QUITP */ #ifdef ERROR_CHECK_MALLOC regex_malloc_disallowed /* REGEX_MALLOC_CHECK */ #endif #ifdef MULE rep_bytes_by_first_byte /* itext_ichar_len, INC_IBYTEPTR, ... */ #endif something_happened /* QUIT */ specpdl_depth_counter /* specpdl_depth */ Qconsp /* CHECK_CONS */ Qcritical /* QUIT, QUITP */ Qdelete Qfile_name /* Qdll_filename_encoding */ Qintegerp /* CHECK_INT, CONCHECK_INT */ Qinvalid_argument Qnative Qnil Qnotice #ifdef USE_UNION_TYPE Qnull_pointer /* DEFVAR_xxx */ #endif Qprocess_error Qsearch Qsimple Qstringp /* CHECK_STRING */ Qsymbolp /* CHECK_SYMBOL */ Qsyntax_error Qt Qunbound #ifdef USE_UNION_TYPE Qzero /* ZEROP */ #endif Vinhibit_quit /* QUIT, QUITP */ Vquit_flag /* QUIT, QUITP */