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.17 by greg, Fri Mar 4 02:48:14 2016 UTC vs.
Revision 3.20 by greg, Sat Dec 16 18:33:55 2023 UTC

# Line 37 | Line 37 | static PACKET * get_packets(int poll);
37   static void killpersist(void);
38  
39  
40 < extern int
40 > int
41   start_rtrace(void)                      /* start rtrace process */
42   {
43          static char     buf1[8];
# Line 59 | Line 59 | start_rtrace(void)                     /* start rtrace process */
59                  rtargv[rtargc++] = "-I-";
60                  rtargv[rtargc++] = "-h-";
61                  rtargv[rtargc++] = "-ld-";
62 +                rtargv[rtargc++] = "-co-";
63                  sprintf(buf1, "%d", RPACKSIZ);
64                  rtargv[rtargc++] = "-x"; rtargv[rtargc++] = buf1;
65                  rtargv[rtargc++] = "-y"; rtargv[rtargc++] = "0";
# Line 99 | Line 100 | static int
100   bestout(void)                   /* get best process to process packet */
101   {
102          int     cnt;
103 <        register int    pn, i;
103 >        int     pn, i;
104  
105          pn = 0;                 /* find shortest queue */
106          for (i = 1; i < nprocs; i++)
# Line 113 | Line 114 | bestout(void)                  /* get best process to process packet
114                  if (pqlen[i] == pqlen[pn])
115                          cnt++;
116                                  /* break ties fairly */
117 <        if ((cnt = random() % cnt))
117 >        if ((cnt = irandom(cnt)))
118                  for (i = pn; i < nprocs; i++)
119                          if (pqlen[i] == pqlen[pn] && !cnt--)
120                                  return(i);
# Line 124 | Line 125 | bestout(void)                  /* get best process to process packet
125   static int
126   slots_avail(void)                       /* count packet slots available */
127   {
128 <        register int    nslots = 0;
129 <        register int    i;
128 >        int     nslots = 0;
129 >        int     i;
130  
131          for (i = nprocs; i--; )
132                  nslots += maxqlen - pqlen[i];
# Line 135 | Line 136 | slots_avail(void)                      /* count packet slots available */
136  
137   static void
138   queue_packet(                   /* queue up a beam packet */
139 <        register PACKET *p
139 >        PACKET  *p
140   )
141   {
142          int     pn, n;
# Line 152 | Line 153 | queue_packet(                  /* queue up a beam packet */
153          if (!pqlen[pn]++)       /* add it to the end of the queue */
154                  pqueue[pn] = p;
155          else {
156 <                register PACKET *rpl = pqueue[pn];
156 >                PACKET  *rpl = pqueue[pn];
157                  while (rpl->next != NULL)
158                          rpl = rpl->next;
159                  rpl->next = p;
# Line 168 | Line 169 | get_packets(           /* read packets from rtrace processes */
169          static struct timeval   tpoll;  /* zero timeval struct */
170          fd_set  readset, errset;
171          PACKET  *pldone = NULL, *plend;
172 <        register PACKET *p;
172 >        PACKET  *p;
173          int     n, nr;
174 <        register int    pn;
174 >        int     pn;
175          float   *bp;
176                                          /* prepare select call */
177          FD_ZERO(&readset); FD_ZERO(&errset); n = 0;
# Line 240 | Line 241 | eoferr:
241   }
242  
243  
244 < extern PACKET *
244 > PACKET *
245   do_packets(                     /* queue a packet list, return finished */
246 <        register PACKET *pl
246 >        PACKET  *pl
247   )
248   {
249 <        register PACKET *p;
249 >        PACKET  *p;
250                                          /* consistency check */
251          if (nprocs < 1)
252                  error(CONSISTENCY, "do_packets called with no active process");
# Line 258 | Line 259 | do_packets(                    /* queue a packet list, return finished
259   }
260  
261  
262 < extern PACKET *
262 > PACKET *
263   flush_queue(void)                       /* empty all rtrace queues */
264   {
265          PACKET  *rpdone = NULL;
266 <        register PACKET *rpl = NULL;
266 >        PACKET  *rpl = NULL;
267          float   *bp;
268 <        register PACKET *p;
268 >        PACKET  *p;
269          int     i, n, nr;
270  
271          for (i = 0; i < nprocs; i++)
# Line 317 | Line 318 | killpersist(void)                      /* kill persistent process */
318   }
319  
320  
321 < extern int
321 > int
322   end_rtrace(void)                        /* close rtrace process(es) */
323   {
324          int     status = 0, rv;

Diff Legend

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