ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/lookup.c
(Generate patch)

Comparing ray/src/common/lookup.c (file contents):
Revision 2.2 by greg, Tue Apr 11 13:33:37 1995 UTC vs.
Revision 2.5 by gwlarson, Thu Sep 3 14:22:23 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4 < static char SCCSid[] = "$SunId$ LBL";
4 > static char SCCSid[] = "$SunId$ SGI";
5   #endif
6  
7   /*
# Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   #include <stdio.h>
12   #include "lookup.h"
13  
14 + #ifdef  NOSTRUCTASS
15 + #define  copystruct(d,s)        bcopy((char *)(s),(char *)(d),sizeof(*(d)))
16 + #else
17 + #define  copystruct(d,s)        (*(d) = *(s))
18 + #endif
19 +
20   #define MEM_PTR         char *
21  
22   extern MEM_PTR  calloc();
# Line 22 | Line 28 | register LUTAB *tbl;
28   int     nel;
29   {
30          static int  hsiztab[] = {
31 <                31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, 0
31 >                31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
32 >                32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
33 >                4194301, 8388593, 0
34          };
35          register int  *hsp;
36  
# Line 40 | Line 48 | int    nel;
48   }
49  
50  
51 < long
51 > unsigned long
52   lu_shash(s)                     /* hash a nul-terminated string */
53 < register char  *s;
53 > char    *s;
54   {
55 +        static unsigned char shuffle[256] = {
56 +                0, 157, 58, 215, 116, 17, 174, 75, 232, 133, 34,
57 +                191, 92, 249, 150, 51, 208, 109, 10, 167, 68, 225,
58 +                126, 27, 184, 85, 242, 143, 44, 201, 102, 3, 160,
59 +                61, 218, 119, 20, 177, 78, 235, 136, 37, 194, 95,
60 +                252, 153, 54, 211, 112, 13, 170, 71, 228, 129, 30,
61 +                187, 88, 245, 146, 47, 204, 105, 6, 163, 64, 221,
62 +                122, 23, 180, 81, 238, 139, 40, 197, 98, 255, 156,
63 +                57, 214, 115, 16, 173, 74, 231, 132, 33, 190, 91,
64 +                248, 149, 50, 207, 108, 9, 166, 67, 224, 125, 26,
65 +                183, 84, 241, 142, 43, 200, 101, 2, 159, 60, 217,
66 +                118, 19, 176, 77, 234, 135, 36, 193, 94, 251, 152,
67 +                53, 210, 111, 12, 169, 70, 227, 128, 29, 186, 87,
68 +                244, 145, 46, 203, 104, 5, 162, 63, 220, 121, 22,
69 +                179, 80, 237, 138, 39, 196, 97, 254, 155, 56, 213,
70 +                114, 15, 172, 73, 230, 131, 32, 189, 90, 247, 148,
71 +                49, 206, 107, 8, 165, 66, 223, 124, 25, 182, 83,
72 +                240, 141, 42, 199, 100, 1, 158, 59, 216, 117, 18,
73 +                175, 76, 233, 134, 35, 192, 93, 250, 151, 52, 209,
74 +                110, 11, 168, 69, 226, 127, 28, 185, 86, 243, 144,
75 +                45, 202, 103, 4, 161, 62, 219, 120, 21, 178, 79,
76 +                236, 137, 38, 195, 96, 253, 154, 55, 212, 113, 14,
77 +                171, 72, 229, 130, 31, 188, 89, 246, 147, 48, 205,
78 +                106, 7, 164, 65, 222, 123, 24, 181, 82, 239, 140,
79 +                41, 198, 99
80 +        };
81          register int    i = 0;
82 <        register long   h = 0;
82 >        register unsigned long  h = 0;
83 >        register unsigned char *t = (unsigned char *)s;
84  
85 <        while (*s)
86 <                h ^= (long)(*s++ & 0xff) << (i++ & 0xf);
85 >        while (*t)
86 >                h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf);
87 >
88          return(h);
89   }
90  
# Line 58 | Line 94 | lu_find(tbl, key)              /* find a table entry */
94   register LUTAB  *tbl;
95   char    *key;
96   {
97 <        long    hval;
98 <        int     i;
97 >        unsigned long   hval;
98 >        int     i, n;
99          register int    ndx;
100 <        register LUENT  *oldtabl;
100 >        register LUENT  *le;
101                                          /* look up object */
102 +        if (tbl->tsiz == 0 && !lu_init(tbl, 1))
103 +                return(NULL);
104          hval = (*tbl->hashf)(key);
105   tryagain:
106 <        for (i = 0; i < tbl->tsiz; i++) {
107 <                ndx = (hval + i*i) % tbl->tsiz;
108 <                if (tbl->tabl[ndx].key == NULL) {
109 <                        tbl->tabl[ndx].hval = hval;
110 <                        return(&tbl->tabl[ndx]);
106 >        ndx = hval % tbl->tsiz;
107 >        for (i = 0, n = 1; i < tbl->tsiz; i++, n += 2) {
108 >                le = &tbl->tabl[ndx];
109 >                if (le->key == NULL) {
110 >                        le->hval = hval;
111 >                        return(le);
112                  }
113 <                if ( tbl->tabl[ndx].hval == hval && (tbl->keycmp == NULL ||
114 <                                !(*tbl->keycmp)(tbl->tabl[ndx].key, key)) )
115 <                        return(&tbl->tabl[ndx]);
113 >                if (le->hval == hval &&
114 >                      (tbl->keycmp == NULL || !(*tbl->keycmp)(le->key, key))) {
115 >                        return(le);
116 >                }
117 >                if ((ndx += n) >= tbl->tsiz)    /* this happens rarely */
118 >                        ndx = ndx % tbl->tsiz;
119          }
120                                          /* table is full, reallocate */
121 <        oldtabl = tbl->tabl;
121 >        le = tbl->tabl;
122          ndx = tbl->tsiz;
123          i = tbl->ndel;
124          if (!lu_init(tbl, ndx-i+1)) {   /* no more memory! */
125 <                tbl->tabl = oldtabl;
125 >                tbl->tabl = le;
126                  tbl->tsiz = ndx;
127                  tbl->ndel = i;
128                  return(NULL);
129          }
88 –        if (!ndx)
89 –                goto tryagain;
130          /*
131           * The following code may fail if the user has reclaimed many
132           * deleted entries and the system runs out of memory in a
133           * recursive call to lu_find().
134           */
135          while (ndx--)
136 <                if (oldtabl[ndx].key != NULL)
137 <                        if (oldtabl[ndx].data != NULL)
138 <                                *lu_find(tbl, oldtabl[ndx].key) = oldtabl[ndx];
136 >                if (le[ndx].key != NULL)
137 >                        if (le[ndx].data != NULL)
138 >                                copystruct(lu_find(tbl,le[ndx].key), &le[ndx]);
139                          else if (tbl->freek != NULL)
140 <                                (*tbl->freek)(oldtabl[ndx].key);
141 <        free((MEM_PTR)oldtabl);
140 >                                (*tbl->freek)(le[ndx].key);
141 >        free((MEM_PTR)le);
142          goto tryagain;                  /* should happen only once! */
143   }
144  
# Line 118 | Line 158 | char   *key;
158                  (*tbl->freed)(le->data);
159          le->data = NULL;
160          tbl->ndel++;
161 + }
162 +
163 +
164 + int
165 + lu_doall(tbl, f)                /* loop through all valid table entries */
166 + register LUTAB  *tbl;
167 + int     (*f)();
168 + {
169 +        int     rval = 0;
170 +        register LUENT  *tp;
171 +
172 +        for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
173 +                if (tp->data != NULL)
174 +                        if (f != NULL)
175 +                                rval += (*f)(tp);
176 +                        else
177 +                                rval++;
178 +        return(rval);
179   }
180  
181  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines