ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/rt/persist.c
(Generate patch)

Comparing src/rt/persist.c (file contents):
Revision 2.24 by gregl, Mon Nov 24 15:13:33 1997 UTC vs.
Revision 2.45 by greg, Sat Jun 7 05:09:46 2025 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1997 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Routines for persistent rtrace and rpict processes.
6 + *
7 + *  External symbols declared in ray.h
8   */
9  
10 + #include "copyright.h"
11 +
12 + #include <string.h>
13 + #include <signal.h>
14 + #include <sys/stat.h>
15 + #include <sys/types.h>
16 +
17 + #include "platform.h"
18 + #ifndef NON_POSIX /* XXX need abstraction for process management */
19 + #include <sys/wait.h>
20 + #endif
21 +
22 + #include "rtprocess.h" /* getpid() */
23   #include "standard.h"
24 + #include "random.h"
25 + #include "ray.h"
26  
27   #ifdef F_SETLKW
14 #include "paths.h"
28   #include "selcall.h"
16 #include <signal.h>
17 #include <sys/stat.h>
29  
30   #ifndef TIMELIM
31   #define TIMELIM         (8*3600)        /* time limit for holding pattern */
32   #endif
33  
23 extern char     *strcpy(), *index();
24
34   extern int      headismine;     /* boolean true if header belongs to me */
26
35   extern char     *progname;      /* global program name */
28
36   extern char     *errfile;       /* global error file name */
30
37   static char     *persistfname = NULL;   /* persist file name */
38   static int      persistfd = -1;         /* persist file descriptor */
33
39   static char     inpname[TEMPLEN+1], outpname[TEMPLEN+1], errname[TEMPLEN+1];
40  
41 + typedef void (rsighandler_t)(int);
42 + static rsighandler_t sig_io;
43 + static rsighandler_t sig_alrm;
44  
45 < pfdetach()              /* release persist (and header) resources */
45 >
46 > void
47 > pfdetach(void)          /* release persist (and header) resources */
48   {
49          if (persistfd >= 0)
50                  close(persistfd);
# Line 47 | Line 57 | pfdetach()             /* release persist (and header) resources
57   }
58  
59  
60 < pfclean()               /* clean up persist files */
60 > void
61 > pfclean(void)           /* clean up persist files */
62   {
63          if (persistfd >= 0)
64                  close(persistfd);
# Line 62 | Line 73 | pfclean()              /* clean up persist files */
73   }
74  
75  
76 < pflock(lf)              /* place or release exclusive lock on file */
77 < int     lf;
76 > void
77 > pflock(         /* place or release exclusive lock on file */
78 >        int     lf
79 > )
80   {
81          struct flock    fls;
82  
# Line 76 | Line 89 | int    lf;
89   }
90  
91  
92 < persistfile(pfn)        /* open persist file and lock it */
93 < char    *pfn;
92 > void
93 > persistfile(    /* open persist file and lock it */
94 >        char    *pfn
95 > )
96   {
97          persistfd = open(pfn, O_WRONLY|O_CREAT|O_EXCL, 0644);
98          if (persistfd >= 0) {
# Line 98 | Line 113 | char   *pfn;
113  
114   static int      got_io;
115  
116 < static int sig_io() { got_io++; }
116 > static void sig_io(int i) { got_io++; }
117  
118 < static int sig_alrm() { quit(0); }
118 > static void sig_alrm(int i) { quit(0); }
119  
120  
121 < pfhold()                /* holding pattern for idle rendering process */
121 > void
122 > pfhold(void)            /* holding pattern for idle rendering process */
123   {
124 <        int     (*oldalrm)();
124 >        rsighandler_t   *oldalrm;
125          char    buf[512];
126 <        register int    n;
126 >        int     n;
127                                  /* close input and output descriptors */
128 <        close(fileno(stdin));
129 <        close(fileno(stdout));
128 >        close(0);
129 >        close(1);
130          if (errfile == NULL)
131 <                close(fileno(stderr));
131 >                close(2);
132                                  /* create named pipes for input and output */
133 <        if (mknod(mktemp(strcpy(inpname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
133 >        if (mkfifo(mktemp(strcpy(inpname,TEMPLATE)), 0600) < 0)
134                  goto createrr;
135 <        if (mknod(mktemp(strcpy(outpname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
135 >        if (mkfifo(mktemp(strcpy(outpname,TEMPLATE)), 0600) < 0)
136                  goto createrr;
137          if (errfile == NULL &&
138 <                mknod(mktemp(strcpy(errname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
138 >                mkfifo(mktemp(strcpy(errname,TEMPLATE)), 0600) < 0)
139                  goto createrr;
140          sprintf(buf, "%s %d\n%s\n%s\n%s\n", progname, getpid(),
141                          inpname, outpname, errname);
142          n = strlen(buf);
143          if (write(persistfd, buf, n) < n)
144                  error(SYSTEM, "error writing persist file");
145 <        lseek(persistfd, 0L, 0);
145 >        lseek(persistfd, (off_t)0, SEEK_SET);
146                                  /* wait TIMELIM for someone to signal us */
147          got_io = 0;
148          signal(SIGIO, sig_io);
149 <        oldalrm = (int (*)())signal(SIGALRM, sig_alrm);
149 >        oldalrm = signal(SIGALRM, sig_alrm);
150          alarm(TIMELIM);
151          pflock(0);                      /* unlock persist file for attach */
152          while (!got_io)
# Line 140 | Line 156 | pfhold()               /* holding pattern for idle rendering proces
156          signal(SIGIO, SIG_DFL);
157          pflock(1);                      /* grab persist file back */
158                                  /* someone wants us; reopen stdin and stdout */
159 <        if (freopen(inpname, "r", stdin) == NULL)
160 <                goto openerr;
161 <        if (freopen(outpname, "w", stdout) == NULL)
162 <                goto openerr;
159 >        close(0);
160 >        if (open(inpname, O_RDONLY) != 0)
161 >                error(INTERNAL, "unexpected stdin file number");
162 >        clearerr(stdin);
163 >        close(1);
164 >        if (open(outpname, O_WRONLY) != 1)
165 >                error(INTERNAL, "unexpected stdout file number");
166          sleep(3);               /* give them a chance to open their pipes */
167          if (errname[0]) {
168 <                if (freopen(errname, "w", stderr) == NULL)
169 <                        goto openerr;
168 >                close(2);
169 >                if (open(errname, O_WRONLY) != 2)
170 >                        error(INTERNAL, "unexpected stderr file number");
171                  unlink(errname);
172                  errname[0] = '\0';
173          }
# Line 158 | Line 178 | pfhold()               /* holding pattern for idle rendering proces
178          return;
179   createrr:
180          error(SYSTEM, "cannot create named pipes in pfhold");
161 openerr:
162        error(SYSTEM, "cannot open named pipes in pfhold");
181   }
182  
183  
184 < io_process()            /* just act as go-between for actual process */
184 > void
185 > io_process(void)                /* just act as go-between for actual process */
186   {
187 <        register char   *cp;
188 <        register int    nr, n;
187 >        char    *cp;
188 >        int     nr, n;
189          char    buf[BUFSIZ], *pfin, *pfout, *pferr;
190          int     pid, nfds;
191          int     fdout, fderr = -1;
# Line 178 | Line 197 | io_process()           /* just act as go-between for actual pro
197                  if (!n--)
198                          error(USER, "unattended persist file?");
199                  pflock(0);
200 <                sleep(15);              /* wait until ready */
200 >                sleep(3+(3*getpid()+random())%13);      /* wait until ready */
201                  pflock(1);
202          }
203          if (nr < 0)
204                  error(SYSTEM, "error reading persist file");
205 <        ftruncate(persistfd, 0L);       /* truncate persist file */
205 >        ftruncate(persistfd, (off_t)0L);        /* truncate persist file */
206          pfdetach();                     /* close & release persist file */
207          buf[nr] = '\0';                 /* parse what we got */
208 <        if ((cp = index(buf, ' ')) == NULL)
208 >        if ((cp = strchr(buf, ' ')) == NULL)
209                  goto formerr;
210          *cp++ = '\0';
211          if ((pid = atoi(cp)) <= 0)
212                  goto formerr;
213 <        if ((cp = index(cp, '\n')) == NULL)
213 >        if ((cp = strchr(cp, '\n')) == NULL)
214                  goto formerr;
215          pfin = ++cp;
216 <        if ((cp = index(cp, '\n')) == NULL)
216 >        if ((cp = strchr(cp, '\n')) == NULL)
217                  goto formerr;
218          *cp++ = '\0';
219          pfout = cp;
220 <        if ((cp = index(cp, '\n')) == NULL)
220 >        if ((cp = strchr(cp, '\n')) == NULL)
221                  goto formerr;
222          *cp++ = '\0';
223          pferr = cp;
224 <        if ((cp = index(cp, '\n')) == NULL)
224 >        if ((cp = strchr(cp, '\n')) == NULL)
225                  goto formerr;
226          *cp++ = '\0';
227          if (cp-buf != nr)
# Line 275 | Line 294 | io_process()           /* just act as go-between for actual pro
294                                  if (!strncmp(cp, progname, n) &&
295                                                  cp[n++] == ':' &&
296                                                  cp[n++] == ' ') {
297 <                                        register struct erract  *ep;
297 >                                        struct erract   *ep;
298                                          for (ep = erract; ep < erract+NERRS;
299                                                          ep++)
300                                                  if (ep->pre[0] &&
# Line 310 | Line 329 | io_process()           /* just act as go-between for actual pro
329                                  } while ((nr -= n) > 0);
330                  }
331          }
332 <        wait(0);                /* wait for feeder process */
332 >        kill(pid, SIGTERM);     /* no more process to feed, so... */
333 >        waitpid(pid, 0, 0);     /* wait for feeder process */
334          _exit(status);
335   formerr:
336          error(USER, "format error in persist file");
# Line 322 | Line 342 | writerr:
342  
343   #else
344  
345 < pfclean() {}
345 > void pfclean(void) {}
346  
347   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)