guile/guile-core/libguile ChangeLog symbols.c

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/11/01 08:59:45

Modified files:
        guile-core/libguile: ChangeLog symbols.c 

Log message:
        * Don't recompute symbol hash values.  The symbol holds them already.
        * Speed up interning of symbols by comparing hash values.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1157&r2=1.1158
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/symbols.c.diff?r1=1.62&r2=1.63

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1157 
guile/guile-core/libguile/ChangeLog:1.1158
--- guile/guile-core/libguile/ChangeLog:1.1157  Mon Oct 30 09:47:52 2000
+++ guile/guile-core/libguile/ChangeLog Wed Nov  1 08:59:45 2000
@@ -1,3 +1,12 @@
+2000-11-01  Dirk Herrmann  <address@hidden>
+
+       * symbols.c (scm_sym2vcell, scm_sym2ovcell_soft,
+       scm_intern_symbol, scm_unintern_symbol):  Symbol objects already
+       hold their hash values, no need to recompute them.
+
+       (scm_intern_obarray_soft):  Speed up search for a matching symbol
+       by comparing the hash values first.
+
 2000-10-30  Dirk Herrmann  <address@hidden>
 
        * unif.c (scm_make_uve, scm_dimensions_to_uniform_array):  Don't
Index: guile/guile-core/libguile/symbols.c
diff -u guile/guile-core/libguile/symbols.c:1.62 
guile/guile-core/libguile/symbols.c:1.63
--- guile/guile-core/libguile/symbols.c:1.62    Mon Oct 30 03:42:26 2000
+++ guile/guile-core/libguile/symbols.c Wed Nov  1 08:59:45 2000
@@ -143,8 +143,7 @@
       SCM lsym;
       SCM * lsymp;
       SCM z;
-      scm_sizet hash
-       = scm_string_hash (SCM_SYMBOL_UCHARS (sym), SCM_SYMBOL_LENGTH (sym)) % 
scm_symhash_dim;
+      scm_sizet hash = SCM_SYMBOL_HASH (sym) % scm_symhash_dim;
 
       SCM_DEFER_INTS;
       for (lsym = SCM_VELTS (scm_symhash)[hash]; SCM_NIMP (lsym); lsym = 
SCM_CDR (lsym))
@@ -188,8 +187,7 @@
 scm_sym2ovcell_soft (SCM sym, SCM obarray)
 {
   SCM lsym, z;
-  scm_sizet hash 
-    = scm_string_hash (SCM_SYMBOL_UCHARS (sym), SCM_SYMBOL_LENGTH (sym)) % 
SCM_VECTOR_LENGTH (obarray);
+  scm_sizet hash = SCM_SYMBOL_HASH (sym) % SCM_VECTOR_LENGTH (obarray);
   SCM_REDEFER_INTS;
   for (lsym = SCM_VELTS (obarray)[hash];
        SCM_NIMP (lsym);
@@ -265,6 +263,8 @@
       SCM a = SCM_CAR (lsym);
       SCM z = SCM_CAR (a);
       unsigned char *tmp = SCM_SYMBOL_UCHARS (z);
+      if (SCM_SYMBOL_HASH (z) != raw_hash)
+       goto trynext;
       if (SCM_SYMBOL_LENGTH (z) != len)
        goto trynext;
       for (i = len; i--;)
@@ -557,7 +557,7 @@
   if (SCM_FALSEP (o))
     o = scm_symhash;
   SCM_VALIDATE_VECTOR (1,o);
-  hval = scm_string_hash (SCM_SYMBOL_UCHARS (s), SCM_SYMBOL_LENGTH (s)) % 
SCM_VECTOR_LENGTH (o);
+  hval = SCM_SYMBOL_HASH (s) % SCM_VECTOR_LENGTH (o);
   /* If the symbol is already interned, simply return. */
   SCM_REDEFER_INTS;
   {
@@ -594,7 +594,7 @@
   if (SCM_FALSEP (o))
     o = scm_symhash;
   SCM_VALIDATE_VECTOR (1,o);
-  hval = scm_string_hash (SCM_SYMBOL_UCHARS (s), SCM_SYMBOL_LENGTH (s)) % 
SCM_VECTOR_LENGTH (o);
+  hval = SCM_SYMBOL_HASH (s) % SCM_VECTOR_LENGTH (o);
   SCM_DEFER_INTS;
   {
     SCM lsym_follow;