--- ray/src/rt/devcomm.c 1993/11/18 09:42:58 2.4 +++ ray/src/rt/devcomm.c 2008/08/21 07:05:58 2.15 @@ -1,44 +1,50 @@ -/* Copyright (c) 1988 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: devcomm.c,v 2.15 2008/08/21 07:05:58 greg Exp $"; #endif - /* * devcomm.c - communication routines for separate drivers. * - * 10/5/88 + * External symbols declared in driver.h */ -#include "standard.h" +#include "copyright.h" -#include "color.h" +#include +#include /* XXX platform specific */ +#include "platform.h" +#include "standard.h" #include "driver.h" -#include "vfork.h" - #ifndef DEVPATH #define DEVPATH getenv("PATH") /* device search path */ #endif -static int comm_close(), comm_clear(), comm_paintr(), - comm_getcur(), comm_comout(), comm_comin(), comm_flush(); +FILE *devin, *devout; +int devchild; +static struct driver * final_connect(void); +static void mygets(char *s, FILE *fp); +static void myputs(char *s, FILE *fp); +static void reply_error(char *routine); +static void getstate(void); + +static dr_closef_t comm_close; +static dr_clearf_t comm_clear; +static dr_paintrf_t comm_paintr; +static dr_getcurf_t comm_getcur; +static dr_comoutf_t comm_comout; +static dr_cominf_t comm_comin; +static dr_flushf_t comm_flush; + struct driver comm_driver = { comm_close, comm_clear, comm_paintr, comm_getcur, comm_comout, comm_comin, comm_flush }; -static int mygets(), myputs(), reply_error(), getstate(); -FILE *devin, *devout; - -int devchild; - - static struct driver * -final_connect() /* verify and initialize connection */ +final_connect(void) /* verify and initialize connection */ { putw(COM_SENDM, devout); fflush(devout); @@ -47,16 +53,20 @@ final_connect() /* verify and initialize connection /* get driver parameters */ getstate(); /* set error vectors */ - cmdvec = comm_comout; - if (wrnvec != NULL) - wrnvec = comm_comout; + erract[COMMAND].pf = comm_comout; + /* doesn't work with raypcalls.c + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = comm_comout; + */ return(&comm_driver); } -struct driver * -slave_init(dname, id) /* run rview in slave mode */ -char *dname, *id; +extern struct driver * +slave_init( /* run rview in slave mode */ + char *dname, + char *id +) { devchild = -1; /* we're the slave here */ devout = stdout; /* use standard input */ @@ -65,35 +75,44 @@ char *dname, *id; } -struct driver * -comm_init(dname, id) /* set up and execute driver */ -char *dname, *id; +extern struct driver * +comm_init( /* set up and execute driver */ + char *dname, + char *id +) { - char *devname; + char *dvcname; int p1[2], p2[2]; char pin[16], pout[16]; /* find driver program */ - if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) { - stderr_v(dname); - stderr_v(": not found\n"); + if ((dvcname = getpath(dname, DEVPATH, X_OK)) == NULL) { + eputs(dname); + eputs(": not found\n"); return(NULL); } +#ifdef RHAS_FORK_EXEC /* open communication pipes */ if (pipe(p1) == -1 || pipe(p2) == -1) goto syserr; - if ((devchild = vfork()) == 0) { /* fork driver process */ + if ((devchild = fork()) == 0) { /* fork driver process */ close(p1[1]); close(p2[0]); sprintf(pin, "%d", p1[0]); sprintf(pout, "%d", p2[1]); - execl(devname, dname, pin, pout, id, 0); - perror(devname); + execl(dvcname, dname, pin, pout, id, NULL); + perror(dvcname); _exit(127); } if (devchild == -1) goto syserr; close(p1[0]); close(p2[1]); + /* + * Close write stream on exec to avoid multiprocessing deadlock. + * No use in read stream without it, so set flag there as well. + */ + fcntl(p1[1], F_SETFD, FD_CLOEXEC); + fcntl(p2[0], F_SETFD, FD_CLOEXEC); if ((devout = fdopen(p1[1], "w")) == NULL) goto syserr; if ((devin = fdopen(p2[0], "r")) == NULL) @@ -102,17 +121,25 @@ char *dname, *id; syserr: perror(dname); return(NULL); + +#else /* ! RHAS_FORK_EXEC */ + + eputs(dname); + eputs(": no fork/exec\n"); + return(NULL); + +#endif /* ! RHAS_FORK_EXEC */ } -static -comm_close() /* done with driver */ +static void +comm_close(void) /* done with driver */ { int pid; - cmdvec = NULL; /* reset error vectors */ - if (wrnvec != NULL) - wrnvec = stderr_v; + erract[COMMAND].pf = NULL; /* reset error vectors */ + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = wputs; fclose(devout); fclose(devin); if (devchild < 0) @@ -122,9 +149,11 @@ comm_close() /* done with driver */ } -static -comm_clear(xres, yres) /* clear screen */ -int xres, yres; +static void +comm_clear( /* clear screen */ + int xres, + int yres +) { putc(COM_CLEAR, devout); putw(xres, devout); @@ -133,10 +162,14 @@ int xres, yres; } -static -comm_paintr(col, xmin, ymin, xmax, ymax) /* paint a rectangle */ -COLOR col; -int xmin, ymin, xmax, ymax; +static void +comm_paintr( /* paint a rectangle */ + COLOR col, + int xmin, + int ymin, + int xmax, + int ymax +) { putc(COM_PAINTR, devout); fwrite((char *)col, sizeof(COLOR), 1, devout); @@ -147,8 +180,8 @@ int xmin, ymin, xmax, ymax; } -static -comm_flush() /* flush output to driver */ +static void +comm_flush(void) /* flush output to driver */ { putc(COM_FLUSH, devout); fflush(devout); @@ -159,8 +192,10 @@ comm_flush() /* flush output to driver */ static int -comm_getcur(xp, yp) /* get and return cursor position */ -int *xp, *yp; +comm_getcur( /* get and return cursor position */ + int *xp, + int *yp +) { int c; @@ -175,9 +210,10 @@ int *xp, *yp; } -static -comm_comout(str) /* print string to command line */ -char *str; +static void +comm_comout( /* print string to command line */ + char *str +) { putc(COM_COMOUT, devout); myputs(str, devout); @@ -186,10 +222,11 @@ char *str; } -static -comm_comin(buf, prompt) /* read string from command line */ -char *buf; -char *prompt; +static void +comm_comin( /* read string from command line */ + char *buf, + char *prompt +) { putc(COM_COMIN, devout); if (prompt == NULL) @@ -206,10 +243,11 @@ char *prompt; } -static -mygets(s, fp) /* get string from file (with nul) */ -register char *s; -register FILE *fp; +static void +mygets( /* get string from file (with nul) */ + register char *s, + register FILE *fp +) { register int c; @@ -220,10 +258,11 @@ register FILE *fp; } -static -myputs(s, fp) /* put string to file (with nul) */ -register char *s; -register FILE *fp; +static void +myputs( /* put string to file (with nul) */ + register char *s, + register FILE *fp +) { do putc(*s, fp); @@ -231,18 +270,19 @@ register FILE *fp; } -static -reply_error(routine) /* what should we do here? */ -char *routine; +static void +reply_error( /* what should we do here? */ + char *routine +) { - stderr_v(routine); - stderr_v(": driver reply error\n"); + eputs(routine); + eputs(": driver reply error\n"); quit(1); } -static -getstate() /* get driver state variables */ +static void +getstate(void) /* get driver state variables */ { fread((char *)&comm_driver.pixaspect, sizeof(comm_driver.pixaspect), 1, devin);