--- ray/src/rt/ambient.c	1992/11/03 21:29:52	2.14
+++ ray/src/rt/ambient.c	1993/08/04 14:22:11	2.19
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 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"
@@ -38,6 +36,7 @@ double	minarad;		/* minimum ambient radius */
 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)
 
@@ -46,7 +45,10 @@ static FILE  *ambfp = NULL;	/* ambient file pointer */
 #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 */
@@ -74,23 +76,25 @@ char  *afile;
 	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();
 }
 
 
@@ -306,6 +310,9 @@ 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
@@ -322,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");
 }
@@ -335,18 +338,14 @@ static
 avsave(av)				/* insert and save an ambient value */
 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");
@@ -390,57 +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  <sys/types.h>
-#include  <sys/stat.h>
-
-static
+int
 ambsync()			/* synchronize ambient file */
 {
 	static FILE  *ambinp = NULL;
-	struct flock  fls;
-	struct stat  sts;
-#define	flen	sts.st_size
+	static long  lastpos = -1;
+	long  flen;
 	AMBVAL	avs;
-	long  lastpos;
 	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");
-	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");
 			if (ambinp == NULL)
 				error(SYSTEM, "fdopen failed in ambsync");
 		}
-		while (n--) {			/* load contributed values */
+		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