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

Comparing ray/src/hd/rholo2l.c (file contents):
Revision 3.15 by schorsch, Sun Jul 27 22:12:02 2003 UTC vs.
Revision 3.17 by greg, Fri Mar 4 02:48:14 2016 UTC

# Line 30 | Line 30 | static int     maxqlen = 0;                    /* maximum packets per queue
30   static PACKET   *pqueue[MAXPROC];               /* packet queues */
31   static int      pqlen[MAXPROC];                 /* packet queue lengths */
32  
33 + static int bestout(void);
34 + static int slots_avail(void);
35 + static void queue_packet(PACKET *p);
36 + static PACKET * get_packets(int poll);
37 + static void killpersist(void);
38  
39 < int
40 < start_rtrace()                  /* start rtrace process */
39 >
40 > extern int
41 > start_rtrace(void)                      /* start rtrace process */
42   {
43          static char     buf1[8];
44          int     rmaxpack = 0;
# Line 90 | Line 96 | start_rtrace()                 /* start rtrace process */
96  
97  
98   static int
99 < bestout()                       /* get best process to process packet */
99 > bestout(void)                   /* get best process to process packet */
100   {
101          int     cnt;
102          register int    pn, i;
# Line 115 | Line 121 | bestout()                      /* get best process to process packet */
121   }
122  
123  
124 < int
125 < slots_avail()                   /* count packet slots available */
124 > static int
125 > slots_avail(void)                       /* count packet slots available */
126   {
127          register int    nslots = 0;
128          register int    i;
# Line 127 | Line 133 | slots_avail()                  /* count packet slots available */
133   }
134  
135  
136 < queue_packet(p)                 /* queue up a beam packet */
137 < register PACKET *p;
136 > static void
137 > queue_packet(                   /* queue up a beam packet */
138 >        register PACKET *p
139 > )
140   {
141          int     pn, n;
142                                  /* determine process to write to */
# Line 152 | Line 160 | register PACKET        *p;
160   }
161  
162  
163 < PACKET *
164 < get_packets(poll)               /* read packets from rtrace processes */
165 < int     poll;
163 > static PACKET *
164 > get_packets(            /* read packets from rtrace processes */
165 >        int     poll
166 > )
167   {
168          static struct timeval   tpoll;  /* zero timeval struct */
169          fd_set  readset, errset;
# Line 227 | Line 236 | int    poll;
236          return(pldone);                         /* return finished packets */
237   eoferr:
238          error(USER, "rtrace process died");
239 +        return NULL; /* pro forma return */
240   }
241  
242  
243 < PACKET *
244 < do_packets(pl)                  /* queue a packet list, return finished */
245 < register PACKET *pl;
243 > extern PACKET *
244 > do_packets(                     /* queue a packet list, return finished */
245 >        register PACKET *pl
246 > )
247   {
248          register PACKET *p;
249                                          /* consistency check */
# Line 247 | Line 258 | register PACKET        *pl;
258   }
259  
260  
261 < PACKET *
262 < flush_queue()                   /* empty all rtrace queues */
261 > extern PACKET *
262 > flush_queue(void)                       /* empty all rtrace queues */
263   {
264          PACKET  *rpdone = NULL;
265 <        register PACKET *rpl;
265 >        register PACKET *rpl = NULL;
266          float   *bp;
267          register PACKET *p;
268          int     i, n, nr;
# Line 292 | Line 303 | flush_queue()                  /* empty all rtrace queues */
303   }
304  
305  
306 < static
307 < killpersist()                   /* kill persistent process */
306 > static void
307 > killpersist(void)                       /* kill persistent process */
308   {
309          FILE    *fp;
310          int     pid;
# Line 306 | Line 317 | killpersist()                  /* kill persistent process */
317   }
318  
319  
320 < int
321 < end_rtrace()                    /* close rtrace process(es) */
320 > extern int
321 > end_rtrace(void)                        /* close rtrace process(es) */
322   {
323          int     status = 0, rv;
324  
325          if (nprocs > 1)
326                  killpersist();
327 <        while (nprocs > 0) {
328 <                rv = close_process(&rtpd[--nprocs]);
318 <                if (rv > 0)
319 <                        status = rv;
320 <        }
327 >        status = close_processes(rtpd, nprocs);
328 >        nprocs = 0;
329          free((void *)rtbuf);
330          rtbuf = NULL;
331          maxqlen = 0;

Diff Legend

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