--- ray/src/common/objset.c 1997/03/07 15:45:28 2.4 +++ ray/src/common/objset.c 2023/03/18 15:21:17 2.18 @@ -1,15 +1,14 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: objset.c,v 2.18 2023/03/18 15:21:17 greg Exp $"; #endif - /* * objset.c - routines for maintaining object sets. * - * 7/28/85 + * External symbols declared in object.h */ +#include "copyright.h" + #include "standard.h" #include "octree.h" @@ -17,21 +16,30 @@ static char SCCSid[] = "$SunId$ LBL"; #include "object.h" #ifndef OSTSIZ -#ifdef BIGMEM -#define OSTSIZ 56437 /* object table size (a prime!) */ +#ifdef SMLMEM +#define OSTSIZ 32749 /* object table size (a prime!) */ #else -#define OSTSIZ 12329 /* object table size (a prime!) */ +#define OSTSIZ 1002583 /* object table size (a prime!) */ #endif #endif +#undef xtra_long +#ifdef _WIN64 +typedef unsigned long long int xtra_long; +#else +typedef unsigned long int xtra_long; +#endif + static OBJECT *ostable[OSTSIZ]; /* the object set table */ -insertelem(os, obj) /* insert obj into os, no questions */ -register OBJECT *os; -OBJECT obj; +void +insertelem( /* insert obj into os, no questions */ + OBJECT *os, + OBJECT obj +) { - register int i; + int i; for (i = os[0]++; i > 0; i--) if (os[i] > obj) @@ -42,11 +50,13 @@ OBJECT obj; } -deletelem(os, obj) /* delete obj from os, no questions */ -register OBJECT *os; -OBJECT obj; +void +deletelem( /* delete obj from os, no questions */ + OBJECT *os, + OBJECT obj +) { - register int i; + int i; i = (*os)--; os++; @@ -61,15 +71,24 @@ OBJECT obj; } -inset(os, obj) /* determine if object is in set */ -register OBJECT *os; -OBJECT obj; +int +inset( /* determine if object is in set */ + OBJECT *os, + OBJECT obj +) { int upper, lower; - register int cm, i; + int cm, i; + if ((i = os[0]) <= 12) { /* linear search algorithm */ + cm = obj; + while (i-- > 0) + if (*++os == cm) + return(1); + return(0); + } lower = 1; - upper = cm = os[0] + 1; + upper = cm = i + 1; /* binary search algorithm */ while ((i = (lower + upper) >> 1) != cm) { cm = obj - os[i]; @@ -85,10 +104,13 @@ OBJECT obj; } -setequal(os1, os2) /* determine if two sets are equal */ -register OBJECT *os1, *os2; +int +setequal( /* determine if two sets are equal */ + OBJECT *os1, + OBJECT *os2 +) { - register int i; + int i; for (i = *os1; i-- >= 0; ) if (*os1++ != *os2++) @@ -97,10 +119,13 @@ register OBJECT *os1, *os2; } -setcopy(os1, os2) /* copy object set os2 into os1 */ -register OBJECT *os1, *os2; +void +setcopy( /* copy object set os2 into os1 */ + OBJECT *os1, + OBJECT *os2 +) { - register int i; + int i; for (i = *os2; i-- >= 0; ) *os1++ = *os2++; @@ -108,12 +133,13 @@ register OBJECT *os1, *os2; OBJECT * -setsave(os) /* allocate space and save set */ -register OBJECT *os; +setsave( /* allocate space and save set */ + OBJECT *os +) { OBJECT *osnew; - register OBJECT *oset; - register int i; + OBJECT *oset; + int i; if ((osnew = oset = (OBJECT *)malloc((*os+1)*sizeof(OBJECT))) == NULL) error(SYSTEM, "out of memory in setsave\n"); @@ -123,10 +149,14 @@ register OBJECT *os; } -setunion(osr, os1, os2) /* osr = os1 Union os2 */ -register OBJECT *osr, *os1, *os2; +void +setunion( /* osr = os1 Union os2 */ + OBJECT *osr, + OBJECT *os1, + OBJECT *os2 +) { - register int i1, i2; + int i1, i2; osr[0] = 0; for (i1 = i2 = 1; i1 <= os1[0] || i2 <= os2[0]; ) { @@ -142,10 +172,14 @@ register OBJECT *osr, *os1, *os2; } -setintersect(osr, os1, os2) /* osr = os1 Intersect os2 */ -register OBJECT *osr, *os1, *os2; +void +setintersect( /* osr = os1 Intersect os2 */ + OBJECT *osr, + OBJECT *os1, + OBJECT *os2 +) { - register int i1, i2; + int i1, i2; osr[0] = 0; if (os1[0] <= 0) @@ -164,14 +198,15 @@ register OBJECT *osr, *os1, *os2; OCTREE -fullnode(oset) /* return octree for object set */ -OBJECT *oset; +fullnode( /* return octree for object set */ + OBJECT *oset +) { - int osentry, ntries; - long hval; + unsigned int ntries; + xtra_long hval; OCTREE ot; - register int i; - register OBJECT *os; + int osentry, i; + OBJECT *os; /* hash on set */ hval = 0; os = oset; @@ -180,7 +215,7 @@ OBJECT *oset; hval += *os++; ntries = 0; tryagain: - osentry = (hval + (long)ntries*ntries) % OSTSIZ; + osentry = (hval + (xtra_long)ntries*ntries) % OSTSIZ; os = ostable[osentry]; if (os == NULL) { os = ostable[osentry] = (OBJECT *)malloc( @@ -196,15 +231,16 @@ tryagain: ot = oseti(i*OSTSIZ + osentry); if (*os > 0) /* found it */ return(ot); - if (!isfull(ot)) /* entry overflow */ + if (!isfull(ot)) { /* entry overflow */ if (++ntries < OSTSIZ) goto tryagain; else error(INTERNAL, "hash table overflow in fullnode"); + } /* remember position */ i = os - ostable[osentry]; os = ostable[osentry] = (OBJECT *)realloc( - (char *)ostable[osentry], + (void *)ostable[osentry], (unsigned)(i+oset[0]+2)*sizeof(OBJECT)); if (os == NULL) goto memerr; @@ -216,22 +252,25 @@ tryagain: return(ot); memerr: error(SYSTEM, "out of memory in fullnode"); + return 0; /* pro forma return */ } -objset(oset, ot) /* get object set for full node */ -register OBJECT *oset; -OCTREE ot; +void +objset( /* get object set for full node */ + OBJECT *oset, + OCTREE ot +) { - register OBJECT *os; - register int i; + OBJECT *os; + int i; if (!isfull(ot)) goto noderr; - i = oseti(ot); - if ((os = ostable[i%OSTSIZ]) == NULL) + ot = oseti(ot); + if ((os = ostable[ot%OSTSIZ]) == NULL) goto noderr; - for (i /= OSTSIZ; i--; os += *os + 1) + for (i = ot/OSTSIZ; i--; os += *os + 1) if (*os <= 0) goto noderr; for (i = *os; i-- >= 0; ) /* copy set here */ @@ -242,33 +281,14 @@ noderr: } -int -dosets(f) /* loop through all sets */ -int (*f)(); +void +donesets(void) /* free ALL SETS in our table */ { - int res = 0; int n; - register OBJECT *os; - for (n = 0; n < OSTSIZ; n++) { - if ((os = ostable[n]) == NULL) - continue; - while (*os > 0) { - res += (*f)(os); - os += *os + 1; - } - } - return(res); -} - - -donesets() /* free ALL SETS in our table */ -{ - register int n; - for (n = 0; n < OSTSIZ; n++) if (ostable[n] != NULL) { - free((char *)ostable[n]); + free((void *)ostable[n]); ostable[n] = NULL; } }