Mercurial > hg > xemacs-beta
annotate src/hash.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 | de9952d2ed18 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 1292 | 1 /* Copyright (C) 2003 Ben Wing. |
| 2 This file is part of XEmacs. | |
| 428 | 3 |
| 4 XEmacs is free software; you can redistribute it and/or modify it | |
| 5 under the terms of the GNU General Public License as published by the | |
| 6 Free Software Foundation; either version 2, or (at your option) any | |
| 7 later version. | |
| 8 | |
| 9 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 for more details. | |
| 13 | |
| 14 You should have received a copy of the GNU General Public License | |
| 15 along with XEmacs; see the file COPYING. If not, write to | |
| 16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 17 Boston, MA 02111-1307, USA. */ | |
| 18 | |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 440 | 21 #ifndef INCLUDED_hash_h_ |
| 22 #define INCLUDED_hash_h_ | |
| 428 | 23 |
| 24 typedef struct | |
| 25 { | |
| 442 | 26 const void *key; |
| 428 | 27 void *contents; |
| 28 } hentry; | |
| 29 | |
| 442 | 30 typedef int (*hash_table_test_function) (const void *, const void *); |
| 665 | 31 typedef Hashcode (*hash_table_hash_function) (const void *); |
| 428 | 32 |
| 33 struct hash_table | |
| 34 { | |
| 35 hentry *harray; | |
| 36 long zero_set; | |
| 37 void *zero_entry; | |
| 665 | 38 Elemcount size; /* size of the hasharray */ |
| 39 Elemcount fullness; /* number of entries in the hash table */ | |
| 428 | 40 hash_table_hash_function hash_function; |
| 41 hash_table_test_function test_function; | |
| 42 }; | |
| 43 | |
| 44 /* SIZE is the number of initial entries. The hash table will be grown | |
| 45 automatically if the number of entries approaches the size */ | |
| 665 | 46 struct hash_table *make_hash_table (Elemcount size); |
| 428 | 47 |
| 2515 | 48 struct hash_table *make_string_hash_table (Elemcount size); |
| 49 | |
| 826 | 50 struct hash_table *make_general_hash_table (Elemcount size, |
| 51 hash_table_hash_function | |
| 52 hash_function, | |
| 53 hash_table_test_function | |
| 54 test_function); | |
| 428 | 55 |
| 56 /* Clear HASH-TABLE. A freshly created hash table is already cleared up. */ | |
| 57 void clrhash (struct hash_table *hash_table); | |
| 58 | |
| 59 /* Free HASH-TABLE and its substructures */ | |
| 60 void free_hash_table (struct hash_table *hash_table); | |
| 61 | |
| 62 /* Returns a hentry whose key is 0 if the entry does not exist in HASH-TABLE */ | |
| 442 | 63 const void *gethash (const void *key, struct hash_table *hash_table, |
| 64 const void **ret_value); | |
| 428 | 65 |
| 66 /* KEY should be different from 0 */ | |
| 442 | 67 void puthash (const void *key, void *contents, struct hash_table *hash_table); |
| 428 | 68 |
| 69 /* delete the entry with key KEY */ | |
| 442 | 70 void remhash (const void *key, struct hash_table *hash_table); |
| 428 | 71 |
| 442 | 72 typedef int (*maphash_function) (const void* key, void* contents, void* arg); |
| 428 | 73 |
| 442 | 74 typedef int (*remhash_predicate) (const void* key, const void* contents, |
| 428 | 75 void* arg); |
| 76 | |
| 77 /* Call MF (key, contents, arg) for every entry in HASH-TABLE */ | |
| 78 void maphash (maphash_function mf, struct hash_table *hash_table, void* arg); | |
| 79 | |
| 80 /* Delete all objects from HASH-TABLE satisfying PREDICATE */ | |
| 81 void map_remhash (remhash_predicate predicate, | |
| 82 struct hash_table *hash_table, void *arg); | |
| 83 | |
| 1292 | 84 /* Grow the table if it has less than BREATHING_ROOM elements that can be |
| 85 added before a resize will be triggered. After the grow, the table can | |
| 86 hold at least BREATHING_ROOM elements (and probably a lot more) before | |
| 87 needing resizing again. */ | |
| 88 void pregrow_hash_table_if_necessary (struct hash_table *hash_table, | |
| 89 Elemcount breathing_room); | |
| 440 | 90 #endif /* INCLUDED_hash_h_ */ |