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.3 by gregl, Wed Dec 3 10:59:30 1997 UTC vs.
Revision 2.6 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1997 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Table lookup routines
6   */
7  
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10 + *
11 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 + *
14 + * Redistribution and use in source and binary forms, with or without
15 + * modification, are permitted provided that the following conditions
16 + * are met:
17 + *
18 + * 1. Redistributions of source code must retain the above copyright
19 + *         notice, this list of conditions and the following disclaimer.
20 + *
21 + * 2. Redistributions in binary form must reproduce the above copyright
22 + *       notice, this list of conditions and the following disclaimer in
23 + *       the documentation and/or other materials provided with the
24 + *       distribution.
25 + *
26 + * 3. The end-user documentation included with the redistribution,
27 + *           if any, must include the following acknowledgment:
28 + *             "This product includes Radiance software
29 + *                 (http://radsite.lbl.gov/)
30 + *                 developed by the Lawrence Berkeley National Laboratory
31 + *               (http://www.lbl.gov/)."
32 + *       Alternately, this acknowledgment may appear in the software itself,
33 + *       if and wherever such third-party acknowledgments normally appear.
34 + *
35 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 + *       and "The Regents of the University of California" must
37 + *       not be used to endorse or promote products derived from this
38 + *       software without prior written permission. For written
39 + *       permission, please contact [email protected].
40 + *
41 + * 5. Products derived from this software may not be called "Radiance",
42 + *       nor may "Radiance" appear in their name, without prior written
43 + *       permission of Lawrence Berkeley National Laboratory.
44 + *
45 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 + * SUCH DAMAGE.
57 + * ====================================================================
58 + *
59 + * This software consists of voluntary contributions made by many
60 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 + * information on Lawrence Berkeley National Laboratory, please see
62 + * <http://www.lbl.gov/>.
63 + */
64 +
65   #include <stdio.h>
66 + #include <stdlib.h>
67   #include "lookup.h"
68  
69 < #define MEM_PTR         char *
69 > #ifdef  NOSTRUCTASS
70 > #define  copystruct(d,s)        bcopy((char *)(s),(char *)(d),sizeof(*(d)))
71 > #else
72 > #define  copystruct(d,s)        (*(d) = *(s))
73 > #endif
74  
16 – extern MEM_PTR  calloc();
75  
18 –
76   int
77   lu_init(tbl, nel)               /* initialize tbl for at least nel elements */
78   register LUTAB  *tbl;
# Line 42 | Line 99 | int    nel;
99   }
100  
101  
102 < long
102 > unsigned long
103   lu_shash(s)                     /* hash a nul-terminated string */
104   char    *s;
105   {
# Line 73 | Line 130 | char   *s;
130                  41, 198, 99
131          };
132          register int    i = 0;
133 <        register long   h = 0;
133 >        register unsigned long  h = 0;
134          register unsigned char *t = (unsigned char *)s;
135  
136          while (*t)
137 <                h ^= (long)shuffle[*t++] << ((i+=11) & 0xf);
137 >                h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf);
138  
139          return(h);
140   }
# Line 88 | Line 145 | lu_find(tbl, key)              /* find a table entry */
145   register LUTAB  *tbl;
146   char    *key;
147   {
148 <        long    hval;
148 >        unsigned long   hval;
149          int     i, n;
150          register int    ndx;
151          register LUENT  *le;
152                                          /* look up object */
153 <        if (tbl->tsiz == 0)
154 <                lu_init(tbl, 1);
153 >        if (tbl->tsiz == 0 && !lu_init(tbl, 1))
154 >                return(NULL);
155          hval = (*tbl->hashf)(key);
156   tryagain:
157          ndx = hval % tbl->tsiz;
101 –        le = &tbl->tabl[ndx];
158          for (i = 0, n = 1; i < tbl->tsiz; i++, n += 2) {
159 +                le = &tbl->tabl[ndx];
160                  if (le->key == NULL) {
161                          le->hval = hval;
162                          return(le);
# Line 108 | Line 165 | tryagain:
165                        (tbl->keycmp == NULL || !(*tbl->keycmp)(le->key, key))) {
166                          return(le);
167                  }
168 <                le += n;
112 <                if ((ndx += n) >= tbl->tsiz) {  /* this happens rarely */
168 >                if ((ndx += n) >= tbl->tsiz)    /* this happens rarely */
169                          ndx = ndx % tbl->tsiz;
114 –                        le = &tbl->tabl[ndx];
115 –                }
170          }
171                                          /* table is full, reallocate */
172          le = tbl->tabl;
# Line 124 | Line 178 | tryagain:
178                  tbl->ndel = i;
179                  return(NULL);
180          }
127 –        if (!ndx)
128 –                goto tryagain;
181          /*
182           * The following code may fail if the user has reclaimed many
183           * deleted entries and the system runs out of memory in a
# Line 134 | Line 186 | tryagain:
186          while (ndx--)
187                  if (le[ndx].key != NULL)
188                          if (le[ndx].data != NULL)
189 <                                *lu_find(tbl, le[ndx].key) = le[ndx];
189 >                                copystruct(lu_find(tbl,le[ndx].key), &le[ndx]);
190                          else if (tbl->freek != NULL)
191                                  (*tbl->freek)(le[ndx].key);
192 <        free((MEM_PTR)le);
192 >        free((void *)le);
193          goto tryagain;                  /* should happen only once! */
194   }
195  
# Line 160 | Line 212 | char   *key;
212   }
213  
214  
215 + int
216 + lu_doall(tbl, f)                /* loop through all valid table entries */
217 + register LUTAB  *tbl;
218 + int     (*f)();
219 + {
220 +        int     rval = 0;
221 +        register LUENT  *tp;
222 +
223 +        for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; )
224 +                if (tp->data != NULL)
225 +                        if (f != NULL)
226 +                                rval += (*f)(tp);
227 +                        else
228 +                                rval++;
229 +        return(rval);
230 + }
231 +
232 +
233   void
234   lu_done(tbl)                    /* free table and contents */
235   register LUTAB  *tbl;
# Line 175 | Line 245 | register LUTAB *tbl;
245                          if (tp->data != NULL && tbl->freed != NULL)
246                                  (*tbl->freed)(tp->data);
247                  }
248 <        free((MEM_PTR)tbl->tabl);
248 >        free((void *)tbl->tabl);
249          tbl->tabl = NULL;
250          tbl->tsiz = 0;
251          tbl->ndel = 0;

Diff Legend

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