Mercurial > hg > xemacs-beta
annotate src/elhash.c @ 5120:d1247f3cc363 ben-lisp-object
latest work on lisp-object workspace;
more changes eliminating LCRECORD in place of LISP_OBJECT;
now compiles and runs.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 28 Dec 2009 01:15:52 -0600 |
| parents | e0db3c197671 |
| children | 623d57b7fbe8 |
| rev | line source |
|---|---|
| 428 | 1 /* Implementation of the hash table lisp object type. |
| 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 2421 | 3 Copyright (C) 1995, 1996, 2002, 2004 Ben Wing. |
| 428 | 4 Copyright (C) 1997 Free Software Foundation, Inc. |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCNTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 1292 | 25 /* Author: Lost in the mists of history. At least back to Lucid 19.3, |
| 26 circa Sep 1992. Early hash table implementation allowed only `eq' as a | |
| 27 test -- other tests possible only when these objects were created from | |
| 28 the C code. | |
| 29 | |
| 30 Expansion to allow general `equal'-test Lisp-creatable tables, and hash | |
| 31 methods for the various Lisp objects in existence at the time, added | |
| 32 during 19.12 I think (early 1995?), by Ben Wing. | |
| 33 | |
| 34 Weak hash tables added by Jamie (maybe?) early on, perhaps around 19.6, | |
| 35 maybe earlier; again, only possible through the C code, and only | |
| 36 supported fully weak hash tables. Expansion to other kinds of weakness, | |
| 37 and exporting of the interface to Lisp, by Ben Wing during 19.12 | |
| 38 (early-mid 1995) or maybe 19.13 cycle (mid 1995). | |
| 39 | |
| 40 Expansion to full Common Lisp spec and interface, redoing of the | |
| 41 implementation, by Martin Buchholz, 1997? (Former hash table | |
| 42 implementation used "double hashing", I'm pretty sure, and was weirdly | |
| 43 tied into the generic hash.c code. Martin completely separated them.) | |
| 44 */ | |
| 45 | |
| 489 | 46 /* This file implements the hash table lisp object type. |
| 47 | |
| 504 | 48 This implementation was mostly written by Martin Buchholz in 1997. |
| 49 | |
| 50 The Lisp-level API (derived from Common Lisp) is almost completely | |
| 51 compatible with GNU Emacs 21, even though the implementations are | |
| 52 totally independent. | |
| 53 | |
| 489 | 54 The hash table technique used is "linear probing". Collisions are |
| 55 resolved by putting the item in the next empty place in the array | |
| 56 following the collision. Finding a hash entry performs a linear | |
| 57 search in the cluster starting at the hash value. | |
| 58 | |
| 59 On deletions from the hash table, the entries immediately following | |
| 60 the deleted entry are re-entered in the hash table. We do not have | |
| 61 a special way to mark deleted entries (known as "tombstones"). | |
| 62 | |
| 63 At the end of the hash entries ("hentries"), we leave room for an | |
| 64 entry that is always empty (the "sentinel"). | |
| 65 | |
| 66 The traditional literature on hash table implementation | |
| 67 (e.g. Knuth) suggests that too much "primary clustering" occurs | |
| 68 with linear probing. However, this literature was written when | |
| 69 locality of reference was not a factor. The discrepancy between | |
| 70 CPU speeds and memory speeds is increasing, and the speed of access | |
| 71 to memory is highly dependent on memory caches which work best when | |
| 72 there is high locality of data reference. Random access to memory | |
| 73 is up to 20 times as expensive as access to the nearest address | |
| 74 (and getting worse). So linear probing makes sense. | |
| 75 | |
| 76 But the representation doesn't actually matter that much with the | |
| 77 current elisp engine. Funcall is sufficiently slow that the choice | |
| 78 of hash table implementation is noise. */ | |
| 79 | |
| 428 | 80 #include <config.h> |
| 81 #include "lisp.h" | |
| 82 #include "bytecode.h" | |
| 83 #include "elhash.h" | |
| 489 | 84 #include "opaque.h" |
| 428 | 85 |
| 86 Lisp_Object Qhash_tablep; | |
| 87 static Lisp_Object Qhashtable, Qhash_table; | |
| 442 | 88 static Lisp_Object Qweakness, Qvalue, Qkey_or_value, Qkey_and_value; |
| 428 | 89 static Lisp_Object Vall_weak_hash_tables; |
| 90 static Lisp_Object Qrehash_size, Qrehash_threshold; | |
| 91 static Lisp_Object Q_size, Q_test, Q_weakness, Q_rehash_size, Q_rehash_threshold; | |
| 92 | |
| 93 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 442 | 94 static Lisp_Object Qweak, Qkey_weak, Qvalue_weak, Qkey_or_value_weak; |
| 95 static Lisp_Object Qnon_weak, Q_type; | |
| 428 | 96 |
| 97 struct Lisp_Hash_Table | |
| 98 { | |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
99 LISP_OBJECT_HEADER header; |
| 665 | 100 Elemcount size; |
| 101 Elemcount count; | |
| 102 Elemcount rehash_count; | |
| 428 | 103 double rehash_size; |
| 104 double rehash_threshold; | |
| 665 | 105 Elemcount golden_ratio; |
| 428 | 106 hash_table_hash_function_t hash_function; |
| 107 hash_table_test_function_t test_function; | |
| 1204 | 108 htentry *hentries; |
| 428 | 109 enum hash_table_weakness weakness; |
| 110 Lisp_Object next_weak; /* Used to chain together all of the weak | |
| 111 hash tables. Don't mark through this. */ | |
| 112 }; | |
| 113 | |
| 1204 | 114 #define CLEAR_HTENTRY(htentry) \ |
| 115 ((*(EMACS_UINT*)(&((htentry)->key))) = 0, \ | |
| 116 (*(EMACS_UINT*)(&((htentry)->value))) = 0) | |
| 428 | 117 |
| 118 #define HASH_TABLE_DEFAULT_SIZE 16 | |
| 119 #define HASH_TABLE_DEFAULT_REHASH_SIZE 1.3 | |
| 120 #define HASH_TABLE_MIN_SIZE 10 | |
|
4778
0081fd36b783
Cast enumerations to int before comparing them for the sake of VC++.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4777
diff
changeset
|
121 #define HASH_TABLE_DEFAULT_REHASH_THRESHOLD(size, test_function) \ |
|
4779
fd98353950a4
Make my last change to elhash.c more kosher, comparing pointers not ints
Aidan Kehoe <kehoea@parhasard.net>
parents:
4778
diff
changeset
|
122 (((size) > 4096 && NULL == (test_function)) ? 0.7 : 0.6) |
| 428 | 123 |
| 665 | 124 #define HASHCODE(key, ht) \ |
| 444 | 125 ((((ht)->hash_function ? (ht)->hash_function (key) : LISP_HASH (key)) \ |
| 126 * (ht)->golden_ratio) \ | |
| 127 % (ht)->size) | |
| 428 | 128 |
| 129 #define KEYS_EQUAL_P(key1, key2, testfun) \ | |
| 434 | 130 (EQ (key1, key2) || ((testfun) && (testfun) (key1, key2))) |
| 428 | 131 |
| 132 #define LINEAR_PROBING_LOOP(probe, entries, size) \ | |
| 133 for (; \ | |
| 1204 | 134 !HTENTRY_CLEAR_P (probe) || \ |
| 428 | 135 (probe == entries + size ? \ |
| 1204 | 136 (probe = entries, !HTENTRY_CLEAR_P (probe)) : 0); \ |
| 428 | 137 probe++) |
| 138 | |
| 800 | 139 #ifdef ERROR_CHECK_STRUCTURES |
| 428 | 140 static void |
| 141 check_hash_table_invariants (Lisp_Hash_Table *ht) | |
| 142 { | |
| 143 assert (ht->count < ht->size); | |
| 144 assert (ht->count <= ht->rehash_count); | |
| 145 assert (ht->rehash_count < ht->size); | |
| 146 assert ((double) ht->count * ht->rehash_threshold - 1 <= (double) ht->rehash_count); | |
| 1204 | 147 assert (HTENTRY_CLEAR_P (ht->hentries + ht->size)); |
| 428 | 148 } |
| 149 #else | |
| 150 #define check_hash_table_invariants(ht) | |
| 151 #endif | |
| 152 | |
| 153 /* Return a suitable size for a hash table, with at least SIZE slots. */ | |
| 665 | 154 static Elemcount |
| 155 hash_table_size (Elemcount requested_size) | |
| 428 | 156 { |
| 157 /* Return some prime near, but greater than or equal to, SIZE. | |
| 158 Decades from the time of writing, someone will have a system large | |
| 159 enough that the list below will be too short... */ | |
| 665 | 160 static const Elemcount primes [] = |
| 428 | 161 { |
| 162 19, 29, 41, 59, 79, 107, 149, 197, 263, 347, 457, 599, 787, 1031, | |
| 163 1361, 1777, 2333, 3037, 3967, 5167, 6719, 8737, 11369, 14783, | |
| 164 19219, 24989, 32491, 42257, 54941, 71429, 92861, 120721, 156941, | |
| 165 204047, 265271, 344857, 448321, 582821, 757693, 985003, 1280519, | |
| 166 1664681, 2164111, 2813353, 3657361, 4754591, 6180989, 8035301, | |
| 167 10445899, 13579681, 17653589, 22949669, 29834603, 38784989, | |
| 168 50420551, 65546729, 85210757, 110774011, 144006217, 187208107, | |
| 169 243370577, 316381771, 411296309, 534685237, 695090819, 903618083, | |
| 647 | 170 1174703521, 1527114613, 1985248999 /* , 2580823717UL, 3355070839UL */ |
| 428 | 171 }; |
| 172 /* We've heard of binary search. */ | |
| 173 int low, high; | |
| 174 for (low = 0, high = countof (primes) - 1; high - low > 1;) | |
| 175 { | |
| 176 /* Loop Invariant: size < primes [high] */ | |
| 177 int mid = (low + high) / 2; | |
| 178 if (primes [mid] < requested_size) | |
| 179 low = mid; | |
| 180 else | |
| 181 high = mid; | |
| 182 } | |
| 183 return primes [high]; | |
| 184 } | |
| 185 | |
| 186 | |
| 187 #if 0 /* I don't think these are needed any more. | |
| 188 If using the general lisp_object_equal_*() functions | |
| 189 causes efficiency problems, these can be resurrected. --ben */ | |
| 190 /* equality and hash functions for Lisp strings */ | |
| 191 int | |
| 192 lisp_string_equal (Lisp_Object str1, Lisp_Object str2) | |
| 193 { | |
| 194 /* This is wrong anyway. You can't use strcmp() on Lisp strings, | |
| 195 because they can contain zero characters. */ | |
| 196 return !strcmp ((char *) XSTRING_DATA (str1), (char *) XSTRING_DATA (str2)); | |
| 197 } | |
| 198 | |
| 665 | 199 static Hashcode |
| 428 | 200 lisp_string_hash (Lisp_Object obj) |
| 201 { | |
| 202 return hash_string (XSTRING_DATA (str), XSTRING_LENGTH (str)); | |
| 203 } | |
| 204 | |
| 205 #endif /* 0 */ | |
| 206 | |
| 207 static int | |
| 208 lisp_object_eql_equal (Lisp_Object obj1, Lisp_Object obj2) | |
| 209 { | |
| 210 return EQ (obj1, obj2) || (FLOATP (obj1) && internal_equal (obj1, obj2, 0)); | |
| 211 } | |
| 212 | |
| 665 | 213 static Hashcode |
| 428 | 214 lisp_object_eql_hash (Lisp_Object obj) |
| 215 { | |
| 216 return FLOATP (obj) ? internal_hash (obj, 0) : LISP_HASH (obj); | |
| 217 } | |
| 218 | |
| 219 static int | |
| 220 lisp_object_equal_equal (Lisp_Object obj1, Lisp_Object obj2) | |
| 221 { | |
| 222 return internal_equal (obj1, obj2, 0); | |
| 223 } | |
| 224 | |
| 665 | 225 static Hashcode |
| 428 | 226 lisp_object_equal_hash (Lisp_Object obj) |
| 227 { | |
| 228 return internal_hash (obj, 0); | |
| 229 } | |
| 230 | |
| 231 | |
| 232 static Lisp_Object | |
| 233 mark_hash_table (Lisp_Object obj) | |
| 234 { | |
| 235 Lisp_Hash_Table *ht = XHASH_TABLE (obj); | |
| 236 | |
| 237 /* If the hash table is weak, we don't want to mark the keys and | |
| 238 values (we scan over them after everything else has been marked, | |
| 239 and mark or remove them as necessary). */ | |
| 240 if (ht->weakness == HASH_TABLE_NON_WEAK) | |
| 241 { | |
| 1204 | 242 htentry *e, *sentinel; |
| 428 | 243 |
| 244 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 245 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 246 { |
| 247 mark_object (e->key); | |
| 248 mark_object (e->value); | |
| 249 } | |
| 250 } | |
| 251 return Qnil; | |
| 252 } | |
| 253 | |
| 254 /* Equality of hash tables. Two hash tables are equal when they are of | |
| 255 the same weakness and test function, they have the same number of | |
| 256 elements, and for each key in the hash table, the values are `equal'. | |
| 257 | |
| 258 This is similar to Common Lisp `equalp' of hash tables, with the | |
| 259 difference that CL requires the keys to be compared with the test | |
| 260 function, which we don't do. Doing that would require consing, and | |
| 261 consing is a bad idea in `equal'. Anyway, our method should provide | |
| 262 the same result -- if the keys are not equal according to the test | |
| 263 function, then Fgethash() in hash_table_equal_mapper() will fail. */ | |
| 264 static int | |
| 265 hash_table_equal (Lisp_Object hash_table1, Lisp_Object hash_table2, int depth) | |
| 266 { | |
| 267 Lisp_Hash_Table *ht1 = XHASH_TABLE (hash_table1); | |
| 268 Lisp_Hash_Table *ht2 = XHASH_TABLE (hash_table2); | |
| 1204 | 269 htentry *e, *sentinel; |
| 428 | 270 |
| 271 if ((ht1->test_function != ht2->test_function) || | |
| 272 (ht1->weakness != ht2->weakness) || | |
| 273 (ht1->count != ht2->count)) | |
| 274 return 0; | |
| 275 | |
| 276 depth++; | |
| 277 | |
| 278 for (e = ht1->hentries, sentinel = e + ht1->size; e < sentinel; e++) | |
| 1204 | 279 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 280 /* Look up the key in the other hash table, and compare the values. */ |
| 281 { | |
| 282 Lisp_Object value_in_other = Fgethash (e->key, hash_table2, Qunbound); | |
| 283 if (UNBOUNDP (value_in_other) || | |
| 284 !internal_equal (e->value, value_in_other, depth)) | |
| 285 return 0; /* Give up */ | |
| 286 } | |
| 287 | |
| 288 return 1; | |
| 289 } | |
| 442 | 290 |
| 291 /* This is not a great hash function, but it _is_ correct and fast. | |
| 292 Examining all entries is too expensive, and examining a random | |
| 293 subset does not yield a correct hash function. */ | |
| 665 | 294 static Hashcode |
| 2286 | 295 hash_table_hash (Lisp_Object hash_table, int UNUSED (depth)) |
| 442 | 296 { |
| 297 return XHASH_TABLE (hash_table)->count; | |
| 298 } | |
| 299 | |
| 428 | 300 |
| 301 /* Printing hash tables. | |
| 302 | |
| 303 This is non-trivial, because we use a readable structure-style | |
| 304 syntax for hash tables. This means that a typical hash table will be | |
| 305 readably printed in the form of: | |
| 306 | |
| 307 #s(hash-table size 2 data (key1 value1 key2 value2)) | |
| 308 | |
| 309 The supported hash table structure keywords and their values are: | |
| 310 `test' (eql (or nil), eq or equal) | |
| 311 `size' (a natnum or nil) | |
| 312 `rehash-size' (a float) | |
| 313 `rehash-threshold' (a float) | |
| 442 | 314 `weakness' (nil, key, value, key-and-value, or key-or-value) |
| 428 | 315 `data' (a list) |
| 316 | |
| 430 | 317 If `print-readably' is nil, then a simpler syntax is used, for example |
| 428 | 318 |
| 319 #<hash-table size 2/13 data (key1 value1 key2 value2) 0x874d> | |
| 320 | |
| 321 The data is truncated to four pairs, and the rest is shown with | |
| 322 `...'. This printer does not cons. */ | |
| 323 | |
| 324 | |
| 325 /* Print the data of the hash table. This maps through a Lisp | |
| 326 hash table and prints key/value pairs using PRINTCHARFUN. */ | |
| 327 static void | |
| 328 print_hash_table_data (Lisp_Hash_Table *ht, Lisp_Object printcharfun) | |
| 329 { | |
| 330 int count = 0; | |
| 1204 | 331 htentry *e, *sentinel; |
| 428 | 332 |
| 826 | 333 write_c_string (printcharfun, " data ("); |
| 428 | 334 |
| 335 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 336 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 337 { |
| 338 if (count > 0) | |
| 826 | 339 write_c_string (printcharfun, " "); |
| 428 | 340 if (!print_readably && count > 3) |
| 341 { | |
| 826 | 342 write_c_string (printcharfun, "..."); |
| 428 | 343 break; |
| 344 } | |
| 345 print_internal (e->key, printcharfun, 1); | |
| 800 | 346 write_fmt_string_lisp (printcharfun, " %S", 1, e->value); |
| 428 | 347 count++; |
| 348 } | |
| 349 | |
| 826 | 350 write_c_string (printcharfun, ")"); |
| 428 | 351 } |
| 352 | |
| 353 static void | |
| 2286 | 354 print_hash_table (Lisp_Object obj, Lisp_Object printcharfun, |
| 355 int UNUSED (escapeflag)) | |
| 428 | 356 { |
| 357 Lisp_Hash_Table *ht = XHASH_TABLE (obj); | |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
358 Ascbyte pigbuf[350]; |
| 428 | 359 |
| 826 | 360 write_c_string (printcharfun, |
| 361 print_readably ? "#s(hash-table" : "#<hash-table"); | |
| 428 | 362 |
| 363 /* These checks have a kludgy look to them, but they are safe. | |
| 364 Due to nature of hashing, you cannot use arbitrary | |
| 365 test functions anyway. */ | |
| 366 if (!ht->test_function) | |
| 826 | 367 write_c_string (printcharfun, " test eq"); |
| 428 | 368 else if (ht->test_function == lisp_object_equal_equal) |
| 826 | 369 write_c_string (printcharfun, " test equal"); |
| 428 | 370 else if (ht->test_function == lisp_object_eql_equal) |
| 371 DO_NOTHING; | |
| 372 else | |
| 2500 | 373 ABORT (); |
| 428 | 374 |
| 375 if (ht->count || !print_readably) | |
| 376 { | |
| 377 if (print_readably) | |
| 800 | 378 write_fmt_string (printcharfun, " size %ld", (long) ht->count); |
| 428 | 379 else |
| 800 | 380 write_fmt_string (printcharfun, " size %ld/%ld", (long) ht->count, |
| 381 (long) ht->size); | |
| 428 | 382 } |
| 383 | |
| 384 if (ht->weakness != HASH_TABLE_NON_WEAK) | |
| 385 { | |
| 800 | 386 write_fmt_string |
| 387 (printcharfun, " weakness %s", | |
| 388 (ht->weakness == HASH_TABLE_WEAK ? "key-and-value" : | |
| 389 ht->weakness == HASH_TABLE_KEY_WEAK ? "key" : | |
| 390 ht->weakness == HASH_TABLE_VALUE_WEAK ? "value" : | |
| 391 ht->weakness == HASH_TABLE_KEY_VALUE_WEAK ? "key-or-value" : | |
| 392 "you-d-better-not-see-this")); | |
| 428 | 393 } |
| 394 | |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
395 if (ht->rehash_size != HASH_TABLE_DEFAULT_REHASH_SIZE) |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
396 { |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
397 float_to_string (pigbuf, ht->rehash_size); |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
398 write_fmt_string (printcharfun, " rehash-size %s", pigbuf); |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
399 } |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
400 |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
401 if (ht->rehash_threshold |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
402 != HASH_TABLE_DEFAULT_REHASH_THRESHOLD (ht->size, |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
403 ht->test_function)) |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
404 { |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
405 float_to_string (pigbuf, ht->rehash_threshold); |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
406 write_fmt_string (printcharfun, " rehash-threshold %s", pigbuf); |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
407 } |
|
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
408 |
| 428 | 409 if (ht->count) |
| 410 print_hash_table_data (ht, printcharfun); | |
| 411 | |
| 412 if (print_readably) | |
| 826 | 413 write_c_string (printcharfun, ")"); |
| 428 | 414 else |
| 2421 | 415 write_fmt_string (printcharfun, " 0x%x>", ht->header.uid); |
| 428 | 416 } |
| 417 | |
| 4117 | 418 #ifndef NEW_GC |
| 428 | 419 static void |
| 4117 | 420 free_hentries (htentry *hentries, |
| 2333 | 421 #ifdef ERROR_CHECK_STRUCTURES |
| 422 size_t size | |
| 4117 | 423 #else /* not ERROR_CHECK_STRUCTURES) */ |
| 2333 | 424 size_t UNUSED (size) |
| 4117 | 425 #endif /* not ERROR_CHECK_STRUCTURES) */ |
| 2333 | 426 ) |
| 489 | 427 { |
| 800 | 428 #ifdef ERROR_CHECK_STRUCTURES |
| 489 | 429 /* Ensure a crash if other code uses the discarded entries afterwards. */ |
| 1204 | 430 htentry *e, *sentinel; |
| 489 | 431 |
| 432 for (e = hentries, sentinel = e + size; e < sentinel; e++) | |
| 1204 | 433 * (unsigned long *) e = 0xdeadbeef; /* -559038737 base 10 */ |
| 489 | 434 #endif |
| 435 | |
| 436 if (!DUMPEDP (hentries)) | |
| 1726 | 437 xfree (hentries, htentry *); |
| 489 | 438 } |
| 439 | |
| 440 static void | |
| 428 | 441 finalize_hash_table (void *header, int for_disksave) |
| 442 { | |
| 443 if (!for_disksave) | |
| 444 { | |
| 445 Lisp_Hash_Table *ht = (Lisp_Hash_Table *) header; | |
| 489 | 446 free_hentries (ht->hentries, ht->size); |
| 428 | 447 ht->hentries = 0; |
| 448 } | |
| 449 } | |
| 3263 | 450 #endif /* not NEW_GC */ |
| 428 | 451 |
| 1204 | 452 static const struct memory_description htentry_description_1[] = { |
| 453 { XD_LISP_OBJECT, offsetof (htentry, key) }, | |
| 454 { XD_LISP_OBJECT, offsetof (htentry, value) }, | |
| 428 | 455 { XD_END } |
| 456 }; | |
| 457 | |
| 1204 | 458 static const struct sized_memory_description htentry_description = { |
| 459 sizeof (htentry), | |
| 460 htentry_description_1 | |
| 428 | 461 }; |
| 462 | |
| 3092 | 463 #ifdef NEW_GC |
| 464 static const struct memory_description htentry_weak_description_1[] = { | |
| 465 { XD_LISP_OBJECT, offsetof (htentry, key), 0, { 0 }, XD_FLAG_NO_KKCC}, | |
| 466 { XD_LISP_OBJECT, offsetof (htentry, value), 0, { 0 }, XD_FLAG_NO_KKCC}, | |
| 467 { XD_END } | |
| 468 }; | |
| 469 | |
| 470 static const struct sized_memory_description htentry_weak_description = { | |
| 471 sizeof (htentry), | |
| 472 htentry_weak_description_1 | |
| 473 }; | |
| 474 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
475 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("hash-table-entry", hash_table_entry, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
476 0, htentry_description_1, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
477 Lisp_Hash_Table_Entry); |
| 3092 | 478 #endif /* NEW_GC */ |
| 479 | |
| 1204 | 480 static const struct memory_description htentry_union_description_1[] = { |
| 481 /* Note: XD_INDIRECT in this table refers to the surrounding table, | |
| 482 and so this will work. */ | |
| 3092 | 483 #ifdef NEW_GC |
| 484 { XD_LISP_OBJECT_BLOCK_PTR, HASH_TABLE_NON_WEAK, | |
| 485 XD_INDIRECT (0, 1), { &htentry_description } }, | |
| 486 { XD_LISP_OBJECT_BLOCK_PTR, 0, XD_INDIRECT (0, 1), | |
| 487 { &htentry_weak_description }, XD_FLAG_UNION_DEFAULT_ENTRY }, | |
| 488 #else /* not NEW_GC */ | |
| 2367 | 489 { XD_BLOCK_PTR, HASH_TABLE_NON_WEAK, XD_INDIRECT (0, 1), |
| 2551 | 490 { &htentry_description } }, |
| 491 { XD_BLOCK_PTR, 0, XD_INDIRECT (0, 1), { &htentry_description }, | |
| 1204 | 492 XD_FLAG_UNION_DEFAULT_ENTRY | XD_FLAG_NO_KKCC }, |
| 3092 | 493 #endif /* not NEW_GC */ |
| 1204 | 494 { XD_END } |
| 495 }; | |
| 496 | |
| 497 static const struct sized_memory_description htentry_union_description = { | |
| 498 sizeof (htentry *), | |
| 499 htentry_union_description_1 | |
| 500 }; | |
| 501 | |
| 502 const struct memory_description hash_table_description[] = { | |
| 503 { XD_ELEMCOUNT, offsetof (Lisp_Hash_Table, size) }, | |
| 504 { XD_INT, offsetof (Lisp_Hash_Table, weakness) }, | |
| 505 { XD_UNION, offsetof (Lisp_Hash_Table, hentries), XD_INDIRECT (1, 0), | |
| 2551 | 506 { &htentry_union_description } }, |
| 440 | 507 { XD_LO_LINK, offsetof (Lisp_Hash_Table, next_weak) }, |
| 428 | 508 { XD_END } |
| 509 }; | |
| 510 | |
| 3263 | 511 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
512 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
513 mark_hash_table, print_hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
514 0, hash_table_equal, hash_table_hash, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
515 hash_table_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
516 Lisp_Hash_Table); |
| 3263 | 517 #else /* not NEW_GC */ |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
518 DEFINE_DUMPABLE_LISP_OBJECT ("hash-table", hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
519 mark_hash_table, print_hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
520 finalize_hash_table, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
521 hash_table_equal, hash_table_hash, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
522 hash_table_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
523 Lisp_Hash_Table); |
| 3263 | 524 #endif /* not NEW_GC */ |
| 428 | 525 |
| 526 static Lisp_Hash_Table * | |
| 527 xhash_table (Lisp_Object hash_table) | |
| 528 { | |
| 1123 | 529 /* #### What's going on here? Why the gc_in_progress check? */ |
| 428 | 530 if (!gc_in_progress) |
| 531 CHECK_HASH_TABLE (hash_table); | |
| 532 check_hash_table_invariants (XHASH_TABLE (hash_table)); | |
| 533 return XHASH_TABLE (hash_table); | |
| 534 } | |
| 535 | |
| 536 | |
| 537 /************************************************************************/ | |
| 538 /* Creation of Hash Tables */ | |
| 539 /************************************************************************/ | |
| 540 | |
| 541 /* Creation of hash tables, without error-checking. */ | |
| 542 static void | |
| 543 compute_hash_table_derived_values (Lisp_Hash_Table *ht) | |
| 544 { | |
| 665 | 545 ht->rehash_count = (Elemcount) |
| 438 | 546 ((double) ht->size * ht->rehash_threshold); |
| 665 | 547 ht->golden_ratio = (Elemcount) |
| 428 | 548 ((double) ht->size * (.6180339887 / (double) sizeof (Lisp_Object))); |
| 549 } | |
| 550 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
551 static htentry * |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
552 allocate_hash_table_entries (Elemcount size) |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
553 { |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
554 #ifdef NEW_GC |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
555 return XHASH_TABLE_ENTRY (alloc_lrecord_array |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
556 (size, &lrecord_hash_table_entry)); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
557 #else /* not NEW_GC */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
558 return xnew_array_and_zero (htentry, size); |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
559 #endif /* not NEW_GC */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
560 } |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
561 |
| 428 | 562 Lisp_Object |
| 450 | 563 make_standard_lisp_hash_table (enum hash_table_test test, |
| 665 | 564 Elemcount size, |
| 450 | 565 double rehash_size, |
| 566 double rehash_threshold, | |
| 567 enum hash_table_weakness weakness) | |
| 568 { | |
| 462 | 569 hash_table_hash_function_t hash_function = 0; |
| 450 | 570 hash_table_test_function_t test_function = 0; |
| 571 | |
| 572 switch (test) | |
| 573 { | |
| 574 case HASH_TABLE_EQ: | |
| 575 test_function = 0; | |
| 576 hash_function = 0; | |
| 577 break; | |
| 578 | |
| 579 case HASH_TABLE_EQL: | |
| 580 test_function = lisp_object_eql_equal; | |
| 581 hash_function = lisp_object_eql_hash; | |
| 582 break; | |
| 583 | |
| 584 case HASH_TABLE_EQUAL: | |
| 585 test_function = lisp_object_equal_equal; | |
| 586 hash_function = lisp_object_equal_hash; | |
| 587 break; | |
| 588 | |
| 589 default: | |
| 2500 | 590 ABORT (); |
| 450 | 591 } |
| 592 | |
| 593 return make_general_lisp_hash_table (hash_function, test_function, | |
| 594 size, rehash_size, rehash_threshold, | |
| 595 weakness); | |
| 596 } | |
| 597 | |
| 598 Lisp_Object | |
| 599 make_general_lisp_hash_table (hash_table_hash_function_t hash_function, | |
| 600 hash_table_test_function_t test_function, | |
| 665 | 601 Elemcount size, |
| 428 | 602 double rehash_size, |
| 603 double rehash_threshold, | |
| 604 enum hash_table_weakness weakness) | |
| 605 { | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
606 Lisp_Object hash_table = ALLOC_LISP_OBJECT (hash_table); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
607 Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 428 | 608 |
| 450 | 609 ht->test_function = test_function; |
| 610 ht->hash_function = hash_function; | |
| 438 | 611 ht->weakness = weakness; |
| 612 | |
| 613 ht->rehash_size = | |
| 614 rehash_size > 1.0 ? rehash_size : HASH_TABLE_DEFAULT_REHASH_SIZE; | |
| 615 | |
| 616 ht->rehash_threshold = | |
| 617 rehash_threshold > 0.0 ? rehash_threshold : | |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
618 HASH_TABLE_DEFAULT_REHASH_THRESHOLD (size, ht->test_function); |
| 438 | 619 |
| 428 | 620 if (size < HASH_TABLE_MIN_SIZE) |
| 621 size = HASH_TABLE_MIN_SIZE; | |
| 665 | 622 ht->size = hash_table_size ((Elemcount) (((double) size / ht->rehash_threshold) |
| 438 | 623 + 1.0)); |
| 428 | 624 ht->count = 0; |
| 438 | 625 |
| 428 | 626 compute_hash_table_derived_values (ht); |
| 627 | |
| 1204 | 628 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
629 ht->hentries = allocate_hash_table_entries (ht->size + 1); |
| 428 | 630 |
| 631 if (weakness == HASH_TABLE_NON_WEAK) | |
| 632 ht->next_weak = Qunbound; | |
| 633 else | |
| 634 ht->next_weak = Vall_weak_hash_tables, Vall_weak_hash_tables = hash_table; | |
| 635 | |
| 636 return hash_table; | |
| 637 } | |
| 638 | |
| 639 Lisp_Object | |
| 665 | 640 make_lisp_hash_table (Elemcount size, |
| 428 | 641 enum hash_table_weakness weakness, |
| 642 enum hash_table_test test) | |
| 643 { | |
| 450 | 644 return make_standard_lisp_hash_table (test, size, -1.0, -1.0, weakness); |
| 428 | 645 } |
| 646 | |
| 647 /* Pretty reading of hash tables. | |
| 648 | |
| 649 Here we use the existing structures mechanism (which is, | |
| 650 unfortunately, pretty cumbersome) for validating and instantiating | |
| 651 the hash tables. The idea is that the side-effect of reading a | |
| 652 #s(hash-table PLIST) object is creation of a hash table with desired | |
| 653 properties, and that the hash table is returned. */ | |
| 654 | |
| 655 /* Validation functions: each keyword provides its own validation | |
| 656 function. The errors should maybe be continuable, but it is | |
| 657 unclear how this would cope with ERRB. */ | |
| 658 static int | |
| 2286 | 659 hash_table_size_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 660 Error_Behavior errb) | |
| 428 | 661 { |
| 662 if (NATNUMP (value)) | |
| 663 return 1; | |
| 664 | |
| 563 | 665 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qnatnump, value), |
| 2286 | 666 Qhash_table, errb); |
| 428 | 667 return 0; |
| 668 } | |
| 669 | |
| 665 | 670 static Elemcount |
| 428 | 671 decode_hash_table_size (Lisp_Object obj) |
| 672 { | |
| 673 return NILP (obj) ? HASH_TABLE_DEFAULT_SIZE : XINT (obj); | |
| 674 } | |
| 675 | |
| 676 static int | |
| 2286 | 677 hash_table_weakness_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 578 | 678 Error_Behavior errb) |
| 428 | 679 { |
| 442 | 680 if (EQ (value, Qnil)) return 1; |
| 681 if (EQ (value, Qt)) return 1; | |
| 682 if (EQ (value, Qkey)) return 1; | |
| 683 if (EQ (value, Qkey_and_value)) return 1; | |
| 684 if (EQ (value, Qkey_or_value)) return 1; | |
| 685 if (EQ (value, Qvalue)) return 1; | |
| 428 | 686 |
| 687 /* Following values are obsolete as of 19990901 in xemacs-21.2 */ | |
| 442 | 688 if (EQ (value, Qnon_weak)) return 1; |
| 689 if (EQ (value, Qweak)) return 1; | |
| 690 if (EQ (value, Qkey_weak)) return 1; | |
| 691 if (EQ (value, Qkey_or_value_weak)) return 1; | |
| 692 if (EQ (value, Qvalue_weak)) return 1; | |
| 428 | 693 |
| 563 | 694 maybe_invalid_constant ("Invalid hash table weakness", |
| 428 | 695 value, Qhash_table, errb); |
| 696 return 0; | |
| 697 } | |
| 698 | |
| 699 static enum hash_table_weakness | |
| 700 decode_hash_table_weakness (Lisp_Object obj) | |
| 701 { | |
| 442 | 702 if (EQ (obj, Qnil)) return HASH_TABLE_NON_WEAK; |
| 703 if (EQ (obj, Qt)) return HASH_TABLE_WEAK; | |
| 704 if (EQ (obj, Qkey_and_value)) return HASH_TABLE_WEAK; | |
| 705 if (EQ (obj, Qkey)) return HASH_TABLE_KEY_WEAK; | |
| 706 if (EQ (obj, Qkey_or_value)) return HASH_TABLE_KEY_VALUE_WEAK; | |
| 707 if (EQ (obj, Qvalue)) return HASH_TABLE_VALUE_WEAK; | |
| 428 | 708 |
| 709 /* Following values are obsolete as of 19990901 in xemacs-21.2 */ | |
| 442 | 710 if (EQ (obj, Qnon_weak)) return HASH_TABLE_NON_WEAK; |
| 711 if (EQ (obj, Qweak)) return HASH_TABLE_WEAK; | |
| 712 if (EQ (obj, Qkey_weak)) return HASH_TABLE_KEY_WEAK; | |
| 713 if (EQ (obj, Qkey_or_value_weak)) return HASH_TABLE_KEY_VALUE_WEAK; | |
| 714 if (EQ (obj, Qvalue_weak)) return HASH_TABLE_VALUE_WEAK; | |
| 428 | 715 |
| 563 | 716 invalid_constant ("Invalid hash table weakness", obj); |
| 1204 | 717 RETURN_NOT_REACHED (HASH_TABLE_NON_WEAK); |
| 428 | 718 } |
| 719 | |
| 720 static int | |
| 2286 | 721 hash_table_test_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 722 Error_Behavior errb) | |
| 428 | 723 { |
| 724 if (EQ (value, Qnil)) return 1; | |
| 725 if (EQ (value, Qeq)) return 1; | |
| 726 if (EQ (value, Qequal)) return 1; | |
| 727 if (EQ (value, Qeql)) return 1; | |
| 728 | |
| 563 | 729 maybe_invalid_constant ("Invalid hash table test", |
| 2286 | 730 value, Qhash_table, errb); |
| 428 | 731 return 0; |
| 732 } | |
| 733 | |
| 734 static enum hash_table_test | |
| 735 decode_hash_table_test (Lisp_Object obj) | |
| 736 { | |
| 737 if (EQ (obj, Qnil)) return HASH_TABLE_EQL; | |
| 738 if (EQ (obj, Qeq)) return HASH_TABLE_EQ; | |
| 739 if (EQ (obj, Qequal)) return HASH_TABLE_EQUAL; | |
| 740 if (EQ (obj, Qeql)) return HASH_TABLE_EQL; | |
| 741 | |
| 563 | 742 invalid_constant ("Invalid hash table test", obj); |
| 1204 | 743 RETURN_NOT_REACHED (HASH_TABLE_EQ); |
| 428 | 744 } |
| 745 | |
| 746 static int | |
| 2286 | 747 hash_table_rehash_size_validate (Lisp_Object UNUSED (keyword), |
| 748 Lisp_Object value, Error_Behavior errb) | |
| 428 | 749 { |
| 750 if (!FLOATP (value)) | |
| 751 { | |
| 563 | 752 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value), |
| 428 | 753 Qhash_table, errb); |
| 754 return 0; | |
| 755 } | |
| 756 | |
| 757 { | |
| 758 double rehash_size = XFLOAT_DATA (value); | |
| 759 if (rehash_size <= 1.0) | |
| 760 { | |
| 563 | 761 maybe_invalid_argument |
| 428 | 762 ("Hash table rehash size must be greater than 1.0", |
| 763 value, Qhash_table, errb); | |
| 764 return 0; | |
| 765 } | |
| 766 } | |
| 767 | |
| 768 return 1; | |
| 769 } | |
| 770 | |
| 771 static double | |
| 772 decode_hash_table_rehash_size (Lisp_Object rehash_size) | |
| 773 { | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
774 /* -1.0 signals make_general_lisp_hash_table to use the default. */ |
| 428 | 775 return NILP (rehash_size) ? -1.0 : XFLOAT_DATA (rehash_size); |
| 776 } | |
| 777 | |
| 778 static int | |
| 2286 | 779 hash_table_rehash_threshold_validate (Lisp_Object UNUSED (keyword), |
| 780 Lisp_Object value, Error_Behavior errb) | |
| 428 | 781 { |
| 782 if (!FLOATP (value)) | |
| 783 { | |
| 563 | 784 maybe_signal_error_1 (Qwrong_type_argument, list2 (Qfloatp, value), |
| 428 | 785 Qhash_table, errb); |
| 786 return 0; | |
| 787 } | |
| 788 | |
| 789 { | |
| 790 double rehash_threshold = XFLOAT_DATA (value); | |
| 791 if (rehash_threshold <= 0.0 || rehash_threshold >= 1.0) | |
| 792 { | |
| 563 | 793 maybe_invalid_argument |
| 428 | 794 ("Hash table rehash threshold must be between 0.0 and 1.0", |
| 795 value, Qhash_table, errb); | |
| 796 return 0; | |
| 797 } | |
| 798 } | |
| 799 | |
| 800 return 1; | |
| 801 } | |
| 802 | |
| 803 static double | |
| 804 decode_hash_table_rehash_threshold (Lisp_Object rehash_threshold) | |
| 805 { | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
806 /* -1.0 signals make_general_lisp_hash_table to use the default. */ |
| 428 | 807 return NILP (rehash_threshold) ? -1.0 : XFLOAT_DATA (rehash_threshold); |
| 808 } | |
| 809 | |
| 810 static int | |
| 2286 | 811 hash_table_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 812 Error_Behavior errb) | |
| 428 | 813 { |
| 814 int len; | |
| 815 | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
816 /* Check for improper lists while getting length. */ |
| 428 | 817 GET_EXTERNAL_LIST_LENGTH (value, len); |
| 818 | |
| 819 if (len & 1) | |
| 820 { | |
| 563 | 821 maybe_sferror |
| 428 | 822 ("Hash table data must have alternating key/value pairs", |
| 823 value, Qhash_table, errb); | |
| 824 return 0; | |
| 825 } | |
|
4585
871eb054b34a
Document non-obvious usages.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4410
diff
changeset
|
826 |
| 428 | 827 return 1; |
| 828 } | |
| 829 | |
| 830 /* The actual instantiation of a hash table. This does practically no | |
| 831 error checking, because it relies on the fact that the paranoid | |
| 832 functions above have error-checked everything to the last details. | |
| 833 If this assumption is wrong, we will get a crash immediately (with | |
| 834 error-checking compiled in), and we'll know if there is a bug in | |
| 835 the structure mechanism. So there. */ | |
| 836 static Lisp_Object | |
| 837 hash_table_instantiate (Lisp_Object plist) | |
| 838 { | |
| 839 Lisp_Object hash_table; | |
| 840 Lisp_Object test = Qnil; | |
| 841 Lisp_Object size = Qnil; | |
| 842 Lisp_Object rehash_size = Qnil; | |
| 843 Lisp_Object rehash_threshold = Qnil; | |
| 844 Lisp_Object weakness = Qnil; | |
| 845 Lisp_Object data = Qnil; | |
| 846 | |
| 2421 | 847 PROPERTY_LIST_LOOP_3 (key, value, plist) |
| 428 | 848 { |
| 849 if (EQ (key, Qtest)) test = value; | |
| 850 else if (EQ (key, Qsize)) size = value; | |
| 851 else if (EQ (key, Qrehash_size)) rehash_size = value; | |
| 852 else if (EQ (key, Qrehash_threshold)) rehash_threshold = value; | |
| 853 else if (EQ (key, Qweakness)) weakness = value; | |
| 854 else if (EQ (key, Qdata)) data = value; | |
| 855 else if (EQ (key, Qtype))/*obsolete*/ weakness = value; | |
| 856 else | |
| 2500 | 857 ABORT (); |
| 428 | 858 } |
| 859 | |
| 860 /* Create the hash table. */ | |
| 450 | 861 hash_table = make_standard_lisp_hash_table |
| 428 | 862 (decode_hash_table_test (test), |
| 863 decode_hash_table_size (size), | |
| 864 decode_hash_table_rehash_size (rehash_size), | |
| 865 decode_hash_table_rehash_threshold (rehash_threshold), | |
| 866 decode_hash_table_weakness (weakness)); | |
| 867 | |
| 868 /* I'm not sure whether this can GC, but better safe than sorry. */ | |
| 869 { | |
| 870 struct gcpro gcpro1; | |
| 871 GCPRO1 (hash_table); | |
| 872 | |
| 873 /* And fill it with data. */ | |
| 874 while (!NILP (data)) | |
| 875 { | |
| 876 Lisp_Object key, value; | |
| 877 key = XCAR (data); data = XCDR (data); | |
| 878 value = XCAR (data); data = XCDR (data); | |
| 879 Fputhash (key, value, hash_table); | |
| 880 } | |
| 881 UNGCPRO; | |
| 882 } | |
| 883 | |
| 884 return hash_table; | |
| 885 } | |
| 886 | |
| 887 static void | |
| 888 structure_type_create_hash_table_structure_name (Lisp_Object structure_name) | |
| 889 { | |
| 890 struct structure_type *st; | |
| 891 | |
| 892 st = define_structure_type (structure_name, 0, hash_table_instantiate); | |
| 893 define_structure_type_keyword (st, Qtest, hash_table_test_validate); | |
| 894 define_structure_type_keyword (st, Qsize, hash_table_size_validate); | |
| 895 define_structure_type_keyword (st, Qrehash_size, hash_table_rehash_size_validate); | |
| 896 define_structure_type_keyword (st, Qrehash_threshold, hash_table_rehash_threshold_validate); | |
| 897 define_structure_type_keyword (st, Qweakness, hash_table_weakness_validate); | |
| 898 define_structure_type_keyword (st, Qdata, hash_table_data_validate); | |
| 899 | |
| 900 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 901 define_structure_type_keyword (st, Qtype, hash_table_weakness_validate); | |
| 902 } | |
| 903 | |
| 904 /* Create a built-in Lisp structure type named `hash-table'. | |
| 905 We make #s(hashtable ...) equivalent to #s(hash-table ...), | |
| 906 for backward compatibility. | |
| 907 This is called from emacs.c. */ | |
| 908 void | |
| 909 structure_type_create_hash_table (void) | |
| 910 { | |
| 911 structure_type_create_hash_table_structure_name (Qhash_table); | |
| 912 structure_type_create_hash_table_structure_name (Qhashtable); /* compat */ | |
| 913 } | |
| 914 | |
| 915 | |
| 916 /************************************************************************/ | |
| 917 /* Definition of Lisp-visible methods */ | |
| 918 /************************************************************************/ | |
| 919 | |
| 920 DEFUN ("hash-table-p", Fhash_table_p, 1, 1, 0, /* | |
| 921 Return t if OBJECT is a hash table, else nil. | |
| 922 */ | |
| 923 (object)) | |
| 924 { | |
| 925 return HASH_TABLEP (object) ? Qt : Qnil; | |
| 926 } | |
| 927 | |
| 928 DEFUN ("make-hash-table", Fmake_hash_table, 0, MANY, 0, /* | |
| 929 Return a new empty hash table object. | |
| 930 Use Common Lisp style keywords to specify hash table properties. | |
| 931 | |
| 932 Keyword :test can be `eq', `eql' (default) or `equal'. | |
| 933 Comparison between keys is done using this function. | |
| 934 If speed is important, consider using `eq'. | |
| 935 When storing strings in the hash table, you will likely need to use `equal'. | |
| 936 | |
| 937 Keyword :size specifies the number of keys likely to be inserted. | |
| 938 This number of entries can be inserted without enlarging the hash table. | |
| 939 | |
| 940 Keyword :rehash-size must be a float greater than 1.0, and specifies | |
| 941 the factor by which to increase the size of the hash table when enlarging. | |
| 942 | |
| 943 Keyword :rehash-threshold must be a float between 0.0 and 1.0, | |
| 944 and specifies the load factor of the hash table which triggers enlarging. | |
| 945 | |
| 442 | 946 Non-standard keyword :weakness can be `nil' (default), `t', `key-and-value', |
| 947 `key', `value' or `key-or-value'. `t' is an alias for `key-and-value'. | |
| 428 | 948 |
| 442 | 949 A key-and-value-weak hash table, also known as a fully-weak or simply |
| 950 as a weak hash table, is one whose pointers do not count as GC | |
| 951 referents: for any key-value pair in the hash table, if the only | |
| 952 remaining pointer to either the key or the value is in a weak hash | |
| 953 table, then the pair will be removed from the hash table, and the key | |
| 954 and value collected. A non-weak hash table (or any other pointer) | |
| 955 would prevent the object from being collected. | |
| 428 | 956 |
| 957 A key-weak hash table is similar to a fully-weak hash table except that | |
| 958 a key-value pair will be removed only if the key remains unmarked | |
| 959 outside of weak hash tables. The pair will remain in the hash table if | |
| 960 the key is pointed to by something other than a weak hash table, even | |
| 961 if the value is not. | |
| 962 | |
| 963 A value-weak hash table is similar to a fully-weak hash table except | |
| 964 that a key-value pair will be removed only if the value remains | |
| 965 unmarked outside of weak hash tables. The pair will remain in the | |
| 966 hash table if the value is pointed to by something other than a weak | |
| 967 hash table, even if the key is not. | |
| 442 | 968 |
| 969 A key-or-value-weak hash table is similar to a fully-weak hash table except | |
| 970 that a key-value pair will be removed only if the value and the key remain | |
| 971 unmarked outside of weak hash tables. The pair will remain in the | |
| 972 hash table if the value or key are pointed to by something other than a weak | |
| 973 hash table, even if the other is not. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4585
diff
changeset
|
974 |
|
4777
c69aeb86b2a3
Serialise non-default hash table rehash thresholds correctly; use this.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4693
diff
changeset
|
975 arguments: (&key TEST SIZE REHASH-SIZE REHASH-THRESHOLD WEAKNESS) |
| 428 | 976 */ |
| 977 (int nargs, Lisp_Object *args)) | |
| 978 { | |
| 979 int i = 0; | |
| 980 Lisp_Object test = Qnil; | |
| 981 Lisp_Object size = Qnil; | |
| 982 Lisp_Object rehash_size = Qnil; | |
| 983 Lisp_Object rehash_threshold = Qnil; | |
| 984 Lisp_Object weakness = Qnil; | |
| 985 | |
| 986 while (i + 1 < nargs) | |
| 987 { | |
| 988 Lisp_Object keyword = args[i++]; | |
| 989 Lisp_Object value = args[i++]; | |
| 990 | |
| 991 if (EQ (keyword, Q_test)) test = value; | |
| 992 else if (EQ (keyword, Q_size)) size = value; | |
| 993 else if (EQ (keyword, Q_rehash_size)) rehash_size = value; | |
| 994 else if (EQ (keyword, Q_rehash_threshold)) rehash_threshold = value; | |
| 995 else if (EQ (keyword, Q_weakness)) weakness = value; | |
| 996 else if (EQ (keyword, Q_type))/*obsolete*/ weakness = value; | |
| 563 | 997 else invalid_constant ("Invalid hash table property keyword", keyword); |
| 428 | 998 } |
| 999 | |
| 1000 if (i < nargs) | |
| 563 | 1001 sferror ("Hash table property requires a value", args[i]); |
| 428 | 1002 |
| 1003 #define VALIDATE_VAR(var) \ | |
| 1004 if (!NILP (var)) hash_table_##var##_validate (Q##var, var, ERROR_ME); | |
| 1005 | |
| 1006 VALIDATE_VAR (test); | |
| 1007 VALIDATE_VAR (size); | |
| 1008 VALIDATE_VAR (rehash_size); | |
| 1009 VALIDATE_VAR (rehash_threshold); | |
| 1010 VALIDATE_VAR (weakness); | |
| 1011 | |
| 450 | 1012 return make_standard_lisp_hash_table |
| 428 | 1013 (decode_hash_table_test (test), |
| 1014 decode_hash_table_size (size), | |
| 1015 decode_hash_table_rehash_size (rehash_size), | |
| 1016 decode_hash_table_rehash_threshold (rehash_threshold), | |
| 1017 decode_hash_table_weakness (weakness)); | |
| 1018 } | |
| 1019 | |
| 1020 DEFUN ("copy-hash-table", Fcopy_hash_table, 1, 1, 0, /* | |
| 1021 Return a new hash table containing the same keys and values as HASH-TABLE. | |
| 1022 The keys and values will not themselves be copied. | |
| 1023 */ | |
| 1024 (hash_table)) | |
| 1025 { | |
| 442 | 1026 const Lisp_Hash_Table *ht_old = xhash_table (hash_table); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1027 Lisp_Object obj = ALLOC_LISP_OBJECT (hash_table); |
|
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1028 Lisp_Hash_Table *ht = XHASH_TABLE (obj); |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
1029 COPY_LISP_OBJECT (ht, ht_old); |
| 428 | 1030 |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1031 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1032 ht->hentries = allocate_hash_table_entries (ht_old->size + 1); |
| 1204 | 1033 memcpy (ht->hentries, ht_old->hentries, (ht_old->size + 1) * sizeof (htentry)); |
| 428 | 1034 |
| 1035 if (! EQ (ht->next_weak, Qunbound)) | |
| 1036 { | |
| 1037 ht->next_weak = Vall_weak_hash_tables; | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1038 Vall_weak_hash_tables = obj; |
| 428 | 1039 } |
| 1040 | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1041 return obj; |
| 428 | 1042 } |
| 1043 | |
| 1044 static void | |
| 665 | 1045 resize_hash_table (Lisp_Hash_Table *ht, Elemcount new_size) |
| 428 | 1046 { |
| 1204 | 1047 htentry *old_entries, *new_entries, *sentinel, *e; |
| 665 | 1048 Elemcount old_size; |
| 428 | 1049 |
| 1050 old_size = ht->size; | |
| 1051 ht->size = new_size; | |
| 1052 | |
| 1053 old_entries = ht->hentries; | |
| 1054 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1055 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1056 ht->hentries = allocate_hash_table_entries (new_size + 1); |
| 428 | 1057 new_entries = ht->hentries; |
| 1058 | |
| 1059 compute_hash_table_derived_values (ht); | |
| 1060 | |
| 440 | 1061 for (e = old_entries, sentinel = e + old_size; e < sentinel; e++) |
| 1204 | 1062 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1063 { |
| 1204 | 1064 htentry *probe = new_entries + HASHCODE (e->key, ht); |
| 428 | 1065 LINEAR_PROBING_LOOP (probe, new_entries, new_size) |
| 1066 ; | |
| 1067 *probe = *e; | |
| 1068 } | |
| 1069 | |
| 4117 | 1070 #ifndef NEW_GC |
| 489 | 1071 free_hentries (old_entries, old_size); |
| 4117 | 1072 #endif /* not NEW_GC */ |
| 428 | 1073 } |
| 1074 | |
| 440 | 1075 /* After a hash table has been saved to disk and later restored by the |
| 1076 portable dumper, it contains the same objects, but their addresses | |
| 665 | 1077 and thus their HASHCODEs have changed. */ |
| 428 | 1078 void |
| 440 | 1079 pdump_reorganize_hash_table (Lisp_Object hash_table) |
| 428 | 1080 { |
| 442 | 1081 const Lisp_Hash_Table *ht = xhash_table (hash_table); |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1082 /* We leave room for one never-occupied sentinel htentry at the end. */ |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1083 htentry *new_entries = allocate_hash_table_entries (ht->size + 1); |
| 1204 | 1084 htentry *e, *sentinel; |
| 440 | 1085 |
| 1086 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1087 if (!HTENTRY_CLEAR_P (e)) |
| 440 | 1088 { |
| 1204 | 1089 htentry *probe = new_entries + HASHCODE (e->key, ht); |
| 440 | 1090 LINEAR_PROBING_LOOP (probe, new_entries, ht->size) |
| 1091 ; | |
| 1092 *probe = *e; | |
| 1093 } | |
| 1094 | |
| 1204 | 1095 memcpy (ht->hentries, new_entries, ht->size * sizeof (htentry)); |
| 440 | 1096 |
| 4117 | 1097 #ifndef NEW_GC |
| 1726 | 1098 xfree (new_entries, htentry *); |
| 3092 | 1099 #endif /* not NEW_GC */ |
| 428 | 1100 } |
| 1101 | |
| 1102 static void | |
| 1103 enlarge_hash_table (Lisp_Hash_Table *ht) | |
| 1104 { | |
| 665 | 1105 Elemcount new_size = |
| 1106 hash_table_size ((Elemcount) ((double) ht->size * ht->rehash_size)); | |
| 428 | 1107 resize_hash_table (ht, new_size); |
| 1108 } | |
| 1109 | |
| 4072 | 1110 htentry * |
| 1204 | 1111 find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht) |
| 428 | 1112 { |
| 1113 hash_table_test_function_t test_function = ht->test_function; | |
| 1204 | 1114 htentry *entries = ht->hentries; |
| 1115 htentry *probe = entries + HASHCODE (key, ht); | |
| 428 | 1116 |
| 1117 LINEAR_PROBING_LOOP (probe, entries, ht->size) | |
| 1118 if (KEYS_EQUAL_P (probe->key, key, test_function)) | |
| 1119 break; | |
| 1120 | |
| 1121 return probe; | |
| 1122 } | |
| 1123 | |
| 2421 | 1124 /* A version of Fputhash() that increments the value by the specified |
| 1125 amount and dispenses will all error checks. Assumes that tables does | |
| 1126 comparison using EQ. Used by the profiling routines to avoid | |
| 1127 overhead -- profiling overhead was being recorded at up to 15% of the | |
| 1128 total time. */ | |
| 1129 | |
| 1130 void | |
| 1131 inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset) | |
| 1132 { | |
| 1133 Lisp_Hash_Table *ht = XHASH_TABLE (table); | |
| 1134 htentry *entries = ht->hentries; | |
| 1135 htentry *probe = entries + HASHCODE (key, ht); | |
| 1136 | |
| 1137 LINEAR_PROBING_LOOP (probe, entries, ht->size) | |
| 1138 if (EQ (probe->key, key)) | |
| 1139 break; | |
| 1140 | |
| 1141 if (!HTENTRY_CLEAR_P (probe)) | |
| 1142 probe->value = make_int (XINT (probe->value) + offset); | |
| 1143 else | |
| 1144 { | |
| 1145 probe->key = key; | |
| 1146 probe->value = make_int (offset); | |
| 1147 | |
| 1148 if (++ht->count >= ht->rehash_count) | |
| 1149 enlarge_hash_table (ht); | |
| 1150 } | |
| 1151 } | |
| 1152 | |
| 428 | 1153 DEFUN ("gethash", Fgethash, 2, 3, 0, /* |
| 1154 Find hash value for KEY in HASH-TABLE. | |
| 1155 If there is no corresponding value, return DEFAULT (which defaults to nil). | |
| 1156 */ | |
| 1157 (key, hash_table, default_)) | |
| 1158 { | |
| 442 | 1159 const Lisp_Hash_Table *ht = xhash_table (hash_table); |
| 1204 | 1160 htentry *e = find_htentry (key, ht); |
| 428 | 1161 |
| 1204 | 1162 return HTENTRY_CLEAR_P (e) ? default_ : e->value; |
| 428 | 1163 } |
| 1164 | |
| 1165 DEFUN ("puthash", Fputhash, 3, 3, 0, /* | |
|
4410
aae1994dfeec
Document return values for #'puthash, #'clrhash.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4398
diff
changeset
|
1166 Hash KEY to VALUE in HASH-TABLE, and return VALUE. |
| 428 | 1167 */ |
| 1168 (key, value, hash_table)) | |
| 1169 { | |
| 1170 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1171 htentry *e = find_htentry (key, ht); |
| 428 | 1172 |
| 1204 | 1173 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1174 return e->value = value; |
| 1175 | |
| 1176 e->key = key; | |
| 1177 e->value = value; | |
| 1178 | |
| 1179 if (++ht->count >= ht->rehash_count) | |
| 1180 enlarge_hash_table (ht); | |
| 1181 | |
| 1182 return value; | |
| 1183 } | |
| 1184 | |
| 1204 | 1185 /* Remove htentry pointed at by PROBE. |
| 428 | 1186 Subsequent entries are removed and reinserted. |
| 1187 We don't use tombstones - too wasteful. */ | |
| 1188 static void | |
| 1204 | 1189 remhash_1 (Lisp_Hash_Table *ht, htentry *entries, htentry *probe) |
| 428 | 1190 { |
| 665 | 1191 Elemcount size = ht->size; |
| 1204 | 1192 CLEAR_HTENTRY (probe); |
| 428 | 1193 probe++; |
| 1194 ht->count--; | |
| 1195 | |
| 1196 LINEAR_PROBING_LOOP (probe, entries, size) | |
| 1197 { | |
| 1198 Lisp_Object key = probe->key; | |
| 1204 | 1199 htentry *probe2 = entries + HASHCODE (key, ht); |
| 428 | 1200 LINEAR_PROBING_LOOP (probe2, entries, size) |
| 1201 if (EQ (probe2->key, key)) | |
| 1204 | 1202 /* htentry at probe doesn't need to move. */ |
| 428 | 1203 goto continue_outer_loop; |
| 1204 | 1204 /* Move htentry from probe to new home at probe2. */ |
| 428 | 1205 *probe2 = *probe; |
| 1204 | 1206 CLEAR_HTENTRY (probe); |
| 428 | 1207 continue_outer_loop: continue; |
| 1208 } | |
| 1209 } | |
| 1210 | |
| 1211 DEFUN ("remhash", Fremhash, 2, 2, 0, /* | |
| 1212 Remove the entry for KEY from HASH-TABLE. | |
| 1213 Do nothing if there is no entry for KEY in HASH-TABLE. | |
| 617 | 1214 Return non-nil if an entry was removed. |
| 428 | 1215 */ |
| 1216 (key, hash_table)) | |
| 1217 { | |
| 1218 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1219 htentry *e = find_htentry (key, ht); |
| 428 | 1220 |
| 1204 | 1221 if (HTENTRY_CLEAR_P (e)) |
| 428 | 1222 return Qnil; |
| 1223 | |
| 1224 remhash_1 (ht, ht->hentries, e); | |
| 1225 return Qt; | |
| 1226 } | |
| 1227 | |
| 1228 DEFUN ("clrhash", Fclrhash, 1, 1, 0, /* | |
| 1229 Remove all entries from HASH-TABLE, leaving it empty. | |
|
4410
aae1994dfeec
Document return values for #'puthash, #'clrhash.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4398
diff
changeset
|
1230 Return HASH-TABLE. |
| 428 | 1231 */ |
| 1232 (hash_table)) | |
| 1233 { | |
| 1234 Lisp_Hash_Table *ht = xhash_table (hash_table); | |
| 1204 | 1235 htentry *e, *sentinel; |
| 428 | 1236 |
| 1237 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1238 CLEAR_HTENTRY (e); |
| 428 | 1239 ht->count = 0; |
| 1240 | |
| 1241 return hash_table; | |
| 1242 } | |
| 1243 | |
| 1244 /************************************************************************/ | |
| 1245 /* Accessor Functions */ | |
| 1246 /************************************************************************/ | |
| 1247 | |
| 1248 DEFUN ("hash-table-count", Fhash_table_count, 1, 1, 0, /* | |
| 1249 Return the number of entries in HASH-TABLE. | |
| 1250 */ | |
| 1251 (hash_table)) | |
| 1252 { | |
| 1253 return make_int (xhash_table (hash_table)->count); | |
| 1254 } | |
| 1255 | |
| 1256 DEFUN ("hash-table-test", Fhash_table_test, 1, 1, 0, /* | |
| 1257 Return the test function of HASH-TABLE. | |
| 1258 This can be one of `eq', `eql' or `equal'. | |
| 1259 */ | |
| 1260 (hash_table)) | |
| 1261 { | |
| 1262 hash_table_test_function_t fun = xhash_table (hash_table)->test_function; | |
| 1263 | |
| 1264 return (fun == lisp_object_eql_equal ? Qeql : | |
| 1265 fun == lisp_object_equal_equal ? Qequal : | |
| 1266 Qeq); | |
| 1267 } | |
| 1268 | |
| 1269 DEFUN ("hash-table-size", Fhash_table_size, 1, 1, 0, /* | |
| 1270 Return the size of HASH-TABLE. | |
| 1271 This is the current number of slots in HASH-TABLE, whether occupied or not. | |
| 1272 */ | |
| 1273 (hash_table)) | |
| 1274 { | |
| 1275 return make_int (xhash_table (hash_table)->size); | |
| 1276 } | |
| 1277 | |
| 1278 DEFUN ("hash-table-rehash-size", Fhash_table_rehash_size, 1, 1, 0, /* | |
| 1279 Return the current rehash size of HASH-TABLE. | |
| 1280 This is a float greater than 1.0; the factor by which HASH-TABLE | |
| 1281 is enlarged when the rehash threshold is exceeded. | |
| 1282 */ | |
| 1283 (hash_table)) | |
| 1284 { | |
| 1285 return make_float (xhash_table (hash_table)->rehash_size); | |
| 1286 } | |
| 1287 | |
| 1288 DEFUN ("hash-table-rehash-threshold", Fhash_table_rehash_threshold, 1, 1, 0, /* | |
| 1289 Return the current rehash threshold of HASH-TABLE. | |
| 1290 This is a float between 0.0 and 1.0; the maximum `load factor' of HASH-TABLE, | |
| 1291 beyond which the HASH-TABLE is enlarged by rehashing. | |
| 1292 */ | |
| 1293 (hash_table)) | |
| 1294 { | |
| 438 | 1295 return make_float (xhash_table (hash_table)->rehash_threshold); |
| 428 | 1296 } |
| 1297 | |
| 1298 DEFUN ("hash-table-weakness", Fhash_table_weakness, 1, 1, 0, /* | |
| 1299 Return the weakness of HASH-TABLE. | |
| 442 | 1300 This can be one of `nil', `key-and-value', `key-or-value', `key' or `value'. |
| 428 | 1301 */ |
| 1302 (hash_table)) | |
| 1303 { | |
| 1304 switch (xhash_table (hash_table)->weakness) | |
| 1305 { | |
| 442 | 1306 case HASH_TABLE_WEAK: return Qkey_and_value; |
| 1307 case HASH_TABLE_KEY_WEAK: return Qkey; | |
| 1308 case HASH_TABLE_KEY_VALUE_WEAK: return Qkey_or_value; | |
| 1309 case HASH_TABLE_VALUE_WEAK: return Qvalue; | |
| 1310 default: return Qnil; | |
| 428 | 1311 } |
| 1312 } | |
| 1313 | |
| 1314 /* obsolete as of 19990901 in xemacs-21.2 */ | |
| 1315 DEFUN ("hash-table-type", Fhash_table_type, 1, 1, 0, /* | |
| 1316 Return the type of HASH-TABLE. | |
| 1317 This can be one of `non-weak', `weak', `key-weak' or `value-weak'. | |
| 1318 */ | |
| 1319 (hash_table)) | |
| 1320 { | |
| 1321 switch (xhash_table (hash_table)->weakness) | |
| 1322 { | |
| 442 | 1323 case HASH_TABLE_WEAK: return Qweak; |
| 1324 case HASH_TABLE_KEY_WEAK: return Qkey_weak; | |
| 1325 case HASH_TABLE_KEY_VALUE_WEAK: return Qkey_or_value_weak; | |
| 1326 case HASH_TABLE_VALUE_WEAK: return Qvalue_weak; | |
| 1327 default: return Qnon_weak; | |
| 428 | 1328 } |
| 1329 } | |
| 1330 | |
| 1331 /************************************************************************/ | |
| 1332 /* Mapping Functions */ | |
| 1333 /************************************************************************/ | |
| 489 | 1334 |
| 1335 /* We need to be careful when mapping over hash tables because the | |
| 1336 hash table might be modified during the mapping operation: | |
| 1337 - by the mapping function | |
| 1338 - by gc (if the hash table is weak) | |
| 1339 | |
| 1340 So we make a copy of the hentries at the beginning of the mapping | |
| 497 | 1341 operation, and iterate over the copy. Naturally, this is |
| 1342 expensive, but not as expensive as you might think, because no | |
| 1343 actual memory has to be collected by our notoriously inefficient | |
| 1344 GC; we use an unwind-protect instead to free the memory directly. | |
| 1345 | |
| 1346 We could avoid the copying by having the hash table modifiers | |
| 1347 puthash and remhash check for currently active mapping functions. | |
| 1348 Disadvantages: it's hard to get right, and IMO hash mapping | |
| 1349 functions are basically rare, and no extra space in the hash table | |
| 1350 object and no extra cpu in puthash or remhash should be wasted to | |
| 1351 make maphash 3% faster. From a design point of view, the basic | |
| 1352 functions gethash, puthash and remhash should be implementable | |
| 1353 without having to think about maphash. | |
| 1354 | |
| 1355 Note: We don't (yet) have Common Lisp's with-hash-table-iterator. | |
| 1356 If you implement this naively, you cannot have more than one | |
| 1357 concurrently active iterator over the same hash table. The `each' | |
| 1358 function in perl has this limitation. | |
| 1359 | |
| 1360 Note: We GCPRO memory on the heap, not on the stack. There is no | |
| 1361 obvious reason why this is bad, but as of this writing this is the | |
| 1362 only known occurrence of this technique in the code. | |
| 504 | 1363 |
| 1364 -- Martin | |
| 1365 */ | |
| 1366 | |
| 1367 /* Ben disagrees with the "copying hentries" design, and says: | |
| 1368 | |
| 1369 Another solution is the same as I've already proposed -- when | |
| 1370 mapping, mark the table as "change-unsafe", and in this case, use a | |
| 1371 secondary table to maintain changes. this could be basically a | |
| 1372 standard hash table, but with entries only for added or deleted | |
| 1373 entries in the primary table, and a marker like Qunbound to | |
| 1374 indicate a deleted entry. puthash, gethash and remhash need a | |
| 1375 single extra check for this secondary table -- totally | |
| 1376 insignificant speedwise. if you really cared about making | |
| 1377 recursive maphashes completely correct, you'd have to do a bit of | |
| 1378 extra work here -- when maphashing, if the secondary table exists, | |
| 1379 make a copy of it, and use the copy in conjunction with the primary | |
| 1380 table when mapping. the advantages of this are | |
| 1381 | |
| 1382 [a] easy to demonstrate correct, even with weak hashtables. | |
| 1383 | |
| 1384 [b] no extra overhead in the general maphash case -- only when you | |
| 1385 modify the table while maphashing, and even then the overhead is | |
| 1386 very small. | |
| 497 | 1387 */ |
| 1388 | |
| 489 | 1389 static Lisp_Object |
| 1390 maphash_unwind (Lisp_Object unwind_obj) | |
| 1391 { | |
| 1392 void *ptr = (void *) get_opaque_ptr (unwind_obj); | |
| 1726 | 1393 xfree (ptr, void *); |
| 489 | 1394 free_opaque_ptr (unwind_obj); |
| 1395 return Qnil; | |
| 1396 } | |
| 1397 | |
| 1398 /* Return a malloced array of alternating key/value pairs from HT. */ | |
| 1399 static Lisp_Object * | |
| 1400 copy_compress_hentries (const Lisp_Hash_Table *ht) | |
| 1401 { | |
| 1402 Lisp_Object * const objs = | |
| 1403 /* If the hash table is empty, ht->count could be 0. */ | |
| 1404 xnew_array (Lisp_Object, 2 * (ht->count > 0 ? ht->count : 1)); | |
| 1204 | 1405 const htentry *e, *sentinel; |
| 489 | 1406 Lisp_Object *pobj; |
| 1407 | |
| 1408 for (e = ht->hentries, sentinel = e + ht->size, pobj = objs; e < sentinel; e++) | |
| 1204 | 1409 if (!HTENTRY_CLEAR_P (e)) |
| 489 | 1410 { |
| 1411 *(pobj++) = e->key; | |
| 1412 *(pobj++) = e->value; | |
| 1413 } | |
| 1414 | |
| 1415 type_checking_assert (pobj == objs + 2 * ht->count); | |
| 1416 | |
| 1417 return objs; | |
| 1418 } | |
| 1419 | |
| 428 | 1420 DEFUN ("maphash", Fmaphash, 2, 2, 0, /* |
| 1421 Map FUNCTION over entries in HASH-TABLE, calling it with two args, | |
| 1422 each key and value in HASH-TABLE. | |
| 1423 | |
| 489 | 1424 FUNCTION must not modify HASH-TABLE, with the one exception that FUNCTION |
| 428 | 1425 may remhash or puthash the entry currently being processed by FUNCTION. |
| 1426 */ | |
| 1427 (function, hash_table)) | |
| 1428 { | |
| 489 | 1429 const Lisp_Hash_Table * const ht = xhash_table (hash_table); |
| 1430 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1431 Lisp_Object args[3]; | |
| 1432 const Lisp_Object *pobj, *end; | |
| 1433 int speccount = specpdl_depth (); | |
| 1434 struct gcpro gcpro1; | |
| 1435 | |
| 1436 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); | |
| 1437 GCPRO1 (objs[0]); | |
| 1438 gcpro1.nvars = 2 * ht->count; | |
| 428 | 1439 |
| 489 | 1440 args[0] = function; |
| 1441 | |
| 1442 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1443 { | |
| 1444 args[1] = pobj[0]; | |
| 1445 args[2] = pobj[1]; | |
| 1446 Ffuncall (countof (args), args); | |
| 1447 } | |
| 1448 | |
| 771 | 1449 unbind_to (speccount); |
| 489 | 1450 UNGCPRO; |
| 428 | 1451 |
| 1452 return Qnil; | |
| 1453 } | |
| 1454 | |
| 489 | 1455 /* Map *C* function FUNCTION over the elements of a non-weak lisp hash table. |
| 1456 FUNCTION must not modify HASH-TABLE, with the one exception that FUNCTION | |
| 1457 may puthash the entry currently being processed by FUNCTION. | |
| 1458 Mapping terminates if FUNCTION returns something other than 0. */ | |
| 428 | 1459 void |
| 489 | 1460 elisp_maphash_unsafe (maphash_function_t function, |
| 428 | 1461 Lisp_Object hash_table, void *extra_arg) |
| 1462 { | |
| 442 | 1463 const Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 1204 | 1464 const htentry *e, *sentinel; |
| 428 | 1465 |
| 1466 for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) | |
| 1204 | 1467 if (!HTENTRY_CLEAR_P (e)) |
| 489 | 1468 if (function (e->key, e->value, extra_arg)) |
| 1469 return; | |
| 428 | 1470 } |
| 1471 | |
| 489 | 1472 /* Map *C* function FUNCTION over the elements of a lisp hash table. |
| 1473 It is safe for FUNCTION to modify HASH-TABLE. | |
| 1474 Mapping terminates if FUNCTION returns something other than 0. */ | |
| 1475 void | |
| 1476 elisp_maphash (maphash_function_t function, | |
| 1477 Lisp_Object hash_table, void *extra_arg) | |
| 1478 { | |
| 1479 const Lisp_Hash_Table * const ht = xhash_table (hash_table); | |
| 1480 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1481 const Lisp_Object *pobj, *end; | |
| 1482 int speccount = specpdl_depth (); | |
| 1483 struct gcpro gcpro1; | |
| 1484 | |
| 1485 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); | |
| 1486 GCPRO1 (objs[0]); | |
| 1487 gcpro1.nvars = 2 * ht->count; | |
| 1488 | |
| 1489 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1490 if (function (pobj[0], pobj[1], extra_arg)) | |
| 1491 break; | |
| 1492 | |
| 771 | 1493 unbind_to (speccount); |
| 489 | 1494 UNGCPRO; |
| 1495 } | |
| 1496 | |
| 1497 /* Remove all elements of a lisp hash table satisfying *C* predicate PREDICATE. | |
| 1498 PREDICATE must not modify HASH-TABLE. */ | |
| 428 | 1499 void |
| 1500 elisp_map_remhash (maphash_function_t predicate, | |
| 1501 Lisp_Object hash_table, void *extra_arg) | |
| 1502 { | |
| 489 | 1503 const Lisp_Hash_Table * const ht = xhash_table (hash_table); |
| 1504 Lisp_Object * const objs = copy_compress_hentries (ht); | |
| 1505 const Lisp_Object *pobj, *end; | |
| 1506 int speccount = specpdl_depth (); | |
| 1507 struct gcpro gcpro1; | |
| 428 | 1508 |
| 489 | 1509 record_unwind_protect (maphash_unwind, make_opaque_ptr ((void *)objs)); |
| 1510 GCPRO1 (objs[0]); | |
| 1511 gcpro1.nvars = 2 * ht->count; | |
| 1512 | |
| 1513 for (pobj = objs, end = pobj + 2 * ht->count; pobj < end; pobj += 2) | |
| 1514 if (predicate (pobj[0], pobj[1], extra_arg)) | |
| 1515 Fremhash (pobj[0], hash_table); | |
| 1516 | |
| 771 | 1517 unbind_to (speccount); |
| 489 | 1518 UNGCPRO; |
| 428 | 1519 } |
| 1520 | |
| 1521 | |
| 1522 /************************************************************************/ | |
| 1523 /* garbage collecting weak hash tables */ | |
| 1524 /************************************************************************/ | |
| 1598 | 1525 #ifdef USE_KKCC |
| 2645 | 1526 #define MARK_OBJ(obj) do { \ |
| 1527 Lisp_Object mo_obj = (obj); \ | |
| 1528 if (!marked_p (mo_obj)) \ | |
| 1529 { \ | |
| 1530 kkcc_gc_stack_push_lisp_object (mo_obj, 0, -1); \ | |
| 1531 did_mark = 1; \ | |
| 1532 } \ | |
| 1598 | 1533 } while (0) |
| 1534 | |
| 1535 #else /* NO USE_KKCC */ | |
| 1536 | |
| 442 | 1537 #define MARK_OBJ(obj) do { \ |
| 1538 Lisp_Object mo_obj = (obj); \ | |
| 1539 if (!marked_p (mo_obj)) \ | |
| 1540 { \ | |
| 1541 mark_object (mo_obj); \ | |
| 1542 did_mark = 1; \ | |
| 1543 } \ | |
| 1544 } while (0) | |
| 1598 | 1545 #endif /*NO USE_KKCC */ |
| 442 | 1546 |
| 428 | 1547 |
| 1548 /* Complete the marking for semi-weak hash tables. */ | |
| 1549 int | |
| 1550 finish_marking_weak_hash_tables (void) | |
| 1551 { | |
| 1552 Lisp_Object hash_table; | |
| 1553 int did_mark = 0; | |
| 1554 | |
| 1555 for (hash_table = Vall_weak_hash_tables; | |
| 1556 !NILP (hash_table); | |
| 1557 hash_table = XHASH_TABLE (hash_table)->next_weak) | |
| 1558 { | |
| 442 | 1559 const Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); |
| 1204 | 1560 const htentry *e = ht->hentries; |
| 1561 const htentry *sentinel = e + ht->size; | |
| 428 | 1562 |
| 1563 if (! marked_p (hash_table)) | |
| 1564 /* The hash table is probably garbage. Ignore it. */ | |
| 1565 continue; | |
| 1566 | |
| 1567 /* Now, scan over all the pairs. For all pairs that are | |
| 1568 half-marked, we may need to mark the other half if we're | |
| 1569 keeping this pair. */ | |
| 1570 switch (ht->weakness) | |
| 1571 { | |
| 1572 case HASH_TABLE_KEY_WEAK: | |
| 1573 for (; e < sentinel; e++) | |
| 1204 | 1574 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1575 if (marked_p (e->key)) |
| 1576 MARK_OBJ (e->value); | |
| 1577 break; | |
| 1578 | |
| 1579 case HASH_TABLE_VALUE_WEAK: | |
| 1580 for (; e < sentinel; e++) | |
| 1204 | 1581 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1582 if (marked_p (e->value)) |
| 1583 MARK_OBJ (e->key); | |
| 1584 break; | |
| 1585 | |
| 442 | 1586 case HASH_TABLE_KEY_VALUE_WEAK: |
| 1587 for (; e < sentinel; e++) | |
| 1204 | 1588 if (!HTENTRY_CLEAR_P (e)) |
| 442 | 1589 { |
| 1590 if (marked_p (e->value)) | |
| 1591 MARK_OBJ (e->key); | |
| 1592 else if (marked_p (e->key)) | |
| 1593 MARK_OBJ (e->value); | |
| 1594 } | |
| 1595 break; | |
| 1596 | |
| 428 | 1597 case HASH_TABLE_KEY_CAR_WEAK: |
| 1598 for (; e < sentinel; e++) | |
| 1204 | 1599 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1600 if (!CONSP (e->key) || marked_p (XCAR (e->key))) |
| 1601 { | |
| 1602 MARK_OBJ (e->key); | |
| 1603 MARK_OBJ (e->value); | |
| 1604 } | |
| 1605 break; | |
| 1606 | |
| 450 | 1607 /* We seem to be sprouting new weakness types at an alarming |
| 1608 rate. At least this is not externally visible - and in | |
| 1609 fact all of these KEY_CAR_* types are only used by the | |
| 1610 glyph code. */ | |
| 1611 case HASH_TABLE_KEY_CAR_VALUE_WEAK: | |
| 1612 for (; e < sentinel; e++) | |
| 1204 | 1613 if (!HTENTRY_CLEAR_P (e)) |
| 450 | 1614 { |
| 1615 if (!CONSP (e->key) || marked_p (XCAR (e->key))) | |
| 1616 { | |
| 1617 MARK_OBJ (e->key); | |
| 1618 MARK_OBJ (e->value); | |
| 1619 } | |
| 1620 else if (marked_p (e->value)) | |
| 1621 MARK_OBJ (e->key); | |
| 1622 } | |
| 1623 break; | |
| 1624 | |
| 428 | 1625 case HASH_TABLE_VALUE_CAR_WEAK: |
| 1626 for (; e < sentinel; e++) | |
| 1204 | 1627 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1628 if (!CONSP (e->value) || marked_p (XCAR (e->value))) |
| 1629 { | |
| 1630 MARK_OBJ (e->key); | |
| 1631 MARK_OBJ (e->value); | |
| 1632 } | |
| 1633 break; | |
| 1634 | |
| 1635 default: | |
| 1636 break; | |
| 1637 } | |
| 1638 } | |
| 1639 | |
| 1640 return did_mark; | |
| 1641 } | |
| 1642 | |
| 1643 void | |
| 1644 prune_weak_hash_tables (void) | |
| 1645 { | |
| 1646 Lisp_Object hash_table, prev = Qnil; | |
| 1647 for (hash_table = Vall_weak_hash_tables; | |
| 1648 !NILP (hash_table); | |
| 1649 hash_table = XHASH_TABLE (hash_table)->next_weak) | |
| 1650 { | |
| 1651 if (! marked_p (hash_table)) | |
| 1652 { | |
| 1653 /* This hash table itself is garbage. Remove it from the list. */ | |
| 1654 if (NILP (prev)) | |
| 1655 Vall_weak_hash_tables = XHASH_TABLE (hash_table)->next_weak; | |
| 1656 else | |
| 1657 XHASH_TABLE (prev)->next_weak = XHASH_TABLE (hash_table)->next_weak; | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 /* Now, scan over all the pairs. Remove all of the pairs | |
| 1662 in which the key or value, or both, is unmarked | |
| 1663 (depending on the weakness of the hash table). */ | |
| 1664 Lisp_Hash_Table *ht = XHASH_TABLE (hash_table); | |
| 1204 | 1665 htentry *entries = ht->hentries; |
| 1666 htentry *sentinel = entries + ht->size; | |
| 1667 htentry *e; | |
| 428 | 1668 |
| 1669 for (e = entries; e < sentinel; e++) | |
| 1204 | 1670 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1671 { |
| 1672 again: | |
| 1673 if (!marked_p (e->key) || !marked_p (e->value)) | |
| 1674 { | |
| 1675 remhash_1 (ht, entries, e); | |
| 1204 | 1676 if (!HTENTRY_CLEAR_P (e)) |
| 428 | 1677 goto again; |
| 1678 } | |
| 1679 } | |
| 1680 | |
| 1681 prev = hash_table; | |
| 1682 } | |
| 1683 } | |
| 1684 } | |
| 1685 | |
| 1686 /* Return a hash value for an array of Lisp_Objects of size SIZE. */ | |
| 1687 | |
| 665 | 1688 Hashcode |
| 428 | 1689 internal_array_hash (Lisp_Object *arr, int size, int depth) |
| 1690 { | |
| 1691 int i; | |
| 665 | 1692 Hashcode hash = 0; |
| 442 | 1693 depth++; |
| 428 | 1694 |
| 1695 if (size <= 5) | |
| 1696 { | |
| 1697 for (i = 0; i < size; i++) | |
| 442 | 1698 hash = HASH2 (hash, internal_hash (arr[i], depth)); |
| 428 | 1699 return hash; |
| 1700 } | |
| 1701 | |
| 1702 /* just pick five elements scattered throughout the array. | |
| 1703 A slightly better approach would be to offset by some | |
| 1704 noise factor from the points chosen below. */ | |
| 1705 for (i = 0; i < 5; i++) | |
| 442 | 1706 hash = HASH2 (hash, internal_hash (arr[i*size/5], depth)); |
| 428 | 1707 |
| 1708 return hash; | |
| 1709 } | |
| 1710 | |
| 1711 /* Return a hash value for a Lisp_Object. This is for use when hashing | |
| 1712 objects with the comparison being `equal' (for `eq', you can just | |
| 1713 use the Lisp_Object itself as the hash value). You need to make a | |
| 1714 tradeoff between the speed of the hash function and how good the | |
| 1715 hashing is. In particular, the hash function needs to be FAST, | |
| 1716 so you can't just traipse down the whole tree hashing everything | |
| 1717 together. Most of the time, objects will differ in the first | |
| 1718 few elements you hash. Thus, we only go to a short depth (5) | |
| 1719 and only hash at most 5 elements out of a vector. Theoretically | |
| 1720 we could still take 5^5 time (a big big number) to compute a | |
| 1721 hash, but practically this won't ever happen. */ | |
| 1722 | |
| 665 | 1723 Hashcode |
| 428 | 1724 internal_hash (Lisp_Object obj, int depth) |
| 1725 { | |
| 1726 if (depth > 5) | |
| 1727 return 0; | |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1728 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1729 if (CONSP(obj)) |
| 428 | 1730 { |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1731 Hashcode hash, h; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1732 int s; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1733 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1734 depth += 1; |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1735 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1736 if (!CONSP(XCDR(obj))) |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1737 { |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1738 /* special case for '(a . b) conses */ |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1739 return HASH2(internal_hash(XCAR(obj), depth), |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1740 internal_hash(XCDR(obj), depth)); |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1741 } |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1742 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1743 /* Don't simply tail recurse; we want to hash lists with the |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1744 same contents in distinct orders differently. */ |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1745 hash = internal_hash(XCAR(obj), depth); |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1746 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1747 obj = XCDR(obj); |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1748 for (s = 1; s < 6 && CONSP(obj); obj = XCDR(obj), s++) |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1749 { |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1750 h = internal_hash(XCAR(obj), depth); |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1751 hash = HASH3(hash, h, s); |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1752 } |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1753 |
|
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4117
diff
changeset
|
1754 return hash; |
| 428 | 1755 } |
| 1756 if (STRINGP (obj)) | |
| 1757 { | |
| 1758 return hash_string (XSTRING_DATA (obj), XSTRING_LENGTH (obj)); | |
| 1759 } | |
| 1760 if (LRECORDP (obj)) | |
| 1761 { | |
| 442 | 1762 const struct lrecord_implementation |
| 428 | 1763 *imp = XRECORD_LHEADER_IMPLEMENTATION (obj); |
| 1764 if (imp->hash) | |
| 1765 return imp->hash (obj, depth); | |
| 1766 } | |
| 1767 | |
| 1768 return LISP_HASH (obj); | |
| 1769 } | |
| 1770 | |
| 1771 DEFUN ("sxhash", Fsxhash, 1, 1, 0, /* | |
| 1772 Return a hash value for OBJECT. | |
| 444 | 1773 \(equal obj1 obj2) implies (= (sxhash obj1) (sxhash obj2)). |
| 428 | 1774 */ |
| 1775 (object)) | |
| 1776 { | |
| 1777 return make_int (internal_hash (object, 0)); | |
| 1778 } | |
| 1779 | |
| 1780 #if 0 | |
| 826 | 1781 DEFUN ("internal-hash-value", Finternal_hash_value, 1, 1, 0, /* |
| 428 | 1782 Hash value of OBJECT. For debugging. |
| 1783 The value is returned as (HIGH . LOW). | |
| 1784 */ | |
| 1785 (object)) | |
| 1786 { | |
| 1787 /* This function is pretty 32bit-centric. */ | |
| 665 | 1788 Hashcode hash = internal_hash (object, 0); |
| 428 | 1789 return Fcons (hash >> 16, hash & 0xffff); |
| 1790 } | |
| 1791 #endif | |
| 1792 | |
| 1793 | |
| 1794 /************************************************************************/ | |
| 1795 /* initialization */ | |
| 1796 /************************************************************************/ | |
| 1797 | |
| 1798 void | |
| 1799 syms_of_elhash (void) | |
| 1800 { | |
| 1801 DEFSUBR (Fhash_table_p); | |
| 1802 DEFSUBR (Fmake_hash_table); | |
| 1803 DEFSUBR (Fcopy_hash_table); | |
| 1804 DEFSUBR (Fgethash); | |
| 1805 DEFSUBR (Fremhash); | |
| 1806 DEFSUBR (Fputhash); | |
| 1807 DEFSUBR (Fclrhash); | |
| 1808 DEFSUBR (Fmaphash); | |
| 1809 DEFSUBR (Fhash_table_count); | |
| 1810 DEFSUBR (Fhash_table_test); | |
| 1811 DEFSUBR (Fhash_table_size); | |
| 1812 DEFSUBR (Fhash_table_rehash_size); | |
| 1813 DEFSUBR (Fhash_table_rehash_threshold); | |
| 1814 DEFSUBR (Fhash_table_weakness); | |
| 1815 DEFSUBR (Fhash_table_type); /* obsolete */ | |
| 1816 DEFSUBR (Fsxhash); | |
| 1817 #if 0 | |
| 1818 DEFSUBR (Finternal_hash_value); | |
| 1819 #endif | |
| 1820 | |
| 563 | 1821 DEFSYMBOL_MULTIWORD_PREDICATE (Qhash_tablep); |
| 1822 DEFSYMBOL (Qhash_table); | |
| 1823 DEFSYMBOL (Qhashtable); | |
| 1824 DEFSYMBOL (Qweakness); | |
| 1825 DEFSYMBOL (Qvalue); | |
| 1826 DEFSYMBOL (Qkey_or_value); | |
| 1827 DEFSYMBOL (Qkey_and_value); | |
| 1828 DEFSYMBOL (Qrehash_size); | |
| 1829 DEFSYMBOL (Qrehash_threshold); | |
| 428 | 1830 |
| 563 | 1831 DEFSYMBOL (Qweak); /* obsolete */ |
| 1832 DEFSYMBOL (Qkey_weak); /* obsolete */ | |
| 1833 DEFSYMBOL (Qkey_or_value_weak); /* obsolete */ | |
| 1834 DEFSYMBOL (Qvalue_weak); /* obsolete */ | |
| 1835 DEFSYMBOL (Qnon_weak); /* obsolete */ | |
| 428 | 1836 |
| 563 | 1837 DEFKEYWORD (Q_test); |
| 1838 DEFKEYWORD (Q_size); | |
| 1839 DEFKEYWORD (Q_rehash_size); | |
| 1840 DEFKEYWORD (Q_rehash_threshold); | |
| 1841 DEFKEYWORD (Q_weakness); | |
| 1842 DEFKEYWORD (Q_type); /* obsolete */ | |
| 428 | 1843 } |
| 1844 | |
| 1845 void | |
| 771 | 1846 init_elhash_once_early (void) |
| 428 | 1847 { |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1848 INIT_LISP_OBJECT (hash_table); |
| 3092 | 1849 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
1850 INIT_LISP_OBJECT (hash_table_entry); |
| 3092 | 1851 #endif /* NEW_GC */ |
| 771 | 1852 |
| 428 | 1853 /* This must NOT be staticpro'd */ |
| 1854 Vall_weak_hash_tables = Qnil; | |
| 452 | 1855 dump_add_weak_object_chain (&Vall_weak_hash_tables); |
| 428 | 1856 } |