--- ray/src/rt/rtrace.c	2019/05/04 23:10:32	2.78
+++ ray/src/rt/rtrace.c	2020/07/20 15:54:29	2.99
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtrace.c,v 2.78 2019/05/04 23:10:32 greg Exp $";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.99 2020/07/20 15:54:29 greg Exp $";
 #endif
 /*
  *  rtrace.c - program and variables for individual ray tracing.
@@ -45,7 +45,7 @@ extern int  traincl;			/* include == 1, exclude == 0 *
 extern int  hresolu;			/* horizontal resolution */
 extern int  vresolu;			/* vertical resolution */
 
-static int  castonly = 0;
+int  castonly = 0;			/* only doing ray-casting? */
 
 #ifndef  MAXTSET
 #define	 MAXTSET	8191		/* maximum number in trace set */
@@ -54,22 +54,30 @@ OBJECT	traset[MAXTSET+1]={0};		/* trace include/exclud
 
 static RAY  thisray;			/* for our convenience */
 
+static FILE  *inpfp = NULL;		/* input stream pointer */
+
+static FVECT	*inp_queue = NULL;	/* ray input queue if flushing */
+static int	inp_qpos = 0;		/* next ray to return */
+static int	inp_qend = 0;		/* number of rays in this work group */
+
 typedef void putf_t(RREAL *v, int n);
-static putf_t puta, putd, putf;
+static putf_t puta, putd, putf, putrgbe;
 
 typedef void oputf_t(RAY *r);
 static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
 		oputr, oputR, oputx, oputX, oputn, oputN, oputs,
 		oputw, oputW, oputm, oputM, oputtilde;
 
-static void setoutput(char *vs);
 extern void tranotify(OBJECT obj);
+static int is_fifo(FILE *fp);
 static void bogusray(void);
 static void raycast(RAY *r);
 static void rayirrad(RAY *r);
 static void rtcompute(FVECT org, FVECT dir, double dmax);
 static int printvals(RAY *r);
 static int getvec(FVECT vec, int fmt, FILE *fp);
+static int iszerovec(const FVECT vec);
+static double nextray(FVECT org, FVECT dir);
 static void tabin(RAY *r);
 static void ourtrace(RAY *r);
 
@@ -84,8 +92,10 @@ quit(			/* quit program */
 {
 	if (ray_pnprocs > 0)	/* close children if any */
 		ray_pclose(0);		
+	else if (ray_pnprocs < 0)
+		_exit(code);	/* avoid flush() in child */
 #ifndef  NON_POSIX
-	else if (!ray_pnprocs) {
+	else {
 		headclean();	/* delete header file */
 		pfclean();	/* clean up persist files */
 	}
@@ -109,7 +119,7 @@ formstr(				/* return format identifier */
 }
 
 
-extern void
+void
 rtrace(				/* trace rays from file */
 	char  *fname,
 	int  nproc
@@ -117,34 +127,39 @@ rtrace(				/* trace rays from file */
 {
 	unsigned long  vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu
 					      : (unsigned long)vresolu;
-	long  nextflush = (vresolu > 0) & (hresolu > 1) ? 0 : hresolu;
-	int  bogusflushed = 0;
+	long  nextflush = (!vresolu | (hresolu <= 1)) * hresolu;
+	int  something2flush = 0;
 	FILE  *fp;
 	double	d;
 	FVECT  orig, direc;
 					/* set up input */
 	if (fname == NULL)
-		fp = stdin;
-	else if ((fp = fopen(fname, "r")) == NULL) {
+		inpfp = stdin;
+	else if ((inpfp = fopen(fname, "r")) == NULL) {
 		sprintf(errmsg, "cannot open input file \"%s\"", fname);
 		error(SYSTEM, errmsg);
 	}
+#ifdef getc_unlocked
+	flockfile(inpfp);		/* avoid lock/unlock overhead */
+	flockfile(stdout);
+#endif
 	if (inform != 'a')
-		SET_FILE_BINARY(fp);
+		SET_FILE_BINARY(inpfp);
 					/* set up output */
-	setoutput(outvals);
-	if (imm_irrad)
-		castonly = 0;
-	else if (castonly)
+	if (castonly || every_out[0] != NULL)
 		nproc = 1;		/* don't bother multiprocessing */
+	if ((nextflush > 0) & (nproc > nextflush)) {
+		error(WARNING, "reducing number of processes to match flush interval");
+		nproc = nextflush;
+	}
 	switch (outform) {
 	case 'a': putreal = puta; break;
 	case 'f': putreal = putf; break;
 	case 'd': putreal = putd; break;
 	case 'c': 
-		if (strcmp(outvals, "v"))
-			error(USER, "color format with value output only");
-		break;
+		if (outvals[1] || !strchr("vrx", outvals[0]))
+			error(USER, "color format only with -ov, -or, -ox");
+		putreal = putrgbe; break;
 	default:
 		error(CONSISTENCY, "botched output format");
 	}
@@ -158,32 +173,27 @@ rtrace(				/* trace rays from file */
 		else
 			fflush(stdout);
 	}
-					/* process file */
-	while (getvec(orig, inform, fp) == 0 &&
-			getvec(direc, inform, fp) == 0) {
-
-		d = normalize(direc);
-		if (d == 0.0) {				/* zero ==> flush */
-			if ((--nextflush <= 0) | !vcount && !bogusflushed) {
+					/* process input rays */
+	while ((d = nextray(orig, direc)) >= 0.0) {
+		if (d == 0.0) {				/* flush request? */
+			if (something2flush) {
 				if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
 					error(USER, "child(ren) died");
 				bogusray();
 				fflush(stdout);
-				bogusflushed = 1;
-				nextflush = (vresolu > 0) & (hresolu > 1) ? 0 :
-								hresolu;
+				nextflush = (!vresolu | (hresolu <= 1)) * hresolu;
+				something2flush = 0;
 			} else
 				bogusray();
 		} else {				/* compute and print */
 			rtcompute(orig, direc, lim_dist ? d : 0.0);
-							/* flush if time */
-			if (!--nextflush) {
+			if (!--nextflush) {		/* flush if time */
 				if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
 					error(USER, "child(ren) died");
 				fflush(stdout);
 				nextflush = hresolu;
 			} else
-				bogusflushed = 0;
+				something2flush = 1;
 		}
 		if (ferror(stdout))
 			error(SYSTEM, "write error");
@@ -195,12 +205,15 @@ rtrace(				/* trace rays from file */
 			error(USER, "unable to complete processing");
 		ray_pclose(0);
 	}
+	if (vcount)
+		error(WARNING, "unexpected EOF on input");
 	if (fflush(stdout) < 0)
 		error(SYSTEM, "write error");
-	if (vcount)
-		error(USER, "unexpected EOF on input");
-	if (fname != NULL)
-		fclose(fp);
+	if (fname != NULL) {
+		fclose(inpfp);
+		inpfp = NULL;
+	}
+	nextray(NULL, NULL);
 }
 
 
@@ -214,22 +227,25 @@ trace_sources(void)			/* trace rays to light sources, 
 }
 
 
-static void
-setoutput(				/* set up output tables */
-	char  *vs
-)
+int
+setrtoutput(void)			/* set up output tables, return #comp */
 {
+	char  *vs = outvals;
 	oputf_t **table = ray_out;
+	int  ncomp = 0;
 
-	castonly = 1;
-	while (*vs)
-		switch (*vs++) {
+	if (!*vs)
+		error(USER, "empty output specification");
+
+	castonly = 1;			/* sets castonly as side-effect */
+	do
+		switch (*vs) {
 		case 'T':				/* trace sources */
-			if (!*vs) break;
+			if (!vs[1]) break;
 			trace_sources();
 			/* fall through */
 		case 't':				/* trace */
-			if (!*vs) break;
+			if (!vs[1]) break;
 			*table = NULL;
 			table = every_out;
 			trace = ourtrace;
@@ -237,32 +253,40 @@ setoutput(				/* set up output tables */
 			break;
 		case 'o':				/* origin */
 			*table++ = oputo;
+			ncomp += 3;
 			break;
 		case 'd':				/* direction */
 			*table++ = oputd;
+			ncomp += 3;
 			break;
 		case 'r':				/* reflected contrib. */
 			*table++ = oputr;
+			ncomp += 3;
 			castonly = 0;
 			break;
 		case 'R':				/* reflected distance */
 			*table++ = oputR;
+			ncomp++;
 			castonly = 0;
 			break;
 		case 'x':				/* xmit contrib. */
 			*table++ = oputx;
+			ncomp += 3;
 			castonly = 0;
 			break;
 		case 'X':				/* xmit distance */
 			*table++ = oputX;
+			ncomp++;
 			castonly = 0;
 			break;
 		case 'v':				/* value */
 			*table++ = oputv;
+			ncomp += 3;
 			castonly = 0;
 			break;
 		case 'V':				/* contribution */
 			*table++ = oputV;
+			ncomp += 3;
 			castonly = 0;
 			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
 				error(WARNING,
@@ -270,48 +294,78 @@ setoutput(				/* set up output tables */
 			break;
 		case 'l':				/* effective distance */
 			*table++ = oputl;
+			ncomp++;
 			castonly = 0;
 			break;
 		case 'c':				/* local coordinates */
 			*table++ = oputc;
+			ncomp += 2;
 			break;
 		case 'L':				/* single ray length */
 			*table++ = oputL;
+			ncomp++;
 			break;
 		case 'p':				/* point */
 			*table++ = oputp;
+			ncomp += 3;
 			break;
 		case 'n':				/* perturbed normal */
 			*table++ = oputn;
+			ncomp += 3;
 			castonly = 0;
 			break;
 		case 'N':				/* unperturbed normal */
 			*table++ = oputN;
+			ncomp += 3;
 			break;
 		case 's':				/* surface */
 			*table++ = oputs;
+			ncomp++;
 			break;
 		case 'w':				/* weight */
 			*table++ = oputw;
+			ncomp++;
 			break;
 		case 'W':				/* coefficient */
 			*table++ = oputW;
+			ncomp += 3;
 			castonly = 0;
-			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
+			if (ambounce > 0 && (ambacc > FTINY) | (ambssamp > 0))
 				error(WARNING,
 					"-otW accuracy depends on -aa 0 -as 0");
 			break;
 		case 'm':				/* modifier */
 			*table++ = oputm;
+			ncomp++;
 			break;
 		case 'M':				/* material */
 			*table++ = oputM;
+			ncomp++;
 			break;
 		case '~':				/* tilde */
 			*table++ = oputtilde;
 			break;
+		default:
+			sprintf(errmsg, "unrecognized output option '%c'", *vs);
+			error(USER, errmsg);
 		}
+	while (*++vs);
+
 	*table = NULL;
+	if (*every_out != NULL)
+		ncomp = 0;
+							/* compatibility */
+	if ((do_irrad | imm_irrad) && castonly)
+		error(USER, "-I+ and -i+ options require some value output");
+	for (table = ray_out; *table != NULL; table++) {
+		if ((*table == oputV) | (*table == oputW))
+			error(WARNING, "-oVW options require trace mode");
+		if ((do_irrad | imm_irrad) &&
+				(*table == oputr) | (*table == oputR) |
+				(*table == oputx) | (*table == oputX))
+			error(WARNING, "-orRxX options incompatible with -I+ and -i+");
+	}
+	return(ncomp);
 }
 
 
@@ -410,7 +464,24 @@ printvals(			/* print requested ray values */
 
 
 static int
-getvec(		/* get a vector from fp */
+is_fifo(		/* check if file pointer connected to pipe */
+	FILE *fp
+)
+{
+#ifdef S_ISFIFO
+	struct stat  sbuf;
+
+	if (fstat(fileno(fp), &sbuf) < 0)
+		error(SYSTEM, "fstat() failed on input stream");
+	return(S_ISFIFO(sbuf.st_mode));
+#else
+	return (fp == stdin);		/* just a guess, really */
+#endif
+}
+
+
+static int
+getvec(			/* get a vector from fp */
 	FVECT  vec,
 	int  fmt,
 	FILE  *fp
@@ -447,6 +518,65 @@ getvec(		/* get a vector from fp */
 }
 
 
+static int
+iszerovec(const FVECT vec)
+{
+	return (vec[0] == 0.0) & (vec[1] == 0.0) & (vec[2] == 0.0);
+}
+
+
+static double
+nextray(		/* return next ray in work group (-1.0 if EOF) */
+	FVECT org,
+	FVECT dir
+)
+{
+	const size_t	qlength = !vresolu * hresolu;
+
+	if ((org == NULL) | (dir == NULL)) {
+		if (inp_queue != NULL)	/* asking to free queue */
+			free(inp_queue);
+		inp_queue = NULL;
+		inp_qpos = inp_qend = 0;
+		return(-1.);
+	}
+	if (!inp_qend) {		/* initialize FIFO queue */
+		int	rsiz = 6*20;	/* conservative ascii ray size */
+		if (inform == 'f') rsiz = 6*sizeof(float);
+		else if (inform == 'd') rsiz = 6*sizeof(double);
+					/* check against pipe limit */
+		if (qlength*rsiz > 512 && is_fifo(inpfp))
+			inp_queue = (FVECT *)malloc(sizeof(FVECT)*2*qlength);
+		inp_qend = -(inp_queue == NULL);	/* flag for no queue */
+	}
+	if (inp_qend < 0) {		/* not queuing? */
+		if (getvec(org, inform, inpfp) < 0 ||
+				getvec(dir, inform, inpfp) < 0)
+			return(-1.);
+		return normalize(dir);
+	}
+	if (inp_qpos >= inp_qend) {	/* need to refill input queue? */
+		for (inp_qend = 0; inp_qend < qlength; inp_qend++) {
+			if (getvec(inp_queue[2*inp_qend], inform, inpfp) < 0
+					|| getvec(inp_queue[2*inp_qend+1],
+							inform, inpfp) < 0)
+				break;		/* hit EOF */
+			if (iszerovec(inp_queue[2*inp_qend+1])) {
+				++inp_qend;	/* flush request */
+				break;
+			}
+		}
+		inp_qpos = 0;
+	}
+	if (inp_qpos >= inp_qend)	/* unexpected EOF? */
+		return(-1.);
+	VCOPY(org, inp_queue[2*inp_qpos]);
+	VCOPY(dir, inp_queue[2*inp_qpos+1]);
+	++inp_qpos;
+	return normalize(dir);
+}
+
+
 void
 tranotify(			/* record new modifier */
 	OBJECT	obj
@@ -582,14 +712,6 @@ oputv(				/* print value */
 {
 	RREAL	cval[3];
 
-	if (outform == 'c') {
-		COLR  cout;
-		setcolr(cout,	colval(r->rcol,RED),
-				colval(r->rcol,GRN),
-				colval(r->rcol,BLU));
-		putbinary(cout, sizeof(cout), 1, stdout);
-		return;
-	}
 	cval[0] = colval(r->rcol,RED);
 	cval[1] = colval(r->rcol,GRN);
 	cval[2] = colval(r->rcol,BLU);
@@ -647,7 +769,7 @@ oputp(				/* print point */
 	RAY  *r
 )
 {
-	if (r->rot < FHUGE)
+	if (r->rot < FHUGE*.99)
 		(*putreal)(r->rop, 3);
 	else
 		(*putreal)(vdummy, 3);
@@ -659,9 +781,16 @@ oputN(				/* print unperturbed normal */
 	RAY  *r
 )
 {
-	if (r->rot < FHUGE)
-		(*putreal)(r->ron, 3);
-	else
+	if (r->rot < FHUGE*.99) {
+		if (r->rflips & 1) {	/* undo any flippin' flips */
+			FVECT	unrm;
+			unrm[0] = -r->ron[0];
+			unrm[1] = -r->ron[1];
+			unrm[2] = -r->ron[2];
+			(*putreal)(unrm, 3);
+		} else
+			(*putreal)(r->ron, 3);
+	} else
 		(*putreal)(vdummy, 3);
 }
 
@@ -673,7 +802,7 @@ oputn(				/* print perturbed normal */
 {
 	FVECT  pnorm;
 
-	if (r->rot >= FHUGE) {
+	if (r->rot >= FHUGE*.99) {
 		(*putreal)(vdummy, 3);
 		return;
 	}
@@ -780,7 +909,7 @@ puta(				/* print ascii value(s) */
 
 
 static void
-putd(RREAL *v, int n)		/* print binary double(s) */
+putd(RREAL *v, int n)		/* output binary double(s) */
 {
 #ifdef	SMLFLT
 	double	da[3];
@@ -798,7 +927,7 @@ putd(RREAL *v, int n)		/* print binary double(s) */
 
 
 static void
-putf(RREAL *v, int n)		/* print binary float(s) */
+putf(RREAL *v, int n)		/* output binary float(s) */
 {
 #ifndef	SMLFLT
 	float	fa[3];
@@ -812,4 +941,16 @@ putf(RREAL *v, int n)		/* print binary float(s) */
 #else
 	putbinary(v, sizeof(RREAL), n, stdout);
 #endif
+}
+
+
+static void
+putrgbe(RREAL *v, int n)	/* output RGBE color */
+{
+	COLR  cout;
+
+	if (n != 3)
+		error(INTERNAL, "putrgbe() not called with 3 components");
+	setcolr(cout, v[0], v[1], v[2]);
+	putbinary(cout, sizeof(cout), 1, stdout);
 }