Mercurial > hg > xemacs-beta
view netinstall/resource.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 | 943eaba38521 |
children |
line wrap: on
line source
//{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by res.rc // #define IDS_ROOT_SLASH 1 #define IDS_ROOT_SPACE 2 #define IDS_CWD_NONEMPTY 3 #define IDS_MIRROR_LST 6 #define IDS_DIALOG_FAILED 7 #define IDS_CYGWIN_FUNC_MISSING 8 #define IDS_DOWNLOAD_SHORT 9 #define IDS_ERR_OPEN_WRITE 10 #define IDS_SETUPINI_MISSING 11 #define IDS_OLD_SETUPINI 12 #define IDS_ERR_RENAME 13 #define IDS_NOTHING_INSTALLED 14 #define IDS_INSTALL_COMPLETE 15 #define IDS_ERR_OPEN_READ 16 #define IDS_ROOT_ABSOLUTE 17 #define IDS_DOWNLOAD_COMPLETE 18 #define IDS_CVSID 19 #define IDS_NOLOGFILE 20 #define IDS_UNINSTALL_COMPLETE 21 #define IDS_WININET 22 #define IDS_ERR_CHDIR 23 #define IDS_OLD_SETUP_VERSION 24 #define IDS_DOWNLOAD_FAILED 25 #define IDS_DOWNLOAD_INCOMPLETE 26 #define IDS_INSTALL_INCOMPLETE 27 #define IDS_ROOT_NOCYGWIN 28 #define IDS_CREATE_DIR 29 #define IDD_ROOT 101 #define IDD_SOURCE 102 #define IDD_OTHER_URL 103 #define IDD_SITE 104 #define IDD_NET 105 #define IDD_DLSTATUS 106 #define IDD_S_LOAD_INI 107 #define IDD_S_FROM_CWD 108 #define IDD_CHOOSE 109 #define IDD_S_DOWNLOAD 110 #define IDD_S_INSTALL 111 #define IDD_INSTATUS 112 #define IDD_DESKTOP 113 #define IDD_PROXY_AUTH 114 #define IDD_S_POSTINSTALL 115 #define IDD_NET_AUTH 116 #define IDD_SPLASH 117 #define IDB_SPIN 118 #define IDB_RTARROW 119 #define IDI_SPIN 120 #define IDI_XEMACS 121 #define IDD_LOCAL_DIR 122 #define IDB_CHECK_YES 123 #define IDB_CHECK_NO 124 #define IDB_CHECK_NA 125 #define IDB_GNU 126 #define IDD_UNINSTALL 127 #define IDC_SOURCE_DOWNLOAD 1000 #define IDC_SOURCE_NETINST 1001 #define IDC_SOURCE_CWD 1002 #define IDC_ROOT_DIR 1003 #define IDC_ROOT_BROWSE 1004 #define IDC_ROOT_TEXT 1005 #define IDC_ROOT_BINARY 1006 #define IDC_URL_LIST 1007 #define IDC_SITE_NEXT 1008 #define IDC_BACK 1009 #define IDC_OTHER_URL 1010 #define IDC_NET_IE5 1011 #define IDC_NET_DIRECT 1012 #define IDC_NET_PROXY 1013 #define IDC_PROXY_HOST 1014 #define IDC_PROXY_PORT 1015 #define IDC_PROXY_USER 1016 #define IDC_DLS_PROGRESS 1019 #define IDC_DLS_URL 1020 #define IDC_DLS_RATE 1021 #define IDC_INS_PKG 1022 #define IDC_INS_FILE 1023 #define IDC_INS_DISKFULL 1024 #define IDC_INS_IPROGRESS 1025 #define IDC_INS_PPROGRESS 1026 #define IDC_ROOT_SYSTEM 1028 #define IDC_ROOT_USER 1029 #define IDC_NET_USER 1030 #define IDC_NET_PASSWD 1031 #define IDC_VERSION 1033 #define IDC_LISTVIEW_POS 1034 #define IDC_CHOOSE_FULLPART 1035 #define IDC_CHOOSE_EXP 1036 #define IDC_CHOOSE_CURR 1037 #define IDC_CHOOSE_PREV 1038 #define IDC_CHOOSE_LIST 1039 #define IDC_INS_ACTION 1040 #define IDC_ROOT_DESKTOP 1041 #define IDC_ROOT_MENU 1042 #define IDC_LOCAL_DIR_BROWSE 1043 #define IDC_TXT_TYPE 1043 #define IDC_LOCAL_DIR 1044 #define IDC_JAVA_TYPE 1044 #define IDC_INSTALL_NATIVE 1045 #define IDC_C_TYPE 1045 #define IDC_INSTALL_CYGWIN 1046 #define IDC_CPP_TYPE 1046 #define IDC_UNINS_PKG 1047 #define IDC_ELISP_TYPE 1047 #define IDC_UNINS_FILE 1048 #define IDC_IDL_TYPE 1048 #define IDC_UNINS_DISKFULL 1049 #define IDC_UNINS_IPROGRESS 1050 #define IDC_UNINS_PPROGRESS 1051 #define IDC_UNINS_ACTION 1052 #define IDC_STATIC -1 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 127 #define _APS_NEXT_COMMAND_VALUE 40003 #define _APS_NEXT_CONTROL_VALUE 1050 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif