Mercurial > hg > xemacs-beta
annotate netinstall/dialog.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 | ce0b3f2eff35 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* global instance for the application; set in main.cc */ | |
| 17 extern HINSTANCE hinstance; | |
| 18 | |
| 19 /* used by main.cc to select the next do_* function */ | |
| 20 extern int next_dialog; | |
| 21 | |
| 22 /* either "nothing to do" or "setup complete" or something like that */ | |
| 23 extern int exit_msg; | |
| 24 | |
| 25 #define D(x) void x(HINSTANCE _h) | |
| 26 | |
| 27 /* prototypes for all the do_* functions (most called by main.cc) */ | |
| 28 | |
| 29 D(do_choose); | |
| 30 D(do_desktop); | |
| 31 D(do_download); | |
| 32 D(do_fromcwd); | |
| 33 D(do_ini); | |
| 657 | 34 D(do_init); |
| 448 | 35 D(do_install); |
| 36 D(do_local_dir); | |
| 37 D(do_net); | |
| 38 D(do_other); | |
| 39 D(do_postinstall); | |
| 657 | 40 D(do_uninstall); |
| 448 | 41 D(do_root); |
| 42 D(do_site); | |
| 43 D(do_source); | |
| 44 D(do_splash); | |
| 45 | |
| 46 #undef D | |
| 47 | |
| 48 /* end this dialog and select the next. Pass 0 to exit the program */ | |
| 49 #define NEXT(id) EndDialog((HWND)h, 0), next_dialog = id | |
| 50 | |
| 51 /* Get the value of an EditText control. Pass the previously stored | |
| 52 value and it will free the memory if needed. */ | |
| 53 | |
| 54 char *eget (HWND h, int id, char *var); | |
| 55 | |
| 56 /* Same, but convert the value to an integer */ | |
| 57 | |
| 58 int eget (HWND h, int id); | |
| 59 | |
| 60 /* Set the EditText control to the given string or integer */ | |
| 61 | |
| 62 void eset (HWND h, int id, char *var); | |
| 63 void eset (HWND h, int id, int var); | |
| 64 | |
| 65 /* RadioButtons. ids is a null-terminated list of IDs. Get | |
| 66 returns the selected ID (or zero), pass an ID to set */ | |
| 67 | |
| 68 int rbget (HWND h, int *ids); | |
| 69 void rbset (HWND h, int *ids, int id); | |
| 70 | |
| 71 /* *This* version of fatal (compare with msg.h) uses GetLastError() to | |
| 72 format a suitable error message. Similar to perror() */ | |
| 73 | |
| 74 void fatal (char *msg); |