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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.49 by greg, Mon Feb 7 17:08:17 2005 UTC vs.
Revision 2.50 by schorsch, Mon Sep 12 14:40:14 2005 UTC

# Line 22 | Line 22 | static const char RCSid[] = "$Id$";
22   #include <signal.h>
23  
24   #include "platform.h"
25 + #include "rtprocess.h"
26   #include "paths.h"
27   #include "standard.h"
28   #include "view.h"
# Line 94 | Line 95 | VARIABLE       vv[] = {                /* variable-value pairs */
95  
96   struct {
97          char    host[64];               /* control host name */
98 <        int     pid;                    /* control process id */
98 >        RT_PID  pid;                    /* control process id */
99          char    cfname[128];            /* control file name */
100          int     rnext;                  /* next frame to render */
101          int     fnext;                  /* next frame to filter */
# Line 118 | Line 119 | char   arcargs[10240];         /* files to archive */
119   char    *arcfirst, *arcnext;    /* pointers to first and next argument */
120  
121   struct pslot {
122 <        int     pid;                    /* process ID (0 if empty) */
122 >        RT_PID  pid;                    /* process ID (0 if empty) */
123          int     fout;                   /* output frame number */
124          int     (*rcvf)();              /* recover function */
125   }       *pslot;                 /* process slots */
# Line 127 | Line 128 | int    npslots;                /* number of process slots */
128   #define phostname(ps)   ((ps)->hostname[0] ? (ps)->hostname : astat.host)
129   PSERVER *lastpserver;           /* last process server with error */
130  
131 < static struct pslot * findpslot(int pid);
131 > static struct pslot * findpslot(RT_PID pid);
132   static void checkdir(void);
133   static VIEW * getview(int n);
134  
# Line 141 | Line 142 | static int rmfile(char *fn);
142   static int runcom(char *cs);
143   static int pruncom(char *com, char *ppins, int maxcopies);
144   static void bwait(int ncoms);
145 < static int bruncom(char *com, int fout, int (*rf)());
145 > static RT_PID bruncom(char *com, int fout, int (*rf)());
146   static int serverdown(void);
147   static pscompfunc donecom;
148   static int countviews(void);
# Line 1192 | Line 1193 | getexp(int n)                  /* get exposure for nth frame */
1193  
1194  
1195   static struct pslot *
1196 < findpslot(int pid)                      /* find or allocate a process slot */
1196 > findpslot(RT_PID pid)                   /* find or allocate a process slot */
1197   {
1198          register struct pslot   *psempty = NULL;
1199          register int    i;
# Line 1266 | Line 1267 | serverdown(void)                       /* check status of last process ser
1267   }
1268  
1269  
1270 < static int
1270 > static RT_PID
1271   bruncom(                /* run a command in the background */
1272   char    *com,
1273   int     fout,
1274   int     (*rf)()
1275   )
1276   {
1277 <        int     pid;
1277 >        RT_PID  pid;
1278          register struct pslot   *psl;
1279  
1280          if (noaction) {
# Line 1286 | Line 1287 | int    (*rf)()
1287                  bwait(1);
1288          if (!silent) {                          /* echo command */
1289                  PSERVER *ps;
1290 <                int     psn = pid;
1290 >                RT_PID  psn = pid;
1291                  ps = findjob(&psn);
1292                  printf("\t%s\n", com);
1293                  printf("\tProcess started on %s\n", phostname(ps));

Diff Legend

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