--- ray/src/common/readobj.c 2016/02/02 18:02:32 2.21 +++ ray/src/common/readobj.c 2025/06/24 21:04:16 2.31 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: readobj.c,v 2.21 2016/02/02 18:02:32 greg Exp $"; +static const char RCSid[] = "$Id: readobj.c,v 2.31 2025/06/24 21:04:16 greg Exp $"; #endif /* * readobj.c - routines for reading in object descriptions. @@ -10,28 +10,29 @@ static const char RCSid[] = "$Id: readobj.c,v 2.21 201 #include "copyright.h" #include -#include -#include #include "platform.h" -#include "paths.h" #include "standard.h" #include "object.h" #include "otypes.h" +#ifndef OBJMEMOPT +#define OBJMEMOPT 0 /* optimize object block memory? */ +#endif OBJREC *objblock[MAXOBJBLK]; /* our objects */ OBJECT nobjects = 0; /* # of objects */ void -readobj(inpspec) /* read in an object file or stream */ -char *inpspec; +readobj( /* read in an object file or stream */ + char *inpspec +) { OBJECT lastobj; FILE *infp; char buf[2048]; - register int c; + int c; lastobj = nobjects; if (inpspec == NULL) { @@ -46,6 +47,9 @@ char *inpspec; sprintf(errmsg, "cannot open scene file \"%s\"", inpspec); error(SYSTEM, errmsg); } +#ifdef getc_unlocked /* avoid stupid semaphores */ + flockfile(infp); +#endif while ((c = getc(infp)) != EOF) { if (isspace(c)) continue; @@ -60,10 +64,17 @@ char *inpspec; getobject(inpspec, infp); } } - if (inpspec[0] == '!') - pclose(infp); - else + if (inpspec[0] == '!') { + if (pclose(infp) != 0) { + sprintf(errmsg, "bad status from \"%s\"", inpspec); + error(WARNING, errmsg); + } + } else if (infp != stdin) fclose(infp); +#ifdef getc_unlocked + else + funlockfile(infp); +#endif if (nobjects == lastobj) { sprintf(errmsg, "(%s): empty file", inpspec); error(WARNING, errmsg); @@ -72,15 +83,16 @@ char *inpspec; void -getobject(name, fp) /* read the next object */ -char *name; -FILE *fp; +getobject( /* read the next object */ + char *name, + FILE *fp +) { #define OALIAS -2 OBJECT obj; char sbuf[MAXSTR]; int rval; - register OBJREC *objp; + OBJREC *objp; if ((obj = newobject()) == OVOID) error(SYSTEM, "out of object space"); @@ -119,17 +131,21 @@ FILE *fp; objp->oname = savqstr(sbuf); /* get arguments */ if (objp->otype == MOD_ALIAS) { - register OBJECT alias; + OBJECT ref; + OBJREC *rfp; strcpy(sbuf, "EOF"); fgetword(sbuf, MAXSTR, fp); - if ((alias = modifier(sbuf)) == OVOID) { + if ((ref = modifier(sbuf)) == OVOID) { sprintf(errmsg, "(%s): bad reference \"%s\"", name, sbuf); objerror(objp, USER, errmsg); - } - if (objp->omod == OALIAS || - objp->omod == objptr(alias)->omod) { - objp->omod = alias; + } /* skip pass-thru aliases */ + while ((rfp=objptr(ref))->otype == MOD_ALIAS && + !rfp->oargs.nsargs & (rfp->omod != OVOID)) + ref = rfp->omod; + + if ((objp->omod == OALIAS) | (objp->omod == rfp->omod)) { + objp->omod = ref; } else { objp->oargs.sarg = (char **)malloc(sizeof(char *)); if (objp->oargs.sarg == NULL) @@ -157,17 +173,109 @@ FILE *fp; } +static void +optimize_objblock(int i) /* consolidate memory in object block */ +{ +#if OBJMEMOPT + OBJREC *o, *co; + int n = 0; + unsigned long sargcnt = 0, iargcnt = 0, fargcnt = 0, namecnt = 0; + + if (i < 0 || objblock[i] == NULL || objblock[i][OBJBLKSIZ].otype < 0) + return; /* invalid or already done */ + + for (o = objblock[i]+OBJBLKSIZ; o-- > objblock[i]; ) { + if (o->oname == NULL) /* too early to optimize? */ + return; + if (o->os != NULL) /* too late to optimize? */ + return; + n += (o->oargs.nsargs > 0) | (o->oargs.nfargs > 0); + sargcnt += o->oargs.nsargs; + fargcnt += o->oargs.nfargs; +#ifdef IARGS + iargcnt += o->oargs.niargs; +#endif + namecnt += strlen(o->oname)+1; + } + if (n < OBJBLKSIZ/10) /* never happens? */ + return; + /* prep consolidation object */ + co = objblock[i]+OBJBLKSIZ; + co->oargs.nsargs = sargcnt; + co->oargs.nfargs = fargcnt; + if ((co->oargs.nsargs != sargcnt) | (co->oargs.nfargs != fargcnt)) + return; /* overrun condition */ + + co->oname = (char *)malloc(sizeof(char)*namecnt); + co->oargs.sarg = (char **)malloc(sizeof(char *)*sargcnt); + co->oargs.farg = (RREAL *)malloc(sizeof(RREAL)*fargcnt); + if ((co->oname == NULL) | (co->oargs.sarg == NULL) | + (co->oargs.farg == NULL)) { + free(co->oname); + free(co->oargs.sarg); free(co->oargs.farg); + memset(co, 0, sizeof(OBJREC)); + return; /* insufficient memory */ + } +#ifdef IARGS + co->oargs.niargs = iargcnt; + co->oargs.iarg = (long *)malloc(sizeof(long)*iargcnt); + if (co->oargs.iarg == NULL) { + free(co->oname); + free(co->oargs.sarg); free(co->oargs.farg); + memset(co, 0, sizeof(OBJREC)); + return; /* insufficient memory */ + } + iargcnt = 0; +#endif + namecnt = sargcnt = fargcnt = 0; + for (o = objblock[i]+OBJBLKSIZ; o-- > objblock[i]; ) { + n = strlen(o->oname)+1; + memcpy(co->oname + namecnt, o->oname, n); + freeqstr(o->oname); + o->oname = co->oname + namecnt; + namecnt += n; + if (o->oargs.nsargs) { + memcpy(co->oargs.sarg+sargcnt, o->oargs.sarg, + sizeof(char *)*o->oargs.nsargs); + free(o->oargs.sarg); + o->oargs.sarg = co->oargs.sarg + sargcnt; + sargcnt += o->oargs.nsargs; + } + if (o->oargs.nfargs) { + memcpy(co->oargs.farg+fargcnt, o->oargs.farg, + sizeof(RREAL)*o->oargs.nfargs); + free(o->oargs.farg); + o->oargs.farg = co->oargs.farg + fargcnt; + fargcnt += o->oargs.nfargs; + } +#ifdef IARGS + if (o->oargs.niargs) { + memcpy(co->oargs.iarg+iargcnt, o->oargs.iarg, + sizeof(long)*o->oargs.niargs); + free(o->oargs.iarg); + o->oargs.iarg = co->oargs.iarg + iargcnt; + iargcnt += o->oargs.niargs; + } +#endif + } + co->otype = -1; /* flag for optimized block */ +#endif +} + + OBJECT -newobject() /* get a new object */ +newobject(void) /* get a new object */ { - register int i; + int i; if ((nobjects & (OBJBLKSIZ-1)) == 0) { /* new block */ - errno = 0; i = nobjects >> OBJBLKSHFT; + optimize_objblock(i-1); /* optimize previous block */ + errno = 0; if (i >= MAXOBJBLK) return(OVOID); - objblock[i] = (OBJREC *)calloc(OBJBLKSIZ, sizeof(OBJREC)); + objblock[i] = (OBJREC *)calloc(OBJBLKSIZ+OBJMEMOPT, + sizeof(OBJREC)); if (objblock[i] == NULL) return(OVOID); } @@ -175,10 +283,12 @@ newobject() /* get a new object */ } void -freeobjects(firstobj, nobjs) /* free a range of objects */ -int firstobj, nobjs; +freeobjects( /* free a range of objects */ + int firstobj, + int nobjs +) { - register int obj; + int obj; /* check bounds */ if (firstobj < 0) return; @@ -188,22 +298,30 @@ int firstobj, nobjs; return; /* clear objects */ for (obj = firstobj+nobjs; obj-- > firstobj; ) { - register OBJREC *o = objptr(obj); + OBJREC *o = objptr(obj); free_os(o); /* free client memory */ - freeqstr(o->oname); - freefargs(&o->oargs); - memset((void *)o, '\0', sizeof(OBJREC)); + if (!OBJMEMOPT || !objblock[obj>>OBJBLKSHFT][OBJBLKSIZ].otype) { + freeqstr(o->oname); + freefargs(&o->oargs); + } + memset(o, 0, sizeof(OBJREC)); } - clearobjndx(); /* free objects off end */ for (obj = nobjects; obj-- > 0; ) if (objptr(obj)->oname != NULL) break; - ++obj; + if (++obj >= nobjects) + return; while (nobjects > obj) /* free empty end blocks */ if ((--nobjects & (OBJBLKSIZ-1)) == 0) { int i = nobjects >> OBJBLKSHFT; - free((void *)objblock[i]); + /* consolidated block? */ + if (OBJMEMOPT && objblock[i][OBJBLKSIZ].otype < 0) { + free(objblock[i][OBJBLKSIZ].oname); + freefargs(&objblock[i][OBJBLKSIZ].oargs); + } + free(objblock[i]); objblock[i] = NULL; } + truncobjndx(); /* truncate modifier look-up */ }