annotate netinstall/dialog.cc @ 5160:ab9ee10a53e4

fix various problems with allocation statistics, track overhead properly -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-20 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 showing the overhead used with each type, and add it into the grand total memory usage. src/ChangeLog addition: 2010-03-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (init_lrecord_stats): * alloc.c (free_normal_lisp_object): * alloc.c (struct): * alloc.c (clear_lrecord_stats): * alloc.c (tick_lrecord_stats): * alloc.c (COUNT_FROB_BLOCK_USAGE): * alloc.c (COPY_INTO_LRECORD_STATS): * alloc.c (sweep_strings): * alloc.c (UNMARK_string): * alloc.c (gc_sweep_1): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (object_dead_p): * alloc.c (fixed_type_block_overhead): * alloc.c (lisp_object_storage_size): * emacs.c (main_1): * lisp.h: * lrecord.h: Export lisp_object_storage_size() and malloced_storage_size() even when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS build to compile. Don't export fixed_type_block_overhead() any more. Some code cleanup, rearrangement, add some section headers. Clean up various bugs especially involving computation of overhead and double-counting certain usage in total_gc_usage. Add statistics computing the overhead used by all types. Don't add a special entry for string headers in the object-memory-usage-stats because it's already present as just "string". But do count the overhead used by long strings. Don't try to call the memory_usage() methods when NEW_GC because there's nowhere obvious in the sweep stage to make the calls. * marker.c (compute_buffer_marker_usage): Just use lisp_object_storage_size() rather than trying to reimplement it.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Mar 2010 20:20:30 -0500
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* The purpose of this file is to provide common functionality for
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 all the dialogs in the program. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include "dialog.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include "msg.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 #include "log.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 eget (HWND h, int id, char *var)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 char tmp[4000];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 if (var)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 free (var);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 var = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 if (GetDlgItemText (h, id, tmp, sizeof (tmp)) > 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 var = (char *) malloc (strlen (tmp)+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 strcpy (var, tmp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 return var;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 eget (HWND h, int id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 BOOL s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 int r = GetDlgItemInt (h, id, &s, TRUE);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 return r;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 eset (HWND h, int id, char *val)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 SetDlgItemText (h, id, val);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 eset (HWND h, int id, int val)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 SetDlgItemInt (h, id, (UINT)val, TRUE);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 rbget (HWND h, int *ids)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 for (i=0; ids[i]; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 if (IsDlgButtonChecked (h, ids[i]) == BST_CHECKED)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 return ids[i];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 rbset (HWND h, int *ids, int id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 for (i=0; ids[i]; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 CheckDlgButton (h, ids[i], id==ids[i] ? BST_CHECKED : BST_UNCHECKED);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 fatal (char *m)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 DWORD e = GetLastError ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 char *buf;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 e,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 (CHAR *)&buf,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 MessageBox (0, buf, m, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 exit_setup (1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 }