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.31 by schorsch, Sat Aug 30 09:03:31 2003 UTC vs.
Revision 2.43 by greg, Fri Nov 8 18:08:07 2013 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
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"
# Line 25 | Line 32 | static const char      RCSid[] = "$Id$";
32   #define TIMELIM         (8*3600)        /* time limit for holding pattern */
33   #endif
34  
28 – extern void     io_process();
29 –
35   extern int      headismine;     /* boolean true if header belongs to me */
31 –
36   extern char     *progname;      /* global program name */
33 –
37   extern char     *errfile;       /* global error file name */
35 –
38   static char     *persistfname = NULL;   /* persist file name */
39   static int      persistfd = -1;         /* persist file descriptor */
38 –
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 +
47   void
48 < pfdetach()              /* release persist (and header) resources */
48 > pfdetach(void)          /* release persist (and header) resources */
49   {
50          if (persistfd >= 0)
51                  close(persistfd);
# Line 54 | Line 59 | pfdetach()             /* release persist (and header) resources
59  
60  
61   void
62 < pfclean()               /* clean up persist files */
62 > pfclean(void)           /* clean up persist files */
63   {
64          if (persistfd >= 0)
65                  close(persistfd);
# Line 70 | Line 75 | pfclean()              /* clean up persist files */
75  
76  
77   void
78 < pflock(lf)              /* place or release exclusive lock on file */
79 < int     lf;
78 > pflock(         /* place or release exclusive lock on file */
79 >        int     lf
80 > )
81   {
82          struct flock    fls;
83  
# Line 85 | Line 91 | int    lf;
91  
92  
93   void
94 < persistfile(pfn)        /* open persist file and lock it */
95 < char    *pfn;
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 107 | Line 114 | char   *pfn;
114  
115   static int      got_io;
116  
117 < static void sig_io() { got_io++; }
117 > static void sig_io(int i) { got_io++; }
118  
119 < static void sig_alrm() { quit(0); }
119 > static void sig_alrm(int i) { quit(0); }
120  
121  
122   void
123 < pfhold()                /* holding pattern for idle rendering process */
123 > pfhold(void)            /* holding pattern for idle rendering process */
124   {
125 <        void    (*oldalrm)();
125 >        rsighandler_t   *oldalrm;
126          char    buf[512];
127 <        register int    n;
127 >        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 (mkfifo(mktemp(strcpy(inpname,TEMPLATE)), 0600) < 0)
135                  goto createrr;
# Line 136 | Line 143 | pfhold()               /* holding pattern for idle rendering proces
143          n = strlen(buf);
144          if (write(persistfd, buf, n) < n)
145                  error(SYSTEM, "error writing persist file");
146 <        lseek(persistfd, (off_t)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 = (void (*)())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 150 | 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 */
153 –        /*
154 –        if (freopen(inpname, "r", stdin) == NULL)
155 –                goto openerr;
156 –        if (freopen(outpname, "w", stdout) == NULL)
157 –                goto openerr;
158 –        */
160          close(0);
161          if (open(inpname, O_RDONLY) != 0)
162                  error(INTERNAL, "unexpected stdin file number");
# Line 178 | Line 179 | pfhold()               /* holding pattern for idle rendering proces
179          return;
180   createrr:
181          error(SYSTEM, "cannot create named pipes in pfhold");
181 – openerr:
182 –        error(SYSTEM, "cannot open named pipes in pfhold");
182   }
183  
184  
185   void
186 < io_process()            /* just act as go-between for actual process */
186 > io_process(void)                /* just act as go-between for actual process */
187   {
188 <        register char   *cp;
189 <        register int    nr, n;
188 >        char    *cp;
189 >        int     nr, n;
190          char    buf[BUFSIZ], *pfin, *pfout, *pferr;
191          int     pid, nfds;
192          int     fdout, fderr = -1;
# Line 298 | Line 297 | io_process()           /* just act as go-between for actual pro
297                                  if (!strncmp(cp, progname, n) &&
298                                                  cp[n++] == ':' &&
299                                                  cp[n++] == ' ') {
300 <                                        register struct erract  *ep;
300 >                                        struct erract   *ep;
301                                          for (ep = erract; ep < erract+NERRS;
302                                                          ep++)
303                                                  if (ep->pre[0] &&
# Line 333 | 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 345 | Line 345 | writerr:
345  
346   #else
347  
348 < void pfclean() {}
348 > void pfclean(void) {}
349  
350   #endif

Diff Legend

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