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.28 by schorsch, Thu Jun 26 00:58:10 2003 UTC vs.
Revision 2.39 by schorsch, Mon Apr 21 07:31:30 2008 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
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 + #ifndef NON_POSIX /* XXX need abstraction for process management */
17 + #include <sys/wait.h>
18 + #endif
19 +
20 + #include "platform.h"
21 + #include "rtprocess.h" /* getpid() */
22   #include "standard.h"
23   #include "random.h"
24 + #include "ray.h"
25  
26   #ifdef F_SETLKW
27   #include "paths.h"
28   #include "selcall.h"
18 – #include <signal.h>
19 – #include <sys/stat.h>
29  
30   #ifndef TIMELIM
31   #define TIMELIM         (8*3600)        /* time limit for holding pattern */
32   #endif
33  
25 – #ifndef freebsd
26 – #define mkfifo(fn,md)   mknod(fn, S_IFIFO|(md), 0)
27 – #endif
28 –
29 – extern void     io_process();
30 –
34   extern int      headismine;     /* boolean true if header belongs to me */
32 –
35   extern char     *progname;      /* global program name */
34 –
36   extern char     *errfile;       /* global error file name */
36 –
37   static char     *persistfname = NULL;   /* persist file name */
38   static int      persistfd = -1;         /* persist file descriptor */
39 –
39   static char     inpname[TEMPLEN+1], outpname[TEMPLEN+1], errname[TEMPLEN+1];
40  
41 + typedef void (sighandler_t)(int);
42 + static sighandler_t sig_io;
43 + static sighandler_t sig_alrm;
44  
45 < void
46 < pfdetach()              /* release persist (and header) resources */
45 >
46 > extern void
47 > pfdetach(void)          /* release persist (and header) resources */
48   {
49          if (persistfd >= 0)
50                  close(persistfd);
# Line 54 | Line 57 | pfdetach()             /* release persist (and header) resources
57   }
58  
59  
60 < void
61 < pfclean()               /* clean up persist files */
60 > extern void
61 > pfclean(void)           /* clean up persist files */
62   {
63          if (persistfd >= 0)
64                  close(persistfd);
# Line 70 | Line 73 | pfclean()              /* clean up persist files */
73   }
74  
75  
76 < void
77 < pflock(lf)              /* place or release exclusive lock on file */
78 < int     lf;
76 > extern void
77 > pflock(         /* place or release exclusive lock on file */
78 >        int     lf
79 > )
80   {
81          struct flock    fls;
82  
# Line 85 | Line 89 | int    lf;
89   }
90  
91  
92 < persistfile(pfn)        /* open persist file and lock it */
93 < char    *pfn;
92 > extern 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 107 | Line 113 | char   *pfn;
113  
114   static int      got_io;
115  
116 < static void sig_io() { got_io++; }
116 > static void sig_io(int i) { got_io++; }
117  
118 < static void sig_alrm() { quit(0); }
118 > static void sig_alrm(int i) { quit(0); }
119  
120  
121 < void
122 < pfhold()                /* holding pattern for idle rendering process */
121 > extern void
122 > pfhold(void)            /* holding pattern for idle rendering process */
123   {
124 <        void    (*oldalrm)();
124 >        sighandler_t    *oldalrm;
125          char    buf[512];
126          register 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 (mkfifo(mktemp(strcpy(inpname,TEMPLATE)), 0600) < 0)
134                  goto createrr;
# Line 136 | Line 142 | pfhold()               /* holding pattern for idle rendering proces
142          n = strlen(buf);
143          if (write(persistfd, buf, n) < n)
144                  error(SYSTEM, "error writing persist file");
145 <        lseek(persistfd, (off_t)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 = (void (*)())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 183 | Line 189 | openerr:
189   }
190  
191  
192 < void
193 < io_process()            /* just act as go-between for actual process */
192 > extern void
193 > io_process(void)                /* just act as go-between for actual process */
194   {
195          register char   *cp;
196          register int    nr, n;
# Line 209 | Line 215 | io_process()           /* just act as go-between for actual pro
215   #endif
216          pfdetach();                     /* close & release persist file */
217          buf[nr] = '\0';                 /* parse what we got */
218 <        if ((cp = index(buf, ' ')) == NULL)
218 >        if ((cp = strchr(buf, ' ')) == NULL)
219                  goto formerr;
220          *cp++ = '\0';
221          if ((pid = atoi(cp)) <= 0)
222                  goto formerr;
223 <        if ((cp = index(cp, '\n')) == NULL)
223 >        if ((cp = strchr(cp, '\n')) == NULL)
224                  goto formerr;
225          pfin = ++cp;
226 <        if ((cp = index(cp, '\n')) == NULL)
226 >        if ((cp = strchr(cp, '\n')) == NULL)
227                  goto formerr;
228          *cp++ = '\0';
229          pfout = cp;
230 <        if ((cp = index(cp, '\n')) == NULL)
230 >        if ((cp = strchr(cp, '\n')) == NULL)
231                  goto formerr;
232          *cp++ = '\0';
233          pferr = cp;
234 <        if ((cp = index(cp, '\n')) == NULL)
234 >        if ((cp = strchr(cp, '\n')) == NULL)
235                  goto formerr;
236          *cp++ = '\0';
237          if (cp-buf != nr)
# Line 333 | Line 339 | io_process()           /* just act as go-between for actual pro
339                                  } while ((nr -= n) > 0);
340                  }
341          }
342 <        wait(0);                /* wait for feeder process */
342 >        kill(pid, SIGTERM);     /* no more process to feed, so... */
343 >        waitpid(pid, 0, 0);     /* wait for feeder process */
344          _exit(status);
345   formerr:
346          error(USER, "format error in persist file");
# Line 345 | Line 352 | writerr:
352  
353   #else
354  
355 < void pfclean() {}
355 > extern void pfclean(void) {}
356  
357   #endif

Diff Legend

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