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

Comparing ray/src/rt/persist.c (file contents):
Revision 2.24 by gregl, Mon Nov 24 15:13:33 1997 UTC vs.
Revision 2.42 by greg, Wed Dec 15 17:24:29 2010 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
28   #include "paths.h"
29   #include "selcall.h"
16 – #include <signal.h>
17 – #include <sys/stat.h>
30  
31   #ifndef TIMELIM
32   #define TIMELIM         (8*3600)        /* time limit for holding pattern */
33   #endif
34  
23 – extern char     *strcpy(), *index();
24 –
35   extern int      headismine;     /* boolean true if header belongs to me */
26 –
36   extern char     *progname;      /* global program name */
28 –
37   extern char     *errfile;       /* global error file name */
30 –
38   static char     *persistfname = NULL;   /* persist file name */
39   static int      persistfd = -1;         /* persist file descriptor */
33 –
40   static char     inpname[TEMPLEN+1], outpname[TEMPLEN+1], errname[TEMPLEN+1];
41  
42 + typedef void (rsighandler_t)(int);
43 + static rsighandler_t sig_io;
44 + static rsighandler_t sig_alrm;
45  
46 < pfdetach()              /* release persist (and header) resources */
46 >
47 > extern void
48 > pfdetach(void)          /* release persist (and header) resources */
49   {
50          if (persistfd >= 0)
51                  close(persistfd);
# Line 47 | Line 58 | pfdetach()             /* release persist (and header) resources
58   }
59  
60  
61 < pfclean()               /* clean up persist files */
61 > extern void
62 > pfclean(void)           /* clean up persist files */
63   {
64          if (persistfd >= 0)
65                  close(persistfd);
# Line 62 | Line 74 | pfclean()              /* clean up persist files */
74   }
75  
76  
77 < pflock(lf)              /* place or release exclusive lock on file */
78 < int     lf;
77 > extern void
78 > pflock(         /* place or release exclusive lock on file */
79 >        int     lf
80 > )
81   {
82          struct flock    fls;
83  
# Line 76 | Line 90 | int    lf;
90   }
91  
92  
93 < persistfile(pfn)        /* open persist file and lock it */
94 < char    *pfn;
93 > extern void
94 > persistfile(    /* open persist file and lock it */
95 >        char    *pfn
96 > )
97   {
98          persistfd = open(pfn, O_WRONLY|O_CREAT|O_EXCL, 0644);
99          if (persistfd >= 0) {
# Line 98 | Line 114 | char   *pfn;
114  
115   static int      got_io;
116  
117 < static int sig_io() { got_io++; }
117 > static void sig_io(int i) { got_io++; }
118  
119 < static int sig_alrm() { quit(0); }
119 > static void sig_alrm(int i) { quit(0); }
120  
121  
122 < pfhold()                /* holding pattern for idle rendering process */
122 > extern void
123 > pfhold(void)            /* holding pattern for idle rendering process */
124   {
125 <        int     (*oldalrm)();
125 >        rsighandler_t   *oldalrm;
126          char    buf[512];
127          register int    n;
128                                  /* close input and output descriptors */
129 <        close(fileno(stdin));
130 <        close(fileno(stdout));
129 >        close(0);
130 >        close(1);
131          if (errfile == NULL)
132 <                close(fileno(stderr));
132 >                close(2);
133                                  /* create named pipes for input and output */
134 <        if (mknod(mktemp(strcpy(inpname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
134 >        if (mkfifo(mktemp(strcpy(inpname,TEMPLATE)), 0600) < 0)
135                  goto createrr;
136 <        if (mknod(mktemp(strcpy(outpname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
136 >        if (mkfifo(mktemp(strcpy(outpname,TEMPLATE)), 0600) < 0)
137                  goto createrr;
138          if (errfile == NULL &&
139 <                mknod(mktemp(strcpy(errname,TEMPLATE)), S_IFIFO|0600, 0) < 0)
139 >                mkfifo(mktemp(strcpy(errname,TEMPLATE)), 0600) < 0)
140                  goto createrr;
141          sprintf(buf, "%s %d\n%s\n%s\n%s\n", progname, getpid(),
142                          inpname, outpname, errname);
143          n = strlen(buf);
144          if (write(persistfd, buf, n) < n)
145                  error(SYSTEM, "error writing persist file");
146 <        lseek(persistfd, 0L, 0);
146 >        lseek(persistfd, (off_t)0, SEEK_SET);
147                                  /* wait TIMELIM for someone to signal us */
148          got_io = 0;
149          signal(SIGIO, sig_io);
150 <        oldalrm = (int (*)())signal(SIGALRM, sig_alrm);
150 >        oldalrm = signal(SIGALRM, sig_alrm);
151          alarm(TIMELIM);
152          pflock(0);                      /* unlock persist file for attach */
153          while (!got_io)
# Line 140 | Line 157 | pfhold()               /* holding pattern for idle rendering proces
157          signal(SIGIO, SIG_DFL);
158          pflock(1);                      /* grab persist file back */
159                                  /* someone wants us; reopen stdin and stdout */
160 <        if (freopen(inpname, "r", stdin) == NULL)
161 <                goto openerr;
162 <        if (freopen(outpname, "w", stdout) == NULL)
163 <                goto openerr;
160 >        close(0);
161 >        if (open(inpname, O_RDONLY) != 0)
162 >                error(INTERNAL, "unexpected stdin file number");
163 >        clearerr(stdin);
164 >        close(1);
165 >        if (open(outpname, O_WRONLY) != 1)
166 >                error(INTERNAL, "unexpected stdout file number");
167          sleep(3);               /* give them a chance to open their pipes */
168          if (errname[0]) {
169 <                if (freopen(errname, "w", stderr) == NULL)
170 <                        goto openerr;
169 >                close(2);
170 >                if (open(errname, O_WRONLY) != 2)
171 >                        error(INTERNAL, "unexpected stderr file number");
172                  unlink(errname);
173                  errname[0] = '\0';
174          }
# Line 158 | Line 179 | pfhold()               /* holding pattern for idle rendering proces
179          return;
180   createrr:
181          error(SYSTEM, "cannot create named pipes in pfhold");
161 – openerr:
162 –        error(SYSTEM, "cannot open named pipes in pfhold");
182   }
183  
184  
185 < io_process()            /* just act as go-between for actual process */
185 > extern void
186 > io_process(void)                /* just act as go-between for actual process */
187   {
188          register char   *cp;
189          register int    nr, n;
# Line 178 | Line 198 | io_process()           /* just act as go-between for actual pro
198                  if (!n--)
199                          error(USER, "unattended persist file?");
200                  pflock(0);
201 <                sleep(15);              /* wait until ready */
201 >                sleep(3+(3*getpid()+random())%13);      /* wait until ready */
202                  pflock(1);
203          }
204          if (nr < 0)
205                  error(SYSTEM, "error reading persist file");
206 <        ftruncate(persistfd, 0L);       /* truncate persist file */
206 > #ifndef _WIN32 /* XXX we need a replacement for that one */
207 >        ftruncate(persistfd, (off_t)0L);        /* truncate persist file */
208 > #endif
209          pfdetach();                     /* close & release persist file */
210          buf[nr] = '\0';                 /* parse what we got */
211 <        if ((cp = index(buf, ' ')) == NULL)
211 >        if ((cp = strchr(buf, ' ')) == NULL)
212                  goto formerr;
213          *cp++ = '\0';
214          if ((pid = atoi(cp)) <= 0)
215                  goto formerr;
216 <        if ((cp = index(cp, '\n')) == NULL)
216 >        if ((cp = strchr(cp, '\n')) == NULL)
217                  goto formerr;
218          pfin = ++cp;
219 <        if ((cp = index(cp, '\n')) == NULL)
219 >        if ((cp = strchr(cp, '\n')) == NULL)
220                  goto formerr;
221          *cp++ = '\0';
222          pfout = cp;
223 <        if ((cp = index(cp, '\n')) == NULL)
223 >        if ((cp = strchr(cp, '\n')) == NULL)
224                  goto formerr;
225          *cp++ = '\0';
226          pferr = cp;
227 <        if ((cp = index(cp, '\n')) == NULL)
227 >        if ((cp = strchr(cp, '\n')) == NULL)
228                  goto formerr;
229          *cp++ = '\0';
230          if (cp-buf != nr)
# Line 310 | Line 332 | io_process()           /* just act as go-between for actual pro
332                                  } while ((nr -= n) > 0);
333                  }
334          }
335 <        wait(0);                /* wait for feeder process */
335 >        kill(pid, SIGTERM);     /* no more process to feed, so... */
336 >        waitpid(pid, 0, 0);     /* wait for feeder process */
337          _exit(status);
338   formerr:
339          error(USER, "format error in persist file");
# Line 322 | Line 345 | writerr:
345  
346   #else
347  
348 < pfclean() {}
348 > extern void pfclean(void) {}
349  
350   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines