--- ray/src/common/lookup.c 1997/12/03 10:59:30 2.3 +++ ray/src/common/lookup.c 2003/02/22 02:07:22 2.6 @@ -1,21 +1,78 @@ -/* Copyright (c) 1997 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: lookup.c,v 2.6 2003/02/22 02:07:22 greg Exp $"; #endif - /* * Table lookup routines */ +/* ==================================================================== + * The Radiance Software License, Version 1.0 + * + * Copyright (c) 1990 - 2002 The Regents of the University of California, + * through Lawrence Berkeley National Laboratory. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes Radiance software + * (http://radsite.lbl.gov/) + * developed by the Lawrence Berkeley National Laboratory + * (http://www.lbl.gov/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + * and "The Regents of the University of California" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact radiance@radsite.lbl.gov. + * + * 5. Products derived from this software may not be called "Radiance", + * nor may "Radiance" appear in their name, without prior written + * permission of Lawrence Berkeley National Laboratory. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of Lawrence Berkeley National Laboratory. For more + * information on Lawrence Berkeley National Laboratory, please see + * . + */ + #include +#include #include "lookup.h" -#define MEM_PTR char * +#ifdef NOSTRUCTASS +#define copystruct(d,s) bcopy((char *)(s),(char *)(d),sizeof(*(d))) +#else +#define copystruct(d,s) (*(d) = *(s)) +#endif -extern MEM_PTR calloc(); - int lu_init(tbl, nel) /* initialize tbl for at least nel elements */ register LUTAB *tbl; @@ -42,7 +99,7 @@ int nel; } -long +unsigned long lu_shash(s) /* hash a nul-terminated string */ char *s; { @@ -73,11 +130,11 @@ char *s; 41, 198, 99 }; register int i = 0; - register long h = 0; + register unsigned long h = 0; register unsigned char *t = (unsigned char *)s; while (*t) - h ^= (long)shuffle[*t++] << ((i+=11) & 0xf); + h ^= (unsigned long)shuffle[*t++] << ((i+=11) & 0xf); return(h); } @@ -88,18 +145,18 @@ lu_find(tbl, key) /* find a table entry */ register LUTAB *tbl; char *key; { - long hval; + unsigned long hval; int i, n; register int ndx; register LUENT *le; /* look up object */ - if (tbl->tsiz == 0) - lu_init(tbl, 1); + if (tbl->tsiz == 0 && !lu_init(tbl, 1)) + return(NULL); hval = (*tbl->hashf)(key); tryagain: ndx = hval % tbl->tsiz; - le = &tbl->tabl[ndx]; for (i = 0, n = 1; i < tbl->tsiz; i++, n += 2) { + le = &tbl->tabl[ndx]; if (le->key == NULL) { le->hval = hval; return(le); @@ -108,11 +165,8 @@ tryagain: (tbl->keycmp == NULL || !(*tbl->keycmp)(le->key, key))) { return(le); } - le += n; - if ((ndx += n) >= tbl->tsiz) { /* this happens rarely */ + if ((ndx += n) >= tbl->tsiz) /* this happens rarely */ ndx = ndx % tbl->tsiz; - le = &tbl->tabl[ndx]; - } } /* table is full, reallocate */ le = tbl->tabl; @@ -124,8 +178,6 @@ tryagain: tbl->ndel = i; return(NULL); } - if (!ndx) - goto tryagain; /* * The following code may fail if the user has reclaimed many * deleted entries and the system runs out of memory in a @@ -134,10 +186,10 @@ tryagain: while (ndx--) if (le[ndx].key != NULL) if (le[ndx].data != NULL) - *lu_find(tbl, le[ndx].key) = le[ndx]; + copystruct(lu_find(tbl,le[ndx].key), &le[ndx]); else if (tbl->freek != NULL) (*tbl->freek)(le[ndx].key); - free((MEM_PTR)le); + free((void *)le); goto tryagain; /* should happen only once! */ } @@ -160,6 +212,24 @@ char *key; } +int +lu_doall(tbl, f) /* loop through all valid table entries */ +register LUTAB *tbl; +int (*f)(); +{ + int rval = 0; + register LUENT *tp; + + for (tp = tbl->tabl + tbl->tsiz; tp-- > tbl->tabl; ) + if (tp->data != NULL) + if (f != NULL) + rval += (*f)(tp); + else + rval++; + return(rval); +} + + void lu_done(tbl) /* free table and contents */ register LUTAB *tbl; @@ -175,7 +245,7 @@ register LUTAB *tbl; if (tp->data != NULL && tbl->freed != NULL) (*tbl->freed)(tp->data); } - free((MEM_PTR)tbl->tabl); + free((void *)tbl->tabl); tbl->tabl = NULL; tbl->tsiz = 0; tbl->ndel = 0;