diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2003-02-19 15:04:51 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2003-02-19 15:04:51 +0000 |
commit | c35738c1ae80f3ed9ae7c54532f6477cf7cc8bde (patch) | |
tree | ce2a3e148d68ca7c3f108894fd55e1fb2539da83 /libguile/symbols.c | |
parent | 0a4c1355501a17924b3aa4dfed0c8d8121fa378f (diff) | |
download | guile-c35738c1ae80f3ed9ae7c54532f6477cf7cc8bde.tar.gz |
* hooks.c (scm_c_hook_add): Fixed bug in append mode.
* environments.c (obarray_enter, obarray_retrieve, obarray_remove,
leaf_environment_fold, obarray_remove_all): Use hashtable
accessors.
* gc.c (scm_init_storage): Moved hook initialization to
scm_storage_prehistory.
(scm_storage_prehistory): New function.
(scm_igc): Added commentary about placement of
scm_after_sweep_c_hook.
* gc-mark.c (scm_mark_all): Use hashtable accessors.
(scm_gc_mark_dependencies): Use SCM_WVECT_WEAK_KEY_P and
SCM_WVECT_WEAK_VALUE_P.
* hashtab.c, hashtab.h (scm_hash_for_each, scm_hash_map): New
functions.
(scm_vector_to_hash_table, scm_c_make_resizing_hash_table):
Removed.
(scm_make_weak_key_hash_table, scm_make_weak_value_hash_table,
scm_make_doubly_weak_hash_table): Moved here from weaks.c.
* init.c (scm_init_guile_1): Removed call to scm_init_weaks; Added
calls to scm_storage_prehistory and scm_hashtab_prehistory.
* modules.c (module-reverse-lookup): Use hashtable accessors.
* symbols.c, symbols.h (scm_i_hash_symbol): New function.
* weaks.c, weaks.h (scm_make_weak_key_alist_vector,
scm_make_weak_value_alist_vector,
scm_make_doubly_weak_alist_vector): New functions.
* weaks.c (scm_init_weaks_builtins): New function.
* weaks.h (SCM_WVECTF_WEAK_KEY, SCM_WVECTF_WEAK_VALUE,
SCM_WVECTF_NOSCAN, SCM_WVECT_WEAK_KEY_P, SCM_WVECT_WEAK_VALUE_P,
SCM_WVECT_NOSCAN_P): New macros.
* weaks.c (scm_scan_weak_vectors): Use SCM_WVECT_WEAK_KEY_P
and SCM_WVECT_WEAK_VALUE_P.
* weaks.c, weaks.h (scm_i_allocate_weak_vector): Renamed from
allocate_weak_vector and exported.
* Makefile.am (ice9_sources): Added weak-vector.scm.
* weak-vector.scm: New file.
* boot-9.scm (module-clear!): Use hash-clear!.
(module-for-each): Use hash-for-each.
(module-map): Use hash-map.
Diffstat (limited to 'libguile/symbols.c')
-rw-r--r-- | libguile/symbols.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/libguile/symbols.c b/libguile/symbols.c index 021fb7fd5..1c1a86bed 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,19 +83,40 @@ SCM_DEFINE (scm_sys_symbols, "%symbols", 0, 0, 0, /* {Symbols} */ +/* In order to optimize reading speed, this function breaks part of + * the hashtable abstraction. The optimizations are: + * + * 1. The argument string can be compared directly to symbol objects + * without first creating an SCM string object. (This would have + * been necessary if we had used the hashtable API in hashtab.h.) + * + * 2. We can use the raw hash value stored in SCM_SYMBOL_HASH (sym) + * to speed up lookup. + * + * Both optimizations might be possible without breaking the + * abstraction if the API in hashtab.c is improved. + */ + +unsigned long +scm_i_hash_symbol (SCM obj, unsigned long n, void *closure) +{ + return SCM_SYMBOL_HASH (obj) % n; +} SCM scm_mem2symbol (const char *name, size_t len) { - size_t raw_hash = scm_string_hash ((const unsigned char *) name, len)/2; - size_t hash = raw_hash % SCM_VECTOR_LENGTH (symbols); + size_t raw_hash = scm_string_hash ((const unsigned char *) name, len) / 2; + size_t hash = raw_hash % SCM_HASHTABLE_N_BUCKETS (symbols); { /* Try to find the symbol in the symbols table */ SCM l; - for (l = SCM_VELTS (symbols) [hash]; !SCM_NULLP (l); l = SCM_CDR (l)) + for (l = SCM_HASHTABLE_BUCKETS (symbols) [hash]; + !SCM_NULLP (l); + l = SCM_CDR (l)) { SCM sym = SCM_CAAR (l); if (SCM_SYMBOL_HASH (sym) == raw_hash @@ -126,9 +147,12 @@ scm_mem2symbol (const char *name, size_t len) raw_hash, SCM_UNPACK (scm_cons (SCM_BOOL_F, SCM_EOL))); - SCM slot = SCM_VELTS (symbols) [hash]; + SCM slot = SCM_HASHTABLE_BUCKETS (symbols) [hash]; SCM cell = scm_cons (symbol, SCM_UNDEFINED); - SCM_VECTOR_SET (symbols, hash, scm_cons (cell, slot)); + SCM_SET_HASHTABLE_BUCKET (symbols, hash, scm_cons (cell, slot)); + SCM_HASHTABLE_INCREMENT (symbols); + if (SCM_HASHTABLE_N_ITEMS (symbols) > SCM_HASHTABLE_UPPER (symbols)) + scm_i_rehash (symbols, scm_i_hash_symbol, 0, "scm_mem2symbol"); return symbol; } |