--- ray/src/rt/ambient.c	1992/07/16 19:44:46	2.11
+++ ray/src/rt/ambient.c	1993/08/04 14:22:11	2.19
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1993 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -6,8 +6,6 @@ static char SCCSid[] = "$SunId$ LBL";
 
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
- *
- *     5/9/86
  */
 
 #include  "ray.h"
@@ -20,33 +18,37 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
-#define  OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
+#define	 OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
 
 typedef struct ambtree {
-	AMBVAL  *alist;		/* ambient value list */
-	struct ambtree  *kid;	/* 8 child nodes */
+	AMBVAL	*alist;		/* ambient value list */
+	struct ambtree	*kid;	/* 8 child nodes */
 }  AMBTREE;			/* ambient octree */
 
 extern CUBE  thescene;		/* contains space boundaries */
 
-#define  MAXASET	511	/* maximum number of elements in ambient set */
-OBJECT  ambset[MAXASET+1]={0};	/* ambient include/exclude set */
+#define	 MAXASET	511	/* maximum number of elements in ambient set */
+OBJECT	ambset[MAXASET+1]={0};	/* ambient include/exclude set */
 
-double  maxarad;		/* maximum ambient radius */
-double  minarad;		/* minimum ambient radius */
+double	maxarad;		/* maximum ambient radius */
+double	minarad;		/* minimum ambient radius */
 
-static AMBTREE  atrunk;		/* our ambient trunk node */
+static AMBTREE	atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
+static int  nunflshed = 0;	/* number of unflushed ambient values */
 
-#define  AMBFLUSH	(BUFSIZ/AMBVALSIZ)
+#define	 AMBFLUSH	(BUFSIZ/AMBVALSIZ)
 
-#define  newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
+#define	 newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
 
-#define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
+#define	 newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
 extern long  ftell(), lseek();
-static int  initambfile(), avsave(), avinsert(), ambsync();
+static int  initambfile(), avsave(), avinsert();
+#ifdef  F_SETLKW
+static  aflock();
+#endif
 
 
 setambres(ar)				/* set ambient resolution */
@@ -71,34 +73,36 @@ setambient(afile)			/* initialize calculation */
 char  *afile;
 {
 	long  headlen;
-	AMBVAL  amb;
+	AMBVAL	amb;
 						/* init ambient limits */
 	setambres(ambres);
+	if (afile == NULL)
+		return;
 						/* open ambient file */
-	if (afile != NULL)
-		if ((ambfp = fopen(afile, "r+")) != NULL) {
-			initambfile(0);
-			headlen = ftell(ambfp);
-			while (readambval(&amb, ambfp))
-				avinsert(&amb, &atrunk, thescene.cuorg,
-						thescene.cusize);
-							/* align */
-			fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1);
-		} else if ((ambfp = fopen(afile, "w+")) != NULL)
-			initambfile(1);
-		else {
-			sprintf(errmsg, "cannot open ambient file \"%s\"",
-					afile);
-			error(SYSTEM, errmsg);
-		}
+	if ((ambfp = fopen(afile, "r+")) != NULL) {
+		initambfile(0);
+		headlen = ftell(ambfp);
+		while (readambval(&amb, ambfp))
+			avinsert(&amb, &atrunk, thescene.cuorg,
+					thescene.cusize);
+						/* align */
+		fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1);
+	} else if ((ambfp = fopen(afile, "w+")) != NULL)
+		initambfile(1);
+	else {
+		sprintf(errmsg, "cannot open ambient file \"%s\"", afile);
+		error(SYSTEM, errmsg);
+	}
+	nunflshed++;	/* lie */
+	ambsync();
 }
 
 
 ambnotify(obj)			/* record new modifier */
-OBJECT  obj;
+OBJECT	obj;
 {
 	static int  hitlimit = 0;
-	register OBJREC  *o = objptr(obj);
+	register OBJREC	 *o = objptr(obj);
 	register char  **amblp;
 
 	if (hitlimit || !ismodifier(o->otype))
@@ -121,7 +125,7 @@ COLOR  acol;
 register RAY  *r;
 {
 	static int  rdepth = 0;			/* ambient recursion */
-	double  d;
+	double	d;
 
 	if (ambdiv <= 0)			/* no ambient calculation */
 		goto dumbamb;
@@ -163,17 +167,16 @@ sumambient(acol, r, al, at, c0, s)	/* get interpolated
 COLOR  acol;
 register RAY  *r;
 int  al;
-AMBTREE  *at;
+AMBTREE	 *at;
 FVECT  c0;
-double  s;
+double	s;
 {
-	extern double  sqrt();
-	double  d, e1, e2, wt, wsum;
+	double	d, e1, e2, wt, wsum;
 	COLOR  ct;
 	FVECT  ck0;
 	int  i;
 	register int  j;
-	register AMBVAL  *av;
+	register AMBVAL	 *av;
 					/* do this node */
 	wsum = 0.0;
 	for (av = at->alist; av != NULL; av = av->next) {
@@ -252,7 +255,7 @@ COLOR  acol;
 register RAY  *r;
 int  al;
 {
-	AMBVAL  amb;
+	AMBVAL	amb;
 	FVECT	gp, gd;
 						/* compute weight */
 	amb.weight = pow(AVGREFL, (double)al);
@@ -277,12 +280,12 @@ int  al;
 
 extambient(cr, ap, pv, nv)		/* extrapolate value at pv, nv */
 COLOR  cr;
-register AMBVAL  *ap;
+register AMBVAL	 *ap;
 FVECT  pv, nv;
 {
 	FVECT  v1, v2;
 	register int  i;
-	double  d;
+	double	d;
 
 	d = 1.0;			/* zeroeth order */
 					/* gradient due to translation */
@@ -307,6 +310,12 @@ int  creat;
 {
 	extern char  *progname, *octname, VersionID[];
 
+#ifdef	F_SETLKW
+	aflock(creat ? F_WRLCK : F_RDLCK);
+#endif
+#ifdef MSDOS
+	setmode(fileno(ambfp), O_BINARY);
+#endif
 	setbuf(ambfp, bmalloc(BUFSIZ));
 	if (creat) {			/* new file */
 		fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
@@ -320,10 +329,6 @@ int  creat;
 		fputformat(AMBFMT, ambfp);
 		putc('\n', ambfp);
 		putambmagic(ambfp);
-		fflush(ambfp);
-#ifndef  NIX
-		sync();			/* protect against NFS buffering */
-#endif
 	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
 		error(USER, "bad ambient file");
 }
@@ -331,20 +336,16 @@ int  creat;
 
 static
 avsave(av)				/* insert and save an ambient value */
-AMBVAL  *av;
+AMBVAL	*av;
 {
-	static int  nunflshed = 0;
-
 	avinsert(av, &atrunk, thescene.cuorg, thescene.cusize);
 	if (ambfp == NULL)
 		return;
 	if (writambval(av, ambfp) < 0)
 		goto writerr;
-	if (++nunflshed >= AMBFLUSH) {
+	if (++nunflshed >= AMBFLUSH)
 		if (ambsync() == EOF)
 			goto writerr;
-		nunflshed = 0;
-	}
 	return;
 writerr:
 	error(SYSTEM, "error writing ambient file");
@@ -353,14 +354,14 @@ writerr:
 
 static
 avinsert(aval, at, c0, s)		/* insert ambient value in a tree */
-AMBVAL  *aval;
+AMBVAL	*aval;
 register AMBTREE  *at;
 FVECT  c0;
-double  s;
+double	s;
 {
 	FVECT  ck0;
 	int  branch;
-	register AMBVAL  *av;
+	register AMBVAL	 *av;
 	register int  i;
 
 	if ((av = newambval()) == NULL)
@@ -388,55 +389,71 @@ memerr:
 }
 
 
-#ifdef  NIX
+#ifdef	F_SETLKW
 
 static
-ambsync()			/* flush ambient file */
+aflock(typ)			/* lock/unlock ambient file */
+int  typ;
 {
-	return(fflush(ambfp));
+	static struct flock  fls;	/* static so initialized to zeroes */
+
+	fls.l_type = typ;
+	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
+		error(SYSTEM, "cannot (un)lock ambient file");
 }
 
-#else
 
-#include  <fcntl.h>
-#include  <sys/types.h>
-#include  <sys/stat.h>
-
-static
+int
 ambsync()			/* synchronize ambient file */
 {
 	static FILE  *ambinp = NULL;
-	struct flock  fls;
-	struct stat  sts;
-	AMBVAL  avs;
-	long  lastpos, flen;
+	static long  lastpos = -1;
+	long  flen;
+	AMBVAL	avs;
 	register int  n;
+
+	if (nunflshed == 0)
+		return(0);
+	if (lastpos < 0)	/* initializing (locked in initambfile) */
+		goto syncend;
 				/* gain exclusive access */
-	fls.l_type = F_WRLCK;
-	fls.l_whence = 0;
-	fls.l_start = 0L;
-	fls.l_len = 0L;
-	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
-		error(SYSTEM, "cannot lock ambient file");
+	aflock(F_WRLCK);
 				/* see if file has grown */
-	lastpos = lseek(fileno(ambfp), 0L, 1);	/* get previous position */
-	if (fstat(fileno(ambfp), &sts) < 0)	/* get current length */
-		error(SYSTEM, "cannot stat ambient file");
-	flen = sts.st_size;
-	if (n = (flen - lastpos)/AMBVALSIZ) {	/* file has grown */
-		if (ambinp == NULL)		/* use duplicate file */
+	if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0)
+		error(SYSTEM, "cannot seek on ambient file");
+	if (n = flen - lastpos) {		/* file has grown */
+		if (ambinp == NULL) {		/* use duplicate filedes */
 			ambinp = fdopen(dup(fileno(ambfp)), "r");
-		while (n--) {			/* load contributed values */
+			if (ambinp == NULL)
+				error(SYSTEM, "fdopen failed in ambsync");
+		}
+		if (fseek(ambinp, lastpos, 0) < 0)
+			error(SYSTEM, "fseek failed in ambsync");
+		while (n >= AMBVALSIZ) {	/* load contributed values */
 			readambval(&avs, ambinp);
 			avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
-		}				/* moves shared file pointer */
-		if (n = (flen - lastpos)%AMBVALSIZ)	/* alignment */
+			n -= AMBVALSIZ;
+		}
+		if (n)				/* alignment */
 			lseek(fileno(ambfp), flen-n, 0);
 	}
+syncend:
 	n = fflush(ambfp);			/* calls write() at last */
-	fls.l_type = F_UNLCK;			/* release file */
-	fcntl(fileno(ambfp), F_SETLKW, &fls);
+	lastpos = lseek(fileno(ambfp), 0L, 1);
+	aflock(F_UNLCK);			/* release file */
+	nunflshed = 0;
 	return(n);
+}
+
+#else
+
+int
+ambsync()			/* flush ambient file */
+{
+	if (nunflshed == 0)
+		return(0);
+	nunflshed = 0;
+	return(fflush(ambfp));
 }
 
 #endif