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.45 by greg, Sat Jun 7 05:09:46 2025 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
21 – #include "paths.h"
28   #include "selcall.h"
29  
30   #ifndef TIMELIM
31   #define TIMELIM         (8*3600)        /* time limit for holding pattern */
32   #endif
33  
28 – extern void     io_process();
29 –
34   extern int      headismine;     /* boolean true if header belongs to me */
31 –
35   extern char     *progname;      /* global program name */
33 –
36   extern char     *errfile;       /* global error file name */
35 –
37   static char     *persistfname = NULL;   /* persist file name */
38   static int      persistfd = -1;         /* persist file descriptor */
38 –
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 +
46   void
47 < pfdetach()              /* release persist (and header) resources */
47 > pfdetach(void)          /* release persist (and header) resources */
48   {
49          if (persistfd >= 0)
50                  close(persistfd);
# Line 54 | Line 58 | pfdetach()             /* release persist (and header) resources
58  
59  
60   void
61 < pfclean()               /* clean up persist files */
61 > pfclean(void)           /* clean up persist files */
62   {
63          if (persistfd >= 0)
64                  close(persistfd);
# Line 70 | Line 74 | pfclean()              /* clean up persist files */
74  
75  
76   void
77 < pflock(lf)              /* place or release exclusive lock on file */
78 < int     lf;
77 > pflock(         /* place or release exclusive lock on file */
78 >        int     lf
79 > )
80   {
81          struct flock    fls;
82  
# Line 85 | Line 90 | int    lf;
90  
91  
92   void
93 < persistfile(pfn)        /* open persist file and lock it */
94 < char    *pfn;
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 */
122 > pfhold(void)            /* holding pattern for idle rendering process */
123   {
124 <        void    (*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 (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 150 | 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 */
153 –        /*
154 –        if (freopen(inpname, "r", stdin) == NULL)
155 –                goto openerr;
156 –        if (freopen(outpname, "w", stdout) == NULL)
157 –                goto openerr;
158 –        */
159          close(0);
160          if (open(inpname, O_RDONLY) != 0)
161                  error(INTERNAL, "unexpected stdin file number");
# Line 178 | Line 178 | pfhold()               /* holding pattern for idle rendering proces
178          return;
179   createrr:
180          error(SYSTEM, "cannot create named pipes in pfhold");
181 – openerr:
182 –        error(SYSTEM, "cannot open named pipes in pfhold");
181   }
182  
183  
184   void
185 < io_process()            /* just act as go-between for actual process */
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 204 | Line 202 | io_process()           /* just act as go-between for actual pro
202          }
203          if (nr < 0)
204                  error(SYSTEM, "error reading persist file");
207 – #ifndef _WIN32 /* XXX we need a replacement for that one */
205          ftruncate(persistfd, (off_t)0L);        /* truncate persist file */
209 – #endif
206          pfdetach();                     /* close & release persist file */
207          buf[nr] = '\0';                 /* parse what we got */
208          if ((cp = strchr(buf, ' ')) == NULL)
# Line 298 | 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 333 | 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 345 | Line 342 | writerr:
342  
343   #else
344  
345 < void pfclean() {}
345 > void pfclean(void) {}
346  
347   #endif

Diff Legend

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