--- ray/src/hd/rholo2l.c	2003/07/27 22:12:02	3.15
+++ ray/src/hd/rholo2l.c	2025/01/22 18:28:32	3.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rholo2l.c,v 3.15 2003/07/27 22:12:02 schorsch Exp $";
+static const char	RCSid[] = "$Id: rholo2l.c,v 3.23 2025/01/22 18:28:32 greg Exp $";
 #endif
 /*
  * Routines for local rtrace execution
@@ -23,16 +23,22 @@ int	nprocs = 0;				/* running process count */
 
 static char	pfile[] = TEMPLATE;		/* persist file name */
 
-static SUBPROC	rtpd[MAXPROC];		/* process descriptors */
+static SUBPROC	rtpd[MAXPROC];			/* process descriptors */
 static float	*rtbuf = NULL;			/* allocated i/o buffer */
-static int	maxqlen = 0;			/* maximum packets per queue */
+static int	maxqlen;			/* maximum packets per queue */
 
 static PACKET	*pqueue[MAXPROC];		/* packet queues */
 static int	pqlen[MAXPROC];			/* packet queue lengths */
 
+static int bestout(void);
+static int slots_avail(void);
+static void queue_packet(PACKET *p);
+static PACKET * get_packets(int poll);
+static void killpersist(void);
 
+
 int
-start_rtrace()			/* start rtrace process */
+start_rtrace(void)			/* start rtrace process */
 {
 	static char	buf1[8];
 	int	rmaxpack = 0;
@@ -53,6 +59,7 @@ start_rtrace()			/* start rtrace process */
 		rtargv[rtargc++] = "-I-";
 		rtargv[rtargc++] = "-h-";
 		rtargv[rtargc++] = "-ld-";
+		rtargv[rtargc++] = "-co-";
 		sprintf(buf1, "%d", RPACKSIZ);
 		rtargv[rtargc++] = "-x"; rtargv[rtargc++] = buf1;
 		rtargv[rtargc++] = "-y"; rtargv[rtargc++] = "0";
@@ -72,11 +79,9 @@ start_rtrace()			/* start rtrace process */
 		psiz = open_process(&rtpd[nprocs], rtargv);
 		if (psiz <= 0)
 			error(SYSTEM, "cannot start rtrace process");
-		n = psiz/(RPACKSIZ*6*sizeof(float));
-		if (maxqlen == 0) {
-			if (!(maxqlen = n))
-				error(INTERNAL,
-					"bad pipe buffer size assumption");
+		n = psiz/(RPACKSIZ*6*sizeof(float)) + 1;
+		if (!maxqlen) {
+			maxqlen = n;
 			sleep(2);
 		} else if (n != maxqlen)
 			error(INTERNAL, "varying pipe buffer size!");
@@ -90,10 +95,10 @@ start_rtrace()			/* start rtrace process */
 
 
 static int
-bestout()			/* get best process to process packet */
+bestout(void)			/* get best process to process packet */
 {
 	int	cnt;
-	register int	pn, i;
+	int	pn, i;
 
 	pn = 0;			/* find shortest queue */
 	for (i = 1; i < nprocs; i++)
@@ -107,7 +112,7 @@ bestout()			/* get best process to process packet */
 		if (pqlen[i] == pqlen[pn])
 			cnt++;
 				/* break ties fairly */
-	if ((cnt = random() % cnt))
+	if ((cnt = irandom(cnt)))
 		for (i = pn; i < nprocs; i++)
 			if (pqlen[i] == pqlen[pn] && !cnt--)
 				return(i);
@@ -115,11 +120,11 @@ bestout()			/* get best process to process packet */
 }
 
 
-int
-slots_avail()			/* count packet slots available */
+static int
+slots_avail(void)			/* count packet slots available */
 {
-	register int	nslots = 0;
-	register int	i;
+	int	nslots = 0;
+	int	i;
 
 	for (i = nprocs; i--; )
 		nslots += maxqlen - pqlen[i];
@@ -127,8 +132,10 @@ slots_avail()			/* count packet slots available */
 }
 
 
-queue_packet(p)			/* queue up a beam packet */
-register PACKET	*p;
+static void
+queue_packet(			/* queue up a beam packet */
+	PACKET	*p
+)
 {
 	int	pn, n;
 				/* determine process to write to */
@@ -138,13 +145,13 @@ register PACKET	*p;
 	packrays(rtbuf, p);
 	if ((n = p->nr) < RPACKSIZ)	/* add flush block? */
 		memset((char *)(rtbuf+6*n++), '\0', 6*sizeof(float));
-	if (writebuf(rtpd[pn].w, (char *)rtbuf, 6*sizeof(float)*n) < 0)
+	if (writebuf(rtpd[pn].w, rtbuf, 6*sizeof(float)*n) < 0)
 		error(SYSTEM, "write error in queue_packet");
 	p->next = NULL;
 	if (!pqlen[pn]++)	/* add it to the end of the queue */
 		pqueue[pn] = p;
 	else {
-		register PACKET	*rpl = pqueue[pn];
+		PACKET	*rpl = pqueue[pn];
 		while (rpl->next != NULL)
 			rpl = rpl->next;
 		rpl->next = p;
@@ -152,16 +159,17 @@ register PACKET	*p;
 }
 
 
-PACKET *
-get_packets(poll)		/* read packets from rtrace processes */
-int	poll;
+static PACKET *
+get_packets(		/* read packets from rtrace processes */
+	int	poll
+)
 {
 	static struct timeval	tpoll;	/* zero timeval struct */
 	fd_set	readset, errset;
 	PACKET	*pldone = NULL, *plend;
-	register PACKET	*p;
+	PACKET	*p;
 	int	n, nr;
-	register int	pn;
+	int	pn;
 	float	*bp;
 					/* prepare select call */
 	FD_ZERO(&readset); FD_ZERO(&errset); n = 0;
@@ -227,14 +235,16 @@ int	poll;
 	return(pldone);				/* return finished packets */
 eoferr:
 	error(USER, "rtrace process died");
+	return NULL; /* pro forma return */
 }
 
 
 PACKET *
-do_packets(pl)			/* queue a packet list, return finished */
-register PACKET	*pl;
+do_packets(			/* queue a packet list, return finished */
+	PACKET	*pl
+)
 {
-	register PACKET	*p;
+	PACKET	*p;
 					/* consistency check */
 	if (nprocs < 1)
 		error(CONSISTENCY, "do_packets called with no active process");
@@ -248,12 +258,12 @@ register PACKET	*pl;
 
 
 PACKET *
-flush_queue()			/* empty all rtrace queues */
+flush_queue(void)			/* empty all rtrace queues */
 {
 	PACKET	*rpdone = NULL;
-	register PACKET	*rpl;
+	PACKET	*rpl = NULL;
 	float	*bp;
-	register PACKET	*p;
+	PACKET	*p;
 	int	i, n, nr;
 
 	for (i = 0; i < nprocs; i++)
@@ -270,8 +280,7 @@ flush_queue()			/* empty all rtrace queues */
 				if (rpl->nr < RPACKSIZ)
 					nr++;		/* add flush block */
 			}
-			n = readbuf(rtpd[i].r, (char *)rtbuf,
-					4*sizeof(float)*nr);
+			n = readbuf(rtpd[i].r, rtbuf, 4*sizeof(float)*nr);
 			if (n < 0)
 				error(SYSTEM, "read failure in flush_queue");
 			bp = rtbuf;			/* process packets */
@@ -292,8 +301,8 @@ flush_queue()			/* empty all rtrace queues */
 }
 
 
-static
-killpersist()			/* kill persistent process */
+static void
+killpersist(void)			/* kill persistent process */
 {
 	FILE	*fp;
 	int	pid;
@@ -307,17 +316,14 @@ killpersist()			/* kill persistent process */
 
 
 int
-end_rtrace()			/* close rtrace process(es) */
+end_rtrace(void)			/* close rtrace process(es) */
 {
 	int	status = 0, rv;
 
 	if (nprocs > 1)
 		killpersist();
-	while (nprocs > 0) {
-		rv = close_process(&rtpd[--nprocs]);
-		if (rv > 0)
-			status = rv;
-	}
+	status = close_processes(rtpd, nprocs);
+	nprocs = 0;
 	free((void *)rtbuf);
 	rtbuf = NULL;
 	maxqlen = 0;