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.38 by schorsch, Wed Jun 7 17:52:04 2006 UTC vs.
Revision 2.42 by greg, Wed Dec 15 17:24:29 2010 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   #include <signal.h>
14   #include <sys/stat.h>
15   #include <sys/types.h>
16 – #include <sys/wait.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"
# Line 36 | Line 39 | static char    *persistfname = NULL;   /* persist file name
39   static int      persistfd = -1;         /* persist file descriptor */
40   static char     inpname[TEMPLEN+1], outpname[TEMPLEN+1], errname[TEMPLEN+1];
41  
42 < typedef void (sighandler_t)(int);
43 < static sighandler_t sig_io;
44 < static sighandler_t sig_alrm;
42 > typedef void (rsighandler_t)(int);
43 > static rsighandler_t sig_io;
44 > static rsighandler_t sig_alrm;
45  
46  
47   extern void
# Line 119 | Line 122 | static void sig_alrm(int i) { quit(0); }
122   extern void
123   pfhold(void)            /* holding pattern for idle rendering process */
124   {
125 <        sighandler_t    *oldalrm;
125 >        rsighandler_t   *oldalrm;
126          char    buf[512];
127          register int    n;
128                                  /* close input and output descriptors */
# Line 154 | Line 157 | pfhold(void)           /* holding pattern for idle rendering pr
157          signal(SIGIO, SIG_DFL);
158          pflock(1);                      /* grab persist file back */
159                                  /* someone wants us; reopen stdin and stdout */
157 –        /*
158 –        if (freopen(inpname, "r", stdin) == NULL)
159 –                goto openerr;
160 –        if (freopen(outpname, "w", stdout) == NULL)
161 –                goto openerr;
162 –        */
160          close(0);
161          if (open(inpname, O_RDONLY) != 0)
162                  error(INTERNAL, "unexpected stdin file number");
# Line 182 | Line 179 | pfhold(void)           /* holding pattern for idle rendering pr
179          return;
180   createrr:
181          error(SYSTEM, "cannot create named pipes in pfhold");
185 – openerr:
186 –        error(SYSTEM, "cannot open named pipes in pfhold");
182   }
183  
184  

Diff Legend

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