Mercurial > hg > xemacs-beta
annotate src/elhash.h @ 5167:e374ea766cc1
clean up, rearrange allocation statistics code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-21 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (assert_proper_sizing):
* alloc.c (c_readonly):
* alloc.c (malloced_storage_size):
* alloc.c (fixed_type_block_overhead):
* alloc.c (lisp_object_storage_size):
* alloc.c (inc_lrecord_stats):
* alloc.c (dec_lrecord_stats):
* alloc.c (pluralize_word):
* alloc.c (object_memory_usage_stats):
* alloc.c (Fobject_memory_usage):
* alloc.c (compute_memusage_stats_length):
* alloc.c (disksave_object_finalization_1):
* alloc.c (Fgarbage_collect):
* mc-alloc.c:
* mc-alloc.c (mc_alloced_storage_size):
* mc-alloc.h:
No functionality change here. Collect the allocations-statistics
code that was scattered throughout alloc.c into one place. Add
remaining section headings so that all sections have headings
clearly identifying the start of the section and its purpose.
Expose mc_alloced_storage_size() even when not MEMORY_USAGE_STATS;
this fixes build problems and is related to the export of
lisp_object_storage_size() and malloced_storage_size() when
non-MEMORY_USAGE_STATS in the previous change set.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 21 Mar 2010 04:41:49 -0500 |
| parents | a9c41067dd88 |
| children | 71ee43b8a74d |
| rev | line source |
|---|---|
| 428 | 1 /* Lisp interface to hash tables -- include file. |
| 2 Copyright (C) 1995, 1996 Ben Wing. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_elhash_h_ |
| 24 #define INCLUDED_elhash_h_ | |
| 428 | 25 |
| 440 | 26 typedef struct Lisp_Hash_Table Lisp_Hash_Table; |
| 428 | 27 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4072
diff
changeset
|
28 DECLARE_LISP_OBJECT (hash_table, Lisp_Hash_Table); |
| 440 | 29 |
| 30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) | |
| 617 | 31 #define wrap_hash_table(p) wrap_record (p, hash_table) |
| 428 | 32 #define HASH_TABLEP(x) RECORDP (x, hash_table) |
| 33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) | |
| 34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) | |
| 35 | |
| 4072 | 36 typedef struct htentry |
| 37 { | |
| 3092 | 38 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
39 NORMAL_LISP_OBJECT_HEADER lheader; |
| 4072 | 40 #endif /* NEW_GC */ |
| 41 Lisp_Object key; | |
| 42 Lisp_Object value; | |
| 43 } htentry; | |
| 44 | |
| 45 #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) | |
| 46 | |
| 47 #ifdef NEW_GC | |
| 48 | |
| 3092 | 49 typedef struct htentry Lisp_Hash_Table_Entry; |
| 50 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4072
diff
changeset
|
51 DECLARE_LISP_OBJECT (hash_table_entry, Lisp_Hash_Table_Entry); |
| 3092 | 52 |
| 53 #define XHASH_TABLE_ENTRY(x) \ | |
| 54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) | |
| 55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) | |
| 56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) | |
| 57 #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) | |
| 58 #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) | |
| 59 #endif /* NEW_GC */ | |
| 60 | |
| 428 | 61 enum hash_table_weakness |
| 62 { | |
| 63 HASH_TABLE_NON_WEAK, | |
| 64 HASH_TABLE_KEY_WEAK, | |
| 65 HASH_TABLE_VALUE_WEAK, | |
| 442 | 66 HASH_TABLE_KEY_VALUE_WEAK, |
| 428 | 67 HASH_TABLE_KEY_CAR_WEAK, |
| 68 HASH_TABLE_VALUE_CAR_WEAK, | |
| 450 | 69 HASH_TABLE_KEY_CAR_VALUE_WEAK, |
| 428 | 70 HASH_TABLE_WEAK |
| 71 }; | |
| 72 | |
| 73 enum hash_table_test | |
| 74 { | |
| 75 HASH_TABLE_EQ, | |
| 76 HASH_TABLE_EQL, | |
| 77 HASH_TABLE_EQUAL | |
| 78 }; | |
| 79 | |
| 1204 | 80 extern const struct memory_description hash_table_description[]; |
| 428 | 81 |
| 82 EXFUN (Fcopy_hash_table, 1); | |
| 83 EXFUN (Fhash_table_count, 1); | |
| 84 EXFUN (Fgethash, 3); | |
| 85 EXFUN (Fputhash, 3); | |
| 86 EXFUN (Fremhash, 2); | |
| 87 EXFUN (Fclrhash, 1); | |
| 88 | |
| 89 typedef int (*hash_table_test_function_t) (Lisp_Object obj1, Lisp_Object obj2); | |
| 2515 | 90 typedef Hashcode (*hash_table_hash_function_t) (Lisp_Object obj); |
| 428 | 91 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, |
| 92 void* extra_arg); | |
| 93 | |
| 450 | 94 Lisp_Object make_standard_lisp_hash_table (enum hash_table_test test, |
| 665 | 95 Elemcount size, |
| 450 | 96 double rehash_size, |
| 97 double rehash_threshold, | |
| 98 enum hash_table_weakness weakness); | |
| 99 | |
| 100 Lisp_Object make_general_lisp_hash_table (hash_table_hash_function_t hash_function, | |
| 101 hash_table_test_function_t test_function, | |
| 665 | 102 Elemcount size, |
| 428 | 103 double rehash_size, |
| 104 double rehash_threshold, | |
| 105 enum hash_table_weakness weakness); | |
| 106 | |
| 665 | 107 Lisp_Object make_lisp_hash_table (Elemcount size, |
| 428 | 108 enum hash_table_weakness weakness, |
| 109 enum hash_table_test test); | |
| 110 | |
| 111 void elisp_maphash (maphash_function_t function, | |
| 112 Lisp_Object hash_table, void *extra_arg); | |
| 113 | |
| 489 | 114 void elisp_maphash_unsafe (maphash_function_t function, |
| 115 Lisp_Object hash_table, void *extra_arg); | |
| 116 | |
| 428 | 117 void elisp_map_remhash (maphash_function_t predicate, |
| 118 Lisp_Object hash_table, void *extra_arg); | |
| 119 | |
| 120 int finish_marking_weak_hash_tables (void); | |
| 121 void prune_weak_hash_tables (void); | |
| 122 | |
| 440 | 123 void pdump_reorganize_hash_table (Lisp_Object); |
| 428 | 124 |
| 2421 | 125 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); |
| 126 | |
| 4072 | 127 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); |
| 128 | |
| 440 | 129 #endif /* INCLUDED_elhash_h_ */ |