comparison src/symsinit.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 cf900a2f1fa3
children 97eb4942aec8 14fda1dbdb26
comparison
equal deleted inserted replaced
5169:6c6d78781d59 5170:5ddbab03b0e6
207 /* Initialize dynamic properties of objects (i.e. those properties not 207 /* Initialize dynamic properties of objects (i.e. those properties not
208 initialized statically through a DEFINE_*_LISP_OBJECT declaration). 208 initialized statically through a DEFINE_*_LISP_OBJECT declaration).
209 Dump time and post-pdump-load-time. */ 209 Dump time and post-pdump-load-time. */
210 210
211 void buffer_objects_create (void); 211 void buffer_objects_create (void);
212 void casetab_objects_create (void);
212 void extent_objects_create (void); 213 void extent_objects_create (void);
213 void face_objects_create (void); 214 void face_objects_create (void);
214 void frame_objects_create (void); 215 void frame_objects_create (void);
215 void glyph_objects_create (void); 216 void glyph_objects_create (void);
216 void hash_table_objects_create (void); 217 void hash_table_objects_create (void);
217 void lstream_objects_create (void); 218 void lstream_objects_create (void);
218 void mule_charset_objects_create (void); 219 void mule_charset_objects_create (void);
220 void scrollbar_objects_create (void);
219 void ui_gtk_objects_create (void); 221 void ui_gtk_objects_create (void);
220 void window_objects_create (void); 222 void window_objects_create (void);
221 223
222 /* Initialize the console types (dump-time only for console_type_(), 224 /* Initialize the console types (dump-time only for console_type_(),
223 post-pdump-load-time only for reinit_). */ 225 post-pdump-load-time only for reinit_). */
352 void reinit_vars_of_buffer (void); 354 void reinit_vars_of_buffer (void);
353 void vars_of_bytecode (void); 355 void vars_of_bytecode (void);
354 void reinit_vars_of_bytecode (void); 356 void reinit_vars_of_bytecode (void);
355 void vars_of_callint (void); 357 void vars_of_callint (void);
356 EXTERN_C void vars_of_canna_api (void); 358 EXTERN_C void vars_of_canna_api (void);
359 void vars_of_casetab (void);
357 void vars_of_chartab (void); 360 void vars_of_chartab (void);
358 void vars_of_cmdloop (void); 361 void vars_of_cmdloop (void);
359 void vars_of_cmds (void); 362 void vars_of_cmds (void);
360 void vars_of_console (void); 363 void vars_of_console (void);
361 void reinit_vars_of_console (void); 364 void reinit_vars_of_console (void);