--- ray/src/rt/ambient.c	1996/05/28 14:24:44	2.37
+++ ray/src/rt/ambient.c	2018/01/09 05:01:15	2.105
@@ -1,37 +1,33 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
-#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
-#endif
-
+static const char	RCSid[] = "$Id: ambient.c,v 2.105 2018/01/09 05:01:15 greg Exp $";
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
+ *
+ *  Declarations of external symbols in ambient.h
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
-#include  "octree.h"
+#include <string.h>
 
+#include  "platform.h"
+#include  "ray.h"
 #include  "otypes.h"
-
+#include  "otspecial.h"
+#include  "resolu.h"
 #include  "ambient.h"
-
+#include  "source.h"
 #include  "random.h"
+#include  "pmapamb.h"
 
 #ifndef  OCTSCALE
 #define	 OCTSCALE	1.0	/* ceil((valid rad.)/(cube size)) */
 #endif
 
-typedef struct ambtree {
-	AMBVAL	*alist;		/* ambient value list */
-	struct ambtree	*kid;	/* 8 child nodes */
-}  AMBTREE;			/* ambient octree */
-
-extern CUBE  thescene;		/* contains space boundaries */
-
 extern char  *shm_boundary;	/* memory sharing boundary */
 
-#define	 MAXASET	511	/* maximum number of elements in ambient set */
+#ifndef  MAXASET
+#define	 MAXASET	4095	/* maximum number of elements in ambient set */
+#endif
 OBJECT	ambset[MAXASET+1]={0};	/* ambient include/exclude set */
 
 double	maxarad;		/* maximum ambient radius */
@@ -43,25 +39,29 @@ static FILE  *ambfp = NULL;	/* ambient file pointer */
 static int  nunflshed = 0;	/* number of unflushed ambient values */
 
 #ifndef SORT_THRESH
-#ifdef BIGMEM
-#define SORT_THRESH	((9L<<20)/sizeof(AMBVAL))
+#ifdef SMLMEM
+#define SORT_THRESH	((16L<<20)/sizeof(AMBVAL))
 #else
-#define SORT_THRESH	((3L<<20)/sizeof(AMBVAL))
+#define SORT_THRESH	((64L<<20)/sizeof(AMBVAL))
 #endif
 #endif
 #ifndef SORT_INTVL
-#define SORT_INTVL	(SORT_THRESH*256)
+#define SORT_INTVL	(SORT_THRESH<<1)
 #endif
 #ifndef MAX_SORT_INTVL
-#define MAX_SORT_INTVL	(SORT_INTVL<<4)
+#define MAX_SORT_INTVL	(SORT_INTVL<<6)
 #endif
 
-static COLOR  avsum = BLKCOLOR;		/* computed ambient value sum */
+
+static double  avsum = 0.;		/* computed ambient value sum (log) */
+static unsigned int  navsum = 0;	/* number of values in avsum */
 static unsigned int  nambvals = 0;	/* total number of indirect values */
 static unsigned int  nambshare = 0;	/* number of values from file */
 static unsigned long  ambclock = 0;	/* ambient access clock */
 static unsigned long  lastsort = 0;	/* time of last value sort */
 static long  sortintvl = SORT_INTVL;	/* time until next sort */
+static FILE  *ambinp = NULL;		/* auxiliary file for input */
+static long  lastpos = -1;		/* last flush position */
 
 #define MAXACLOCK	(1L<<30)	/* clock turnover value */
 	/*
@@ -69,106 +69,179 @@ static long  sortintvl = SORT_INTVL;	/* time until nex
 	 * through memory on a multiprocessor, when we want to avoid
 	 * claiming our own memory (copy on write).  Go ahead anyway
 	 * if more than two thirds of our values are unshared.
+	 * Compile with -Dtracktime=0 to turn this code off.
 	 */
+#ifndef tracktime
 #define tracktime	(shm_boundary == NULL || nambvals > 3*nambshare)
+#endif
 
 #define	 AMBFLUSH	(BUFSIZ/AMBVALSIZ)
 
-#define	 newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
+#define	 newambval()	(AMBVAL *)malloc(sizeof(AMBVAL))
 
-extern long  ftell(), lseek();
-static int  initambfile(), avsave(), avinsert(), sortambvals();
-static AMBVAL  *avstore();
+static void initambfile(int creat);
+static void avsave(AMBVAL *av);
+static AMBVAL *avstore(AMBVAL  *aval);
+static AMBTREE *newambtree(void);
+static void freeambtree(AMBTREE  *atp);
+
+typedef void unloadtf_t(AMBVAL *);
+static unloadtf_t avinsert;
+static unloadtf_t av2list;
+static unloadtf_t avfree;
+static void unloadatree(AMBTREE  *at, unloadtf_t *f);
+
+static int aposcmp(const void *avp1, const void *avp2);
+static int avlmemi(AMBVAL *avaddr);
+static void sortambvals(int always);
+
 #ifdef  F_SETLKW
-static  aflock();
+static void aflock(int  typ);
 #endif
 
 
-setambres(ar)				/* set ambient resolution */
-int  ar;
+void
+setambres(				/* set ambient resolution */
+	int  ar
+)
 {
 	ambres = ar < 0 ? 0 : ar;		/* may be done already */
 						/* set min & max radii */
 	if (ar <= 0) {
 		minarad = 0;
-		maxarad = thescene.cusize / 2.0;
+		maxarad = thescene.cusize*0.2;
 	} else {
 		minarad = thescene.cusize / ar;
-		maxarad = 64 * minarad;			/* heuristic */
-		if (maxarad > thescene.cusize / 2.0)
-			maxarad = thescene.cusize / 2.0;
+		maxarad = 64.0 * minarad;		/* heuristic */
+		if (maxarad > thescene.cusize*0.2)
+			maxarad = thescene.cusize*0.2;
 	}
 	if (minarad <= FTINY)
-		minarad = 10*FTINY;
+		minarad = 10.0*FTINY;
 	if (maxarad <= minarad)
-		maxarad = 64 * minarad;
+		maxarad = 64.0 * minarad;
 }
 
 
-setambacc(newa)				/* set ambient accuracy */
-double  newa;
+void
+setambacc(				/* set ambient accuracy */
+	double  newa
+)
 {
-	double  ambdiff;
-
-	if (newa < 0.0)
-		newa = 0.0;
-	ambdiff = fabs(newa - ambacc);
-	if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0)
-		sortambvals(1);			/* rebuild tree */
+	static double	olda;		/* remember previous setting here */
+	
+	newa *= (newa > 0);
+	if (fabs(newa - olda) >= .05*(newa + olda)) {
+		ambacc = newa;
+		if (nambvals > 0)
+			sortambvals(1);		/* rebuild tree */
+	}
 }
 
 
-setambient(afile)			/* initialize calculation */
-char  *afile;
+void
+setambient(void)				/* initialize calculation */
 {
-	long  pos, flen;
+	int	readonly = 0;
+	long	flen;
 	AMBVAL	amb;
+						/* make sure we're fresh */
+	ambdone();
 						/* init ambient limits */
 	setambres(ambres);
 	setambacc(ambacc);
-	if (afile == NULL)
+	if (ambfile == NULL || !ambfile[0])
 		return;
 	if (ambacc <= FTINY) {
 		sprintf(errmsg, "zero ambient accuracy so \"%s\" not opened",
-				afile);
+				ambfile);
 		error(WARNING, errmsg);
 		return;
 	}
 						/* open ambient file */
-	if ((ambfp = fopen(afile, "r+")) != NULL) {
-		initambfile(0);
-		pos = ftell(ambfp);
+	if ((ambfp = fopen(ambfile, "r+")) == NULL)
+		readonly = (ambfp = fopen(ambfile, "r")) != NULL;
+	if (ambfp != NULL) {
+		initambfile(0);			/* file exists */
+		lastpos = ftell(ambfp);
 		while (readambval(&amb, ambfp))
-			avinsert(avstore(&amb));
-						/* align */
-		pos += (long)nambvals*AMBVALSIZ;
-		flen = lseek(fileno(ambfp), 0L, 2);
-		if (flen != pos) {
-			error(WARNING,
+			avstore(&amb);
+		nambshare = nambvals;		/* share loaded values */
+		if (readonly) {
+			sprintf(errmsg,
+				"loaded %u values from read-only ambient file",
+					nambvals);
+			error(WARNING, errmsg);
+			fclose(ambfp);		/* close file so no writes */
+			ambfp = NULL;
+			return;			/* avoid ambsync() */
+		}
+						/* align file pointer */
+		lastpos += (long)nambvals*AMBVALSIZ;
+		flen = lseek(fileno(ambfp), (off_t)0, SEEK_END);
+		if (flen != lastpos) {
+			sprintf(errmsg,
 			"ignoring last %ld values in ambient file (corrupted)",
-					(flen - pos)/AMBVALSIZ);
-			fseek(ambfp, pos, 0);
-			ftruncate(fileno(ambfp), pos);
+					(flen - lastpos)/AMBVALSIZ);
+			error(WARNING, errmsg);
+			fseek(ambfp, lastpos, SEEK_SET);
+			ftruncate(fileno(ambfp), (off_t)lastpos);
 		}
-		nambshare = nambvals;
-	} else if ((ambfp = fopen(afile, "w+")) != NULL)
-		initambfile(1);
-	else {
-		sprintf(errmsg, "cannot open ambient file \"%s\"", afile);
+	} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
+		initambfile(1);			/* else create new file */
+		fflush(ambfp);
+		lastpos = ftell(ambfp);
+	} else {
+		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
 		error(SYSTEM, errmsg);
 	}
-	nunflshed++;	/* lie */
-	ambsync();
+#ifdef  F_SETLKW
+	aflock(F_UNLCK);			/* release file */
+#endif
 }
 
 
-ambnotify(obj)			/* record new modifier */
-OBJECT	obj;
+void
+ambdone(void)			/* close ambient file and free memory */
 {
+	if (ambfp != NULL) {		/* close ambient file */
+		ambsync();
+		fclose(ambfp);
+		ambfp = NULL;
+		if (ambinp != NULL) {	
+			fclose(ambinp);
+			ambinp = NULL;
+		}
+		lastpos = -1;
+	}
+					/* free ambient tree */
+	unloadatree(&atrunk, avfree);
+					/* reset state variables */
+	avsum = 0.;
+	navsum = 0;
+	nambvals = 0;
+	nambshare = 0;
+	ambclock = 0;
+	lastsort = 0;
+	sortintvl = SORT_INTVL;
+}
+
+
+void
+ambnotify(			/* record new modifier */
+	OBJECT	obj
+)
+{
 	static int  hitlimit = 0;
-	register OBJREC	 *o = objptr(obj);
-	register char  **amblp;
+	OBJREC	 *o;
+	char  **amblp;
 
+	if (obj == OVOID) {		/* starting over */
+		ambset[0] = 0;
+		hitlimit = 0;
+		return;
+	}
+	o = objptr(obj);
 	if (hitlimit || !ismodifier(o->otype))
 		return;
 	for (amblp = amblist; *amblp != NULL; amblp++)
@@ -183,15 +256,43 @@ OBJECT	obj;
 		}
 }
 
+/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/
 
-ambient(acol, r, nrm)		/* compute ambient component for ray */
-COLOR  acol;
-register RAY  *r;
-FVECT  nrm;
+#ifndef OLDAMB
+
+#define tfunc(lwr, x, upr)	(((x)-(lwr))/((upr)-(lwr)))
+
+static int	plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang);
+static double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
+				AMBTREE *at, FVECT c0, double s);
+static int	makeambient(COLOR acol, RAY *r, FVECT rn, int al);
+static int	extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, 
+				FVECT uvw[3]);
+
+void
+multambient(		/* compute ambient component & multiply by coef. */
+	COLOR  aval,
+	RAY  *r,
+	FVECT  nrm
+)
 {
 	static int  rdepth = 0;			/* ambient recursion */
-	double	d;
+	COLOR	acol, caustic;
+	int	i, ok;
+	double	d, l;
 
+	/* PMAP: Factor in ambient from photon map, if enabled and ray is
+	 * ambient. Return as all ambient components accounted for, else
+	 * continue. */
+	if (ambPmap(aval, r, rdepth))
+		return;
+
+	/* PMAP: Factor in specular-diffuse ambient (caustics) from photon
+	 * map, if enabled and ray is primary, else caustic is zero.  Continue
+	 * with RADIANCE ambient calculation */
+	copycolor(caustic, aval);
+	ambPmapCaustic(caustic, r, rdepth);
+	
 	if (ambdiv <= 0)			/* no ambient calculation */
 		goto dumbamb;
 						/* check number of bounces */
@@ -203,86 +304,519 @@ FVECT  nrm;
 		goto dumbamb;
 
 	if (ambacc <= FTINY) {			/* no ambient storage */
+		FVECT	uvd[2];
+		float	dgrad[2], *dgp = NULL;
+
+		if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999)
+			dgp = dgrad;		/* compute rotational grad. */
+		copycolor(acol, aval);
 		rdepth++;
+		ok = doambient(acol, r, r->rweight,
+				uvd, NULL, NULL, dgp, NULL);
+		rdepth--;
+		if (!ok)
+			goto dumbamb;
+		if ((ok > 0) & (dgp != NULL)) {	/* apply texture */
+			FVECT	v1;
+			VCROSS(v1, r->ron, nrm);
+			d = 1.0;
+			for (i = 3; i--; )
+				d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]);
+			if (d >= 0.05)
+				scalecolor(acol, d);
+		}
+		copycolor(aval, acol);
+
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);
+		return;
+	}
+
+	if (tracktime)				/* sort to minimize thrashing */
+		sortambvals(0);
+						/* interpolate ambient value */
+	setcolor(acol, 0.0, 0.0, 0.0);
+	d = sumambient(acol, r, nrm, rdepth,
+			&atrunk, thescene.cuorg, thescene.cusize);
+			
+	if (d > FTINY) {
+		d = 1.0/d;
+		scalecolor(acol, d);
+		multcolor(aval, acol);
+
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);
+		return;
+	}
+	
+	rdepth++;				/* need to cache new value */
+	ok = makeambient(acol, r, nrm, rdepth-1);
+	rdepth--;
+	
+	if (ok) {
+		multcolor(aval, acol);		/* computed new value */
+
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);
+		return;
+	}
+	
+dumbamb:					/* return global value */
+	if ((ambvwt <= 0) | (navsum == 0)) {
+		multcolor(aval, ambval);
+		
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);
+		return;
+	}
+	
+	l = bright(ambval);			/* average in computations */	
+	if (l > FTINY) {
+		d = (log(l)*(double)ambvwt + avsum) /
+				(double)(ambvwt + navsum);
+		d = exp(d) / l;
+		scalecolor(aval, d);
+		multcolor(aval, ambval);	/* apply color of ambval */
+	} else {
+		d = exp( avsum / (double)navsum );
+		scalecolor(aval, d);		/* neutral color */
+	}
+}
+
+
+/* Plug a potential leak where ambient cache value is occluded */
+static int
+plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang)
+{
+	const double	cost70sq = 0.1169778;	/* cos(70deg)^2 */
+	RAY		rtst;
+	FVECT		vdif;
+	double		normdot, ndotd, nadotd;
+	double		a, b, c, t[2];
+
+	ang += 2.*PI*(ang < 0);			/* check direction flags */
+	if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) )
+		return(0);
+	/*
+	 * Generate test ray, targeting 20 degrees above sample point plane
+	 * along surface normal from cache position.  This should be high
+	 * enough to miss local geometry we don't really care about.
+	 */
+	VSUB(vdif, ap->pos, r->rop);
+	normdot = DOT(anorm, r->ron);
+	ndotd = DOT(vdif, r->ron);
+	nadotd = DOT(vdif, anorm);
+	a = normdot*normdot - cost70sq;
+	b = 2.0*(normdot*ndotd - nadotd*cost70sq);
+	c = ndotd*ndotd - DOT(vdif,vdif)*cost70sq;
+	if (quadratic(t, a, b, c) != 2)
+		return(1);			/* should rarely happen */
+	if (t[1] <= FTINY)
+		return(0);			/* should fail behind test */
+	rayorigin(&rtst, SHADOW, r, NULL);
+	VSUM(rtst.rdir, vdif, anorm, t[1]);	/* further dist. > plane */
+	rtst.rmax = normalize(rtst.rdir);	/* short ray test */
+	while (localhit(&rtst, &thescene)) {	/* check for occluder */
+		OBJREC	*m = findmaterial(rtst.ro);
+		if (m != NULL && !istransp(m->otype) && !isBSDFproxy(m) &&
+				(rtst.clipset == NULL ||
+					!inset(rtst.clipset, rtst.ro->omod)))
+			return(1);		/* plug light leak */
+		VCOPY(rtst.rorg, rtst.rop);	/* skip invisible surface */
+		rtst.rmax -= rtst.rot;
+		rayclear(&rtst);
+	}
+	return(0);				/* seems we're OK */
+}
+
+
+static double
+sumambient(		/* get interpolated ambient value */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al,
+	AMBTREE	 *at,
+	FVECT  c0,
+	double	s
+)
+{			/* initial limit is 10 degrees plus ambacc radians */
+	const double	minangle = 10.0 * PI/180.;
+	double		maxangle = minangle + ambacc;
+	double		wsum = 0.0;
+	FVECT		ck0;
+	int		i, j;
+	AMBVAL		*av;
+
+	if (at->kid != NULL) {		/* sum children first */				
+		s *= 0.5;
+		for (i = 0; i < 8; i++) {
+			for (j = 0; j < 3; j++) {
+				ck0[j] = c0[j];
+				if (1<<j & i)
+					ck0[j] += s;
+				if (r->rop[j] < ck0[j] - OCTSCALE*s)
+					break;
+				if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
+					break;
+			}
+			if (j == 3)
+				wsum += sumambient(acol, r, rn, al,
+							at->kid+i, ck0, s);
+		}
+					/* good enough? */
+		if (wsum >= 0.05 && s > minarad*10.0)
+			return(wsum);
+	}
+					/* adjust maximum angle */
+	if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6))
+		maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.;
+					/* sum this node */
+	for (av = at->alist; av != NULL; av = av->next) {
+		double	u, v, d, delta_r2, delta_t2;
+		COLOR	ct;
+		FVECT	uvw[3];
+					/* record access */
+		if (tracktime)
+			av->latick = ambclock;
+		/*
+		 *  Ambient level test
+		 */
+		if (av->lvl > al ||	/* list sorted, so this works */
+				(av->lvl == al) & (av->weight < 0.9*r->rweight))
+			break;
+		/*
+		 *  Direction test using unperturbed normal
+		 */
+		decodedir(uvw[2], av->ndir);
+		d = DOT(uvw[2], r->ron);
+		if (d <= 0.0)		/* >= 90 degrees */
+			continue;
+		delta_r2 = 2.0 - 2.0*d;	/* approx. radians^2 */
+		if (delta_r2 >= maxangle*maxangle)
+			continue;
+		/*
+		 *  Modified ray behind test
+		 */
+		VSUB(ck0, r->rop, av->pos);
+		d = DOT(ck0, uvw[2]);
+		if (d < -minarad*ambacc-.001)
+			continue;
+		d /= av->rad[0];
+		delta_t2 = d*d;
+		if (delta_t2 >= ambacc*ambacc)
+			continue;
+		/*
+		 *  Elliptical radii test based on Hessian
+		 */
+		decodedir(uvw[0], av->udir);
+		VCROSS(uvw[1], uvw[2], uvw[0]);
+		d = (u = DOT(ck0, uvw[0])) / av->rad[0];
+		delta_t2 += d*d;
+		d = (v = DOT(ck0, uvw[1])) / av->rad[1];
+		delta_t2 += d*d;
+		if (delta_t2 >= ambacc*ambacc)
+			continue;
+		/*
+		 *  Test for potential light leak
+		 */
+		if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u)))
+			continue;
+		/*
+		 *  Extrapolate value and compute final weight (hat function)
+		 */
+		if (!extambient(ct, av, r->rop, rn, uvw))
+			continue;
+		d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
+			tfunc(ambacc, sqrt(delta_t2), 0.0);
+		scalecolor(ct, d);
+		addcolor(acol, ct);
+		wsum += d;
+	}
+	return(wsum);
+}
+
+
+static int
+makeambient(		/* make a new ambient value for storage */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al
+)
+{
+	AMBVAL	amb;
+	FVECT	uvw[3];
+	int	i;
+
+	amb.weight = 1.0;			/* compute weight */
+	for (i = al; i-- > 0; )
+		amb.weight *= AVGREFL;
+	if (r->rweight < 0.1*amb.weight)	/* heuristic override */
+		amb.weight = 1.25*r->rweight;
+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
+						/* compute ambient */
+	i = doambient(acol, r, amb.weight,
+			uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral);
+	scalecolor(acol, 1./AVGREFL);		/* undo assumed reflectance */
+	if (i <= 0 || amb.rad[0] <= FTINY)	/* no Hessian or zero radius */
+		return(i);
+						/* store value */
+	VCOPY(amb.pos, r->rop);
+	amb.ndir = encodedir(r->ron);
+	amb.udir = encodedir(uvw[0]);
+	amb.lvl = al;
+	copycolor(amb.val, acol);
+						/* insert into tree */
+	avsave(&amb);				/* and save to file */
+	if (rn != r->ron) {			/* texture */
+		VCOPY(uvw[2], r->ron);
+		extambient(acol, &amb, r->rop, rn, uvw);
+	}
+	return(1);
+}
+
+
+static int
+extambient(		/* extrapolate value at pv, nv */
+	COLOR  cr,
+	AMBVAL	 *ap,
+	FVECT  pv,
+	FVECT  nv,
+	FVECT  uvw[3]
+)
+{
+	const double	min_d = 0.05;
+	static FVECT	my_uvw[3];
+	FVECT		v1;
+	int		i;
+	double		d = 1.0;	/* zeroeth order */
+
+	if (uvw == NULL) {		/* need local coordinates? */
+		decodedir(my_uvw[2], ap->ndir);
+		decodedir(my_uvw[0], ap->udir);
+		VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
+		uvw = my_uvw;
+	}
+	for (i = 3; i--; )		/* gradient due to translation */
+		d += (pv[i] - ap->pos[i]) *
+			(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]);
+
+	VCROSS(v1, uvw[2], nv);		/* gradient due to rotation */
+	for (i = 3; i--; )
+		d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
+	
+	if (d < min_d)			/* should not use if we can avoid it */
+		d = min_d;
+	copycolor(cr, ap->val);
+	scalecolor(cr, d);
+	return(d > min_d);
+}
+
+
+static void
+avinsert(				/* insert ambient value in our tree */
+	AMBVAL *av
+)
+{
+	AMBTREE  *at;
+	AMBVAL  *ap;
+	AMBVAL  avh;
+	FVECT  ck0;
+	double	s;
+	int  branch;
+	int  i;
+
+	if (av->rad[0] <= FTINY)
+		error(CONSISTENCY, "zero ambient radius in avinsert");
+	at = &atrunk;
+	VCOPY(ck0, thescene.cuorg);
+	s = thescene.cusize;
+	while (s*(OCTSCALE/2) > av->rad[1]*ambacc) {
+		if (at->kid == NULL)
+			if ((at->kid = newambtree()) == NULL)
+				error(SYSTEM, "out of memory in avinsert");
+		s *= 0.5;
+		branch = 0;
+		for (i = 0; i < 3; i++)
+			if (av->pos[i] > ck0[i] + s) {
+				ck0[i] += s;
+				branch |= 1 << i;
+			}
+		at = at->kid + branch;
+	}
+	avh.next = at->alist;		/* order by increasing level */
+	for (ap = &avh; ap->next != NULL; ap = ap->next)
+		if ( ap->next->lvl > av->lvl ||
+				(ap->next->lvl == av->lvl) &
+				(ap->next->weight <= av->weight) )
+			break;
+	av->next = ap->next;
+	ap->next = (AMBVAL*)av;
+	at->alist = avh.next;
+}
+
+
+#else /* ! NEWAMB */
+
+static double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
+				AMBTREE *at, FVECT c0, double s);
+static double	makeambient(COLOR acol, RAY *r, FVECT rn, int al);
+static void	extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
+
+
+void
+multambient(		/* compute ambient component & multiply by coef. */
+	COLOR  aval,
+	RAY  *r,
+	FVECT  nrm
+)
+{
+	static int  rdepth = 0;			/* ambient recursion */
+	COLOR	acol, caustic;
+	double	d, l;
+
+	/* PMAP: Factor in ambient from global photon map (if enabled) and return
+	 * as all ambient components accounted for */
+	if (ambPmap(aval, r, rdepth))
+		return;
+
+	/* PMAP: Otherwise factor in ambient from caustic photon map
+	 * (ambPmapCaustic() returns zero if caustic photons disabled) and
+	 * continue with RADIANCE ambient calculation */
+	copycolor(caustic, aval);
+	ambPmapCaustic(caustic, r, rdepth);
+	
+	if (ambdiv <= 0)			/* no ambient calculation */
+		goto dumbamb;
+						/* check number of bounces */
+	if (rdepth >= ambounce)
+		goto dumbamb;
+						/* check ambient list */
+	if (ambincl != -1 && r->ro != NULL &&
+			ambincl != inset(ambset, r->ro->omod))
+		goto dumbamb;
+
+	if (ambacc <= FTINY) {			/* no ambient storage */
+		copycolor(acol, aval);
+		rdepth++;
 		d = doambient(acol, r, r->rweight, NULL, NULL);
 		rdepth--;
 		if (d <= FTINY)
 			goto dumbamb;
+		copycolor(aval, acol);		
+	
+	   /* PMAP: add in caustic */
+		addcolor(aval, caustic);	
 		return;
 	}
-						/* resort memory? */
-	sortambvals(0);
-						/* get ambient value */
+
+	if (tracktime)				/* sort to minimize thrashing */
+		sortambvals(0);
+						/* interpolate ambient value */
 	setcolor(acol, 0.0, 0.0, 0.0);
 	d = sumambient(acol, r, nrm, rdepth,
 			&atrunk, thescene.cuorg, thescene.cusize);
+			
 	if (d > FTINY) {
-		scalecolor(acol, 1.0/d);
+		d = 1.0/d;
+		scalecolor(acol, d);
+		multcolor(aval, acol);
+		
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);	
 		return;
 	}
+	
 	rdepth++;				/* need to cache new value */
 	d = makeambient(acol, r, nrm, rdepth-1);
 	rdepth--;
-	if (d > FTINY)
+	
+	if (d > FTINY) {
+		multcolor(aval, acol);		/* got new value */
+
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);			
 		return;
+	}
+	
 dumbamb:					/* return global value */
-	copycolor(acol, ambval);
-	if (ambvwt <= 0 | nambvals == 0)
+	if ((ambvwt <= 0) | (navsum == 0)) {
+		multcolor(aval, ambval);
+
+		/* PMAP: add in caustic */
+		addcolor(aval, caustic);	
 		return;
-	scalecolor(acol, (double)ambvwt);
-	addcolor(acol, avsum);			/* average in computations */
-	d = 1.0/(ambvwt+nambvals);
-	scalecolor(acol, d);
+	}
+	
+	l = bright(ambval);			/* average in computations */
+	if (l > FTINY) {
+		d = (log(l)*(double)ambvwt + avsum) /
+				(double)(ambvwt + navsum);
+		d = exp(d) / l;
+		scalecolor(aval, d);
+		multcolor(aval, ambval);	/* apply color of ambval */
+	} else {
+		d = exp( avsum / (double)navsum );
+		scalecolor(aval, d);		/* neutral color */
+	}
 }
 
 
-double
-sumambient(acol, r, rn, al, at, c0, s)	/* get interpolated ambient value */
-COLOR  acol;
-register RAY  *r;
-FVECT  rn;
-int  al;
-AMBTREE	 *at;
-FVECT  c0;
-double	s;
+static double
+sumambient(	/* get interpolated ambient value */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al,
+	AMBTREE	 *at,
+	FVECT  c0,
+	double	s
+)
 {
 	double	d, e1, e2, wt, wsum;
 	COLOR  ct;
 	FVECT  ck0;
 	int  i;
-	register int  j;
-	register AMBVAL	 *av;
+	int  j;
+	AMBVAL	 *av;
 
 	wsum = 0.0;
 					/* do this node */
 	for (av = at->alist; av != NULL; av = av->next) {
+		double	rn_dot = -2.0;
 		if (tracktime)
-			av->latick = ambclock++;
+			av->latick = ambclock;
 		/*
 		 *  Ambient level test.
 		 */
-		if (av->lvl > al)	/* list sorted, so this works */
+		if (av->lvl > al ||	/* list sorted, so this works */
+				(av->lvl == al) & (av->weight < 0.9*r->rweight))
 			break;
-		if (av->weight < r->rweight-FTINY)
-			continue;
 		/*
 		 *  Ambient radius test.
 		 */
-		d = av->pos[0] - r->rop[0];
-		e1 = d * d;
-		d = av->pos[1] - r->rop[1];
-		e1 += d * d;
-		d = av->pos[2] - r->rop[2];
-		e1 += d * d;
-		e1 /= av->rad * av->rad;
+		VSUB(ck0, av->pos, r->rop);
+		e1 = DOT(ck0, ck0) / (av->rad * av->rad);
 		if (e1 > ambacc*ambacc*1.21)
 			continue;
 		/*
-		 *  Normal direction test.
+		 *  Direction test using closest normal.
 		 */
-		e2 = (1.0 - DOT(av->dir, r->ron)) * r->rweight;
-		if (e2 < 0.0) e2 = 0.0;
-		if (e1 + e2 > ambacc*ambacc*1.21)
+		d = DOT(av->dir, r->ron);
+		if (rn != r->ron) {
+			rn_dot = DOT(av->dir, rn);
+			if (rn_dot > 1.0-FTINY)
+				rn_dot = 1.0-FTINY;
+			if (rn_dot >= d-FTINY) {
+				d = rn_dot;
+				rn_dot = -2.0;
+			}
+		}
+		e2 = (1.0 - d) * r->rweight;
+		if (e2 < 0.0)
+			e2 = 0.0;
+		else if (e1 + e2 > ambacc*ambacc*1.21)
 			continue;
 		/*
 		 *  Ray behind test.
@@ -296,9 +830,18 @@ double	s;
 		/*
 		 *  Jittering final test reduces image artifacts.
 		 */
-		wt = sqrt(e1) + sqrt(e2);
+		e1 = sqrt(e1);
+		e2 = sqrt(e2);
+		wt = e1 + e2;
 		if (wt > ambacc*(.9+.2*urand(9015+samplendx)))
 			continue;
+		/*
+		 *  Recompute directional error using perturbed normal
+		 */
+		if (rn_dot > 0.0) {
+			e2 = sqrt((1.0 - rn_dot)*r->rweight);
+			wt = e1 + e2;
+		}
 		if (wt <= 1e-3)
 			wt = 1e3;
 		else
@@ -323,30 +866,39 @@ double	s;
 				break;
 		}
 		if (j == 3)
-			wsum += sumambient(acol, r, rn, al, at->kid+i, ck0, s);
+			wsum += sumambient(acol, r, rn, al,
+						at->kid+i, ck0, s);
 	}
 	return(wsum);
 }
 
 
-double
-makeambient(acol, r, rn, al)	/* make a new ambient value */
-COLOR  acol;
-register RAY  *r;
-FVECT  rn;
-int  al;
+static double
+makeambient(		/* make a new ambient value for storage */
+	COLOR  acol,
+	RAY  *r,
+	FVECT  rn,
+	int  al
+)
 {
 	AMBVAL	amb;
 	FVECT	gp, gd;
-						/* compute weight */
-	amb.weight = pow(AVGREFL, (double)al);
-	if (r->rweight < 0.1*amb.weight)	/* heuristic */
-		amb.weight = r->rweight;
+	int	i;
+
+	amb.weight = 1.0;			/* compute weight */
+	for (i = al; i-- > 0; )
+		amb.weight *= AVGREFL;
+	if (r->rweight < 0.1*amb.weight)	/* heuristic override */
+		amb.weight = 1.25*r->rweight;
+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
 						/* compute ambient */
 	amb.rad = doambient(acol, r, amb.weight, gp, gd);
-	if (amb.rad <= FTINY)
+	if (amb.rad <= FTINY) {
+		setcolor(acol, 0.0, 0.0, 0.0);
 		return(0.0);
-						/* store it */
+	}
+	scalecolor(acol, 1./AVGREFL);		/* undo assumed reflectance */
+						/* store value */
 	VCOPY(amb.pos, r->rop);
 	VCOPY(amb.dir, r->ron);
 	amb.lvl = al;
@@ -361,13 +913,16 @@ int  al;
 }
 
 
-extambient(cr, ap, pv, nv)		/* extrapolate value at pv, nv */
-COLOR  cr;
-register AMBVAL	 *ap;
-FVECT  pv, nv;
+static void
+extambient(		/* extrapolate value at pv, nv */
+	COLOR  cr,
+	AMBVAL	 *ap,
+	FVECT  pv,
+	FVECT  nv
+)
 {
-	FVECT  v1, v2;
-	register int  i;
+	FVECT  v1;
+	int  i;
 	double	d;
 
 	d = 1.0;			/* zeroeth order */
@@ -375,9 +930,8 @@ FVECT  pv, nv;
 	for (i = 0; i < 3; i++)
 		d += ap->gpos[i]*(pv[i]-ap->pos[i]);
 					/* gradient due to rotation */
-	VCOPY(v1, ap->dir);
-	fcross(v2, v1, nv);
-	d += DOT(ap->gdir, v2);
+	VCROSS(v1, ap->dir, nv);
+	d += DOT(ap->gdir, v1);
 	if (d <= 0.0) {
 		setcolor(cr, 0.0, 0.0, 0.0);
 		return;
@@ -387,42 +941,94 @@ FVECT  pv, nv;
 }
 
 
-static
-initambfile(creat)		/* initialize ambient file */
-int  creat;
+static void
+avinsert(				/* insert ambient value in our tree */
+	AMBVAL *av
+)
 {
-	extern char  *progname, *octname, VersionID[];
+	AMBTREE  *at;
+	AMBVAL  *ap;
+	AMBVAL  avh;
+	FVECT  ck0;
+	double	s;
+	int  branch;
+	int  i;
 
+	if (av->rad <= FTINY)
+		error(CONSISTENCY, "zero ambient radius in avinsert");
+	at = &atrunk;
+	VCOPY(ck0, thescene.cuorg);
+	s = thescene.cusize;
+	while (s*(OCTSCALE/2) > av->rad*ambacc) {
+		if (at->kid == NULL)
+			if ((at->kid = newambtree()) == NULL)
+				error(SYSTEM, "out of memory in avinsert");
+		s *= 0.5;
+		branch = 0;
+		for (i = 0; i < 3; i++)
+			if (av->pos[i] > ck0[i] + s) {
+				ck0[i] += s;
+				branch |= 1 << i;
+			}
+		at = at->kid + branch;
+	}
+	avh.next = at->alist;		/* order by increasing level */
+	for (ap = &avh; ap->next != NULL; ap = ap->next)
+		if ( ap->next->lvl > av->lvl ||
+				(ap->next->lvl == av->lvl) &
+				(ap->next->weight <= av->weight) )
+			break;
+	av->next = ap->next;
+	ap->next = (AMBVAL*)av;
+	at->alist = avh.next;
+}
+
+#endif	/* ! NEWAMB */
+
+/************* FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS ***************/
+
+static void
+initambfile(		/* initialize ambient file */
+	int  cre8
+)
+{
+	extern char  *progname, *octname;
+	static char  *mybuf = NULL;
+
 #ifdef	F_SETLKW
-	aflock(creat ? F_WRLCK : F_RDLCK);
+	aflock(cre8 ? F_WRLCK : F_RDLCK);
 #endif
-#ifdef MSDOS
-	setmode(fileno(ambfp), O_BINARY);
-#endif
-	setbuf(ambfp, bmalloc(BUFSIZ+8));
-	if (creat) {			/* new file */
+	SET_FILE_BINARY(ambfp);
+	if (mybuf == NULL)
+		mybuf = (char *)bmalloc(BUFSIZ+8);
+	setbuf(ambfp, mybuf);
+	if (cre8) {			/* new file */
 		newheader("RADIANCE", ambfp);
-		fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
+		fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ",
 				progname, colval(ambval,RED),
 				colval(ambval,GRN), colval(ambval,BLU),
-				ambounce, ambacc);
-		fprintf(ambfp, "-ad %d -as %d -ar %d %s\n",
-				ambdiv, ambssamp, ambres,
-				octname==NULL ? "" : octname);
+				ambvwt, ambounce, ambacc);
+		fprintf(ambfp, "-ad %d -as %d -ar %d ",
+				ambdiv, ambssamp, ambres);
+		if (octname != NULL)
+			fputs(octname, ambfp);
+		fputc('\n', ambfp);
 		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
+		fputnow(ambfp);
 		fputformat(AMBFMT, ambfp);
-		putc('\n', ambfp);
+		fputc('\n', ambfp);
 		putambmagic(ambfp);
 	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
 		error(USER, "bad ambient file");
 }
 
 
-static
-avsave(av)				/* insert and save an ambient value */
-AMBVAL	*av;
+static void
+avsave(				/* insert and save an ambient value */
+	AMBVAL	*av
+)
 {
-	avinsert(avstore(av));
+	avstore(av);
 	if (ambfp == NULL)
 		return;
 	if (writambval(av, ambfp) < 0)
@@ -432,23 +1038,30 @@ AMBVAL	*av;
 			goto writerr;
 	return;
 writerr:
-	error(SYSTEM, "error writing ambient file");
+	error(SYSTEM, "error writing to ambient file");
 }
 
 
 static AMBVAL *
-avstore(aval)				/* allocate memory and store aval */
-register AMBVAL  *aval;
+avstore(				/* allocate memory and save aval */
+	AMBVAL  *aval
+)
 {
-	register AMBVAL  *av;
+	AMBVAL  *av;
+	double	d;
 
 	if ((av = newambval()) == NULL)
 		error(SYSTEM, "out of memory in avstore");
-	copystruct(av, aval);
+	*av = *aval;
 	av->latick = ambclock;
 	av->next = NULL;
-	addcolor(avsum, av->val);	/* add to sum for averaging */
 	nambvals++;
+	d = bright(av->val);
+	if (d > FTINY) {		/* add to log sum for averaging */
+		avsum += log(d);
+		navsum++;
+	}
+	avinsert(av);			/* insert in our cache tree */
 	return(av);
 }
 
@@ -458,14 +1071,13 @@ register AMBVAL  *aval;
 static AMBTREE  *atfreelist = NULL;	/* free ambient tree structures */
 
 
-static
-AMBTREE *
-newambtree()				/* allocate 8 ambient tree structs */
+static AMBTREE *
+newambtree(void)				/* allocate 8 ambient tree structs */
 {
-	register AMBTREE  *atp, *upperlim;
+	AMBTREE  *atp, *upperlim;
 
 	if (atfreelist == NULL) {	/* get more nodes */
-		atfreelist = (AMBTREE *)bmalloc(ATALLOCSZ*8*sizeof(AMBTREE));
+		atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE));
 		if (atfreelist == NULL)
 			return(NULL);
 					/* link new free list */
@@ -476,70 +1088,33 @@ newambtree()				/* allocate 8 ambient tree structs */
 	}
 	atp = atfreelist;
 	atfreelist = atp->kid;
-	bzero((char *)atp, 8*sizeof(AMBTREE));
+	memset(atp, 0, 8*sizeof(AMBTREE));
 	return(atp);
 }
 
 
-static
-freeambtree(atp)			/* free 8 ambient tree structs */
-AMBTREE  *atp;
+static void
+freeambtree(			/* free 8 ambient tree structs */
+	AMBTREE  *atp
+)
 {
 	atp->kid = atfreelist;
 	atfreelist = atp;
 }
 
 
-static
-avinsert(av)				/* insert ambient value in our tree */
-register AMBVAL	 *av;
+static void
+unloadatree(			/* unload an ambient value tree */
+	AMBTREE  *at,
+	unloadtf_t *f
+)
 {
-	register AMBTREE  *at;
-	register AMBVAL  *ap;
-	AMBVAL  avh;
-	FVECT  ck0;
-	double	s;
-	int  branch;
-	register int  i;
-
-	if (av->rad <= FTINY)
-		error(CONSISTENCY, "zero ambient radius in avinsert");
-	at = &atrunk;
-	VCOPY(ck0, thescene.cuorg);
-	s = thescene.cusize;
-	while (s*(OCTSCALE/2) > av->rad*ambacc) {
-		if (at->kid == NULL)
-			if ((at->kid = newambtree()) == NULL)
-				error(SYSTEM, "out of memory in avinsert");
-		s *= 0.5;
-		branch = 0;
-		for (i = 0; i < 3; i++)
-			if (av->pos[i] > ck0[i] + s) {
-				ck0[i] += s;
-				branch |= 1 << i;
-			}
-		at = at->kid + branch;
-	}
-	avh.next = at->alist;		/* order by increasing level */
-	for (ap = &avh; ap->next != NULL; ap = ap->next)
-		if (ap->next->lvl >= av->lvl)
-			break;
-	av->next = ap->next;
-	ap->next = av;
-	at->alist = avh.next;
-}
-
-
-static
-unloadatree(at, f)			/* unload an ambient value tree */
-register AMBTREE  *at;
-int	(*f)();
-{
-	register AMBVAL  *av;
-	register int  i;
+	AMBVAL  *av;
+	int  i;
 					/* transfer values at this node */
 	for (av = at->alist; av != NULL; av = at->alist) {
 		at->alist = av->next;
+		av->next = NULL;
 		(*f)(av);
 	}
 	if (at->kid == NULL)
@@ -551,67 +1126,90 @@ int	(*f)();
 }
 
 
-static AMBVAL	**avlist1, **avlist2;	/* ambient value lists for sorting */
+static struct avl {
+	AMBVAL	*p;
+	unsigned long	t;
+}	*avlist1;			/* ambient value list with ticks */
+static AMBVAL	**avlist2;		/* memory positions for sorting */
 static int	i_avlist;		/* index for lists */
 
+static int alatcmp(const void *av1, const void *av2);
 
-static
-av2list(av)
-AMBVAL	*av;
+static void
+avfree(AMBVAL *av)
 {
+	free(av);
+}
+
+static void
+av2list(
+	AMBVAL *av
+)
+{
 #ifdef DEBUG
 	if (i_avlist >= nambvals)
 		error(CONSISTENCY, "too many ambient values in av2list1");
 #endif
-	avlist1[i_avlist] = avlist2[i_avlist] = av;
-	i_avlist++;
+	avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
+	avlist1[i_avlist++].t = av->latick;
 }
 
 
 static int
-alatcmp(avp1, avp2)			/* compare ambient values for MRA */
-AMBVAL	**avp1, **avp2;
+alatcmp(			/* compare ambient values for MRA */
+	const void *av1,
+	const void *av2
+)
 {
-	return((**avp2).latick - (**avp1).latick);
+	long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
+	return(lc<0 ? -1 : lc>0 ? 1 : 0);
 }
 
 
+/* GW NOTE 2002/10/3:
+ * I used to compare AMBVAL pointers, but found that this was the
+ * cause of a serious consistency error with gcc, since the optimizer
+ * uses some dangerous trick in pointer subtraction that
+ * assumes pointers differ by exact struct size increments.
+ */
 static int
-aposcmp(avp1, avp2)			/* compare ambient value positions */
-AMBVAL	**avp1, **avp2;
+aposcmp(			/* compare ambient value positions */
+	const void	*avp1,
+	const void	*avp2
+)
 {
-	return(*avp1 - *avp2);
+	long	diff = *(char * const *)avp1 - *(char * const *)avp2;
+	if (diff < 0)
+		return(-1);
+	return(diff > 0);
 }
 
 
-#ifdef DEBUG
 static int
-avlmemi(avaddr)				/* find list position from address */
-AMBVAL	*avaddr;
+avlmemi(				/* find list position from address */
+	AMBVAL	*avaddr
+)
 {
-	register AMBVAL  **avlpp;
+	AMBVAL  **avlpp;
 
-	avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2,
+	avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
 			nambvals, sizeof(AMBVAL *), aposcmp);
 	if (avlpp == NULL)
 		error(CONSISTENCY, "address not found in avlmemi");
 	return(avlpp - avlist2);
 }
-#else
-#define avlmemi(avaddr)	((AMBVAL **)bsearch((char *)&avaddr,(char *)avlist2, \
-				nambvals,sizeof(AMBVAL *),aposcmp) - avlist2)
-#endif
 
 
-static
-sortambvals(always)			/* resort ambient values */
-int	always;
+static void
+sortambvals(			/* resort ambient values */
+	int	always
+)
 {
 	AMBTREE  oldatrunk;
 	AMBVAL	tav, *tap, *pnext;
-	register int	i, j;
+	int	i, j;
 					/* see if it's time yet */
-	if (!always && (ambclock < lastsort+sortintvl ||
+	if (!always && (ambclock++ < lastsort+sortintvl ||
 			nambvals < SORT_THRESH))
 		return;
 	/*
@@ -630,15 +1228,17 @@ int	always;
 	 * tree will be rebuilt with the new accuracy parameter.
 	 */
 	if (tracktime) {		/* allocate pointer arrays to sort */
-		avlist1 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
 		avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
-	} else
-		avlist1 = avlist2 = NULL;
-	if (avlist2 == NULL) {		/* no time tracking -- rebuild tree? */
-		if (avlist1 != NULL)
-			free((char *)avlist1);
+		avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
+	} else {
+		avlist2 = NULL;
+		avlist1 = NULL;
+	}
+	if (avlist1 == NULL) {		/* no time tracking -- rebuild tree? */
+		if (avlist2 != NULL)
+			free(avlist2);
 		if (always) {		/* rebuild without sorting */
-			copystruct(&oldatrunk, &atrunk);
+			oldatrunk = atrunk;
 			atrunk.alist = NULL;
 			atrunk.kid = NULL;
 			unloadatree(&oldatrunk, avinsert);
@@ -663,25 +1263,25 @@ int	always;
 		if (i_avlist < nambvals)
 			error(CONSISTENCY, "missing ambient values in sortambvals");
 #endif
-		qsort((char *)avlist1, nambvals, sizeof(AMBVAL *), alatcmp);
-		qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
+		qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
+		qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
 		for (i = 0; i < nambvals; i++) {
-			if (avlist1[i] == NULL)
+			if (avlist1[i].p == NULL)
 				continue;
 			tap = avlist2[i];
-			copystruct(&tav, tap);
-			for (j = i; (pnext = avlist1[j]) != tap;
+			tav = *tap;
+			for (j = i; (pnext = avlist1[j].p) != tap;
 					j = avlmemi(pnext)) {
-				copystruct(avlist2[j], pnext);
+				*(avlist2[j]) = *pnext;
 				avinsert(avlist2[j]);
-				avlist1[j] = NULL;
+				avlist1[j].p = NULL;
 			}
-			copystruct(avlist2[j], &tav);
+			*(avlist2[j]) = tav;
 			avinsert(avlist2[j]);
-			avlist1[j] = NULL;
+			avlist1[j].p = NULL;
 		}
-		free((char *)avlist1);
-		free((char *)avlist2);
+		free(avlist1);
+		free(avlist2);
 						/* compute new sort interval */
 		sortintvl = ambclock - lastsort;
 		if (sortintvl >= MAX_SORT_INTVL/2)
@@ -700,12 +1300,15 @@ int	always;
 
 #ifdef	F_SETLKW
 
-static
-aflock(typ)			/* lock/unlock ambient file */
-int  typ;
+static void
+aflock(			/* lock/unlock ambient file */
+	int  typ
+)
 {
 	static struct flock  fls;	/* static so initialized to zeroes */
 
+	if (typ == fls.l_type)		/* already called? */
+		return;
 	fls.l_type = typ;
 	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
 		error(SYSTEM, "cannot (un)lock ambient file");
@@ -713,75 +1316,61 @@ int  typ;
 
 
 int
-ambsync()			/* synchronize ambient file */
+ambsync(void)			/* synchronize ambient file */
 {
-	static FILE  *ambinp = NULL;
-	static long  lastpos = -1;
 	long  flen;
 	AMBVAL	avs;
-	register int  n;
+	int  n;
 
-	if (nunflshed == 0)
+	if (ambfp == NULL)	/* no ambient file? */
 		return(0);
-	if (lastpos < 0)	/* initializing (locked in initambfile) */
-		goto syncend;
-				/* gain exclusive access */
-	aflock(F_WRLCK);
+				/* gain appropriate access */
+	aflock(nunflshed ? F_WRLCK : F_RDLCK);
 				/* see if file has grown */
-	if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0)
+	if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
 		goto seekerr;
-	if (n = flen - lastpos) {		/* file has grown */
-		if (ambinp == NULL) {		/* use duplicate filedes */
-			ambinp = fdopen(dup(fileno(ambfp)), "r");
+	if ((n = flen - lastpos) > 0) {		/* file has grown */
+		if (ambinp == NULL) {		/* get new file pointer */
+			ambinp = fopen(ambfile, "rb");
 			if (ambinp == NULL)
-				error(SYSTEM, "fdopen failed in ambsync");
+				error(SYSTEM, "fopen failed in ambsync");
 		}
-		if (fseek(ambinp, lastpos, 0) < 0)
+		if (fseek(ambinp, lastpos, SEEK_SET) < 0)
 			goto seekerr;
 		while (n >= AMBVALSIZ) {	/* load contributed values */
 			if (!readambval(&avs, ambinp)) {
 				sprintf(errmsg,
-				"ambient file corrupted near character %ld",
-						flen - n);
+			"ambient file \"%s\" corrupted near character %ld",
+						ambfile, flen - n);
 				error(WARNING, errmsg);
 				break;
 			}
-			avinsert(avstore(&avs));
+			avstore(&avs);
 			n -= AMBVALSIZ;
 		}
-		/*** seek always as safety measure
-		if (n) ***/			/* alignment */
-			if (lseek(fileno(ambfp), flen-n, 0) < 0)
-				goto seekerr;
+		lastpos = flen - n;		/* check alignment */
+		if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
+			goto seekerr;
 	}
-#ifdef  DEBUG
-	if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) {
-		sprintf(errmsg, "ambient file buffer at %d rather than %d",
-				ambfp->_ptr - ambfp->_base,
-				nunflshed*AMBVALSIZ);
-		error(CONSISTENCY, errmsg);
-	}
-#endif
-syncend:
 	n = fflush(ambfp);			/* calls write() at last */
-	if ((lastpos = lseek(fileno(ambfp), 0L, 1)) < 0)
-		goto seekerr;
+	lastpos += (long)nunflshed*AMBVALSIZ;
 	aflock(F_UNLCK);			/* release file */
 	nunflshed = 0;
 	return(n);
 seekerr:
 	error(SYSTEM, "seek failed in ambsync");
+	return(EOF);	/* pro forma return */
 }
 
-#else
+#else	/* ! F_SETLKW */
 
 int
-ambsync()			/* flush ambient file */
+ambsync(void)			/* flush ambient file */
 {
-	if (nunflshed == 0)
+	if (ambfp == NULL)
 		return(0);
 	nunflshed = 0;
 	return(fflush(ambfp));
 }
 
-#endif
+#endif	/* ! F_SETLKW */