Mercurial > hg > xemacs-beta
annotate netinstall/hash.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 | 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 } |