Mercurial > hg > xemacs-beta
annotate netinstall/main.cc @ 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 /* OK, here's how this works. Each of the steps needed for install - | |
| 17 dialogs, downloads, installs - are in their own files and have some | |
| 18 "do_*" function (prototype in dialog.h) and a resource id (IDD_* or | |
| 19 IDD_S_* in resource.h) for that step. Each step is responsible for | |
| 20 selecting the next step! See the NEXT macro in dialog.h. Note | |
| 21 that the IDD_S_* ids are fake; those are for steps that don't | |
| 22 really have a controlling dialog (some have progress dialogs, but | |
| 23 those don't count, although they could). Replace the IDD_S_* with | |
| 24 IDD_* if you create a real dialog for those steps. */ | |
| 25 | |
| 26 #include "win32.h" | |
| 27 | |
| 28 #include <stdio.h> | |
| 29 #include <stdlib.h> | |
| 30 #include "resource.h" | |
| 31 #include "dialog.h" | |
| 32 #include "state.h" | |
| 33 #include "msg.h" | |
| 34 #include "netio.h" | |
| 35 #include "find.h" | |
| 36 #include "log.h" | |
| 37 | |
| 38 #include "port.h" | |
| 39 | |
| 40 void netio_test (char *); | |
| 41 | |
| 42 int next_dialog; | |
| 43 int exit_msg = 0; | |
| 44 | |
| 45 HINSTANCE hinstance; | |
| 46 | |
| 47 int WINAPI | |
| 48 WinMain (HINSTANCE h, | |
| 49 HINSTANCE hPrevInstance, | |
| 50 LPSTR command_line, | |
| 51 int cmd_show) | |
| 52 { | |
| 53 hinstance = h; | |
| 657 | 54 int pos = -1; |
| 55 if ((pos = strcspn(command_line, "-")) >= 0 | |
| 56 && | |
| 57 command_line[pos+1] == 'u') | |
| 58 { | |
| 59 next_dialog = IDD_UNINSTALL; | |
| 60 log (LOG_TIMESTAMP, "Starting XEmacs uninstall"); | |
| 61 uninstall = 1; | |
| 62 } | |
| 63 else | |
| 64 { | |
| 65 next_dialog = IDD_SPLASH; | |
| 66 log (LOG_TIMESTAMP, "Starting XEmacs install"); | |
| 67 } | |
| 448 | 68 |
| 657 | 69 do_init(h); |
| 448 | 70 |
| 71 while (next_dialog) | |
| 72 { | |
| 73 switch (next_dialog) | |
| 74 { | |
| 75 case IDD_SPLASH: do_splash (h); break; | |
| 657 | 76 case IDD_UNINSTALL: do_uninstall (h); break; |
| 448 | 77 case IDD_SOURCE: do_source (h); break; |
| 78 case IDD_LOCAL_DIR: do_local_dir (h); break; | |
| 79 case IDD_ROOT: do_root (h); break; | |
| 80 case IDD_NET: do_net (h); break; | |
| 81 case IDD_SITE: do_site (h); break; | |
| 82 case IDD_OTHER_URL: do_other (h); break; | |
| 83 case IDD_S_LOAD_INI: do_ini (h); break; | |
| 84 case IDD_S_FROM_CWD: do_fromcwd (h); break; | |
| 85 case IDD_CHOOSE: do_choose (h); break; | |
| 86 case IDD_S_DOWNLOAD: do_download (h); break; | |
| 87 case IDD_S_INSTALL: do_install (h); break; | |
| 88 case IDD_DESKTOP: do_desktop (h); break; | |
| 89 case IDD_S_POSTINSTALL: do_postinstall (h); break; | |
| 90 | |
| 91 default: | |
| 92 next_dialog = 0; | |
| 93 break; | |
| 94 } | |
| 95 } | |
| 96 | |
| 97 exit_setup (0); | |
| 98 | |
| 99 return EXIT_SUCCESS; | |
| 100 } |