Mercurial > hg > xemacs-beta
annotate netinstall/hash.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 |
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 /* Simple hash class for install.cc */ | |
17 | |
18 #include "win32.h" | |
19 #include <stdlib.h> | |
20 #include <string.h> | |
21 | |
22 #include "hash.h" | |
23 | |
24 class hash_internals { | |
25 public: | |
26 char **keys; | |
27 int numkeys; | |
28 int maxkeys; | |
29 int prev_index; | |
30 }; | |
31 | |
32 hash::hash () | |
33 { | |
34 h = new hash_internals; | |
35 h->numkeys = 0; | |
36 h->maxkeys = 10; | |
37 h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); | |
38 h->prev_index = 0; | |
39 } | |
40 | |
41 hash::~hash () | |
42 { | |
43 free (h->keys); | |
44 free (h); | |
45 } | |
46 | |
47 | |
48 void | |
49 hash::add (char *string) | |
50 { | |
51 int i; | |
52 for (i=0; i<h->numkeys; i++) | |
53 if (strcmp (h->keys[i], string) == 0) | |
54 return; | |
55 if (h->numkeys >= h->maxkeys) | |
56 { | |
57 h->maxkeys += 10; | |
58 h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); | |
59 } | |
60 | |
61 h->keys[h->numkeys] = _strdup (string); | |
62 h->numkeys ++; | |
63 } | |
64 | |
65 | |
66 int | |
67 hash::has (char *string) | |
68 { | |
69 int i; | |
70 for (i=0; i<h->numkeys; i++) | |
71 if (strcmp (h->keys[i], string) == 0) | |
72 return 1; | |
73 return 0; | |
74 } | |
75 | |
76 char * | |
77 hash::enumerate (char *prev) | |
78 { | |
79 if (prev == 0) | |
80 h->prev_index = -1; | |
81 h->prev_index ++; | |
82 if (h->prev_index >= h->numkeys) | |
83 return 0; | |
84 return h->keys[h->prev_index]; | |
85 } | |
86 | |
87 static int CDECL | |
88 rev_len (const void *va, const void *vb) | |
89 { | |
90 char *a = *(char **)va; | |
91 char *b = *(char **)vb; | |
92 return strcmp (b, a); | |
93 } | |
94 | |
95 void | |
96 hash::reverse_sort () | |
97 { | |
98 qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); | |
99 } |