--- ray/src/hd/rholo4.c	1997/11/06 16:12:41	3.4
+++ ray/src/hd/rholo4.c	1997/12/12 11:13:17	3.13
@@ -18,28 +18,45 @@ static char SCCSid[] = "$SunId$ SGI";
 
 static int	inp_flags;
 static int	dpd[3];
-static int	pipesiz;
+static FILE	*dpout;
 
 
 disp_open(dname)		/* open the named display driver */
 char	*dname;
 {
-	char	dpath[128], *com[2];
+	char	dpath[128], fd0[8], fd1[8], *cmd[5];
 	int	i;
-
+				/* get full display program name */
 #ifdef DEVPATH
 	sprintf(dpath, "%s/%s%s", DEVPATH, dname, HDSUF);
 #else
 	sprintf(dpath, "dev/%s%s", dname, HDSUF);
 #endif
-	com[0] = dpath; com[1] = NULL;
-	pipesiz = open_process(dpd, com);
-	if (pipesiz <= 0)
+				/* dup stdin and stdout */
+	if (readinp)
+		sprintf(fd0, "%d", dup(0));
+	else
+		strcpy(fd0, "-1");
+	sprintf(fd1, "%d", dup(1));
+				/* start the display process */
+	cmd[0] = dpath;
+	cmd[1] = froot; cmd[2] = fd1; cmd[3] = fd0;
+	cmd[4] = NULL;
+	i = open_process(dpd, cmd);
+	if (i <= 0)
 		error(USER, "cannot start display process");
+	if ((dpout = fdopen(dpd[1], "w")) == NULL)
+		error(SYSTEM, "cannot associate FILE with display pipe");
+	dpd[1] = -1;		/* causes ignored error in close_process() */
 	inp_flags = 0;
+				/* close dup'ed stdin and stdout */
+	if (readinp)
+		close(atoi(fd0));
+	close(atoi(fd1));
 				/* write out hologram grids */
 	for (i = 0; hdlist[i] != NULL; i++)
 		disp_result(DS_ADDHOLO, sizeof(HDGRID), (char *)hdlist[i]);
+	disp_flush();
 }
 
 
@@ -57,8 +74,10 @@ int	block;
 	int	n;
 	char	*buf = NULL;
 
-	if (pipesiz <= 0)
+	if (dpout == NULL)
 		return(-1);
+					/* flush display output */
+	disp_flush();
 					/* check read blocking */
 	if (block != (inp_flags == 0)) {
 		inp_flags = block ? 0 : FNONBLK;
@@ -68,8 +87,10 @@ int	block;
 					/* read message header */
 	n = read(dpd[0], (char *)&msg, sizeof(MSGHEAD));
 	if (n != sizeof(MSGHEAD)) {
-		if (n >= 0)
+		if (n >= 0) {
+			dpout = NULL;
 			error(USER, "display process died");
+		}
 		if (errno != EAGAIN & errno != EINTR)
 			goto readerr;
 		return(2);		/* acceptable failure */
@@ -84,40 +105,84 @@ int	block;
 			goto readerr;
 	}
 	switch (msg.type) {		/* take appropriate action */
-	case DR_BUNDLE:
+	case DR_BUNDLE:		/* new bundle to calculate */
 		if (msg.nbytes != sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_BUNDLE from display process");
 		bundle_set(BS_ADD, (PACKHEAD *)buf, 1);
 		break;
-	case DR_NEWSET:
+	case DR_NEWSET:		/* new calculation set */
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_NEWSET from display process");
 		disp_result(DS_STARTIMM, 0, NULL);
 		bundle_set(BS_NEW, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
 		disp_result(DS_ENDIMM, 0, NULL);
+		disp_flush();
 		break;
-	case DR_ADDSET:
+	case DR_ADDSET:		/* add to calculation set */
 		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_ADDSET from display process");
 		disp_result(DS_STARTIMM, 0, NULL);
 		bundle_set(BS_ADD, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
 		disp_result(DS_ENDIMM, 0, NULL);
+		disp_check(0);		/* hack -- delete usu. follows add */
 		break;
-	case DR_DELSET:
+	case DR_ADJSET:		/* adjust calculation set members */
 		if (msg.nbytes % sizeof(PACKHEAD))
+			error(INTERNAL, "bad DR_ADJSET from display process");
+		disp_result(DS_STARTIMM, 0, NULL);
+		bundle_set(BS_ADJ, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
+		disp_result(DS_ENDIMM, 0, NULL);
+		disp_flush();
+		break;
+	case DR_DELSET:		/* delete from calculation set */
+		if (msg.nbytes % sizeof(PACKHEAD))
 			error(INTERNAL, "bad DR_DELSET from display process");
 		bundle_set(BS_DEL, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD));
 		break;
-	case DR_ATTEN:
+	case DR_ATTEN:		/* block for priority request */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_ATTEN from display process");
 					/* send acknowledgement */
 		disp_result(DS_ACKNOW, 0, NULL);
 		return(disp_check(1));	/* block on following request */
-	case DR_SHUTDOWN:
+	case DR_KILL:		/* kill computation process(es) */
 		if (msg.nbytes)
+			error(INTERNAL, "bad DR_KILL from display process");
+		if (nprocs > 0) {
+			done_packets(flush_queue());
+			if (end_rtrace())
+				error(WARNING, "bad status returned by rtrace");
+		} else
+			error(WARNING, "no rtrace process to kill");
+		break;
+	case DR_RESTART:	/* restart computation process(es) */
+		if (msg.nbytes)
+			error(INTERNAL, "bad DR_RESTART from display process");
+		if (ncprocs > nprocs) {
+			checkrad();
+			if (start_rtrace() < 1)
+				error(WARNING, "cannot restart rtrace");
+		} else if (nprocs > 0)
+			error(WARNING, "rtrace already runnning");
+		else
+			error(WARNING, "holodeck not open for writing");
+		break;
+	case DR_CLOBBER:	/* clobber holodeck */
+		if (msg.nbytes)
+			error(INTERNAL, "bad DR_CLOBBER from display process");
+		if (!force || !ncprocs)
+			error(WARNING, "request to clobber holodeck denied");
+		else {
+			error(WARNING, "clobbering holodeck contents");
+			hdclobber(NULL);
+		}
+		break;
+	case DR_SHUTDOWN:	/* shut down program */
+		if (msg.nbytes)
 			error(INTERNAL, "bad DR_SHUTDOWN from display process");
 		return(0);		/* zero return signals shutdown */
+	case DR_NOOP:		/* do nothing */
+		break;
 	default:
 		error(INTERNAL, "unrecognized request from display process");
 	}
@@ -136,45 +201,33 @@ disp_close()			/* close our display process */
 {
 	int	rval;
 
-	if (pipesiz <= 0)
+	if (dpout == NULL)
 		return(-1);
 	disp_result(DS_SHUTDOWN, 0, NULL);
-	pipesiz = 0;
+	fclose(dpout);
+	dpout = NULL;
 	return(close_process(dpd));
 }
 
 
-disp_result(type, nbytes, p)	/* send result message to display process */
+disp_result(type, nbytes, p)	/* queue result message to display process */
 int	type, nbytes;
 char	*p;
 {
-	struct iovec	iov[2];
 	MSGHEAD	msg;
-	int	n;
 
-	if (pipesiz <= 0)
+	if (dpout == NULL)
 		return;
 	msg.type = type;
 	msg.nbytes = nbytes;
-	if (nbytes == 0 || sizeof(MSGHEAD)+nbytes > pipesiz) {
-		do
-			n = write(dpd[1], (char *)&msg, sizeof(MSGHEAD));
-		while (n < 0 && errno == EINTR);
-		if (n != sizeof(MSGHEAD))
-			goto writerr;
-		if (nbytes > 0 && writebuf(dpd[1], p, nbytes) != nbytes)
-			goto writerr;
-		return;
-	}
-	iov[0].iov_base = (char *)&msg;
-	iov[0].iov_len = sizeof(MSGHEAD);
-	iov[1].iov_base = p;
-	iov[1].iov_len = nbytes;
-	do
-		n = writev(dpd[1], iov, 2);
-	while (n < 0 && errno == EINTR);
-	if (n == sizeof(MSGHEAD)+nbytes)
-		return;
-writerr:
-	error(SYSTEM, "write error in disp_result");
+	fwrite((char *)&msg, sizeof(MSGHEAD), 1, dpout);
+	if (nbytes > 0)
+		fwrite(p, 1, nbytes, dpout);
+}
+
+
+disp_flush()			/* flush output to display */
+{
+	if (fflush(dpout) < 0)
+		error(SYSTEM, "error writing to the display process");
 }