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

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.37 by gregl, Fri Jan 16 11:45:43 1998 UTC vs.
Revision 3.38 by gwlarson, Wed Jan 28 12:32:50 1998 UTC

# Line 51 | Line 51 | long   nraysdone = 0L;         /* number of rays done */
51   long    npacksdone = 0L;        /* number of packets done */
52  
53   PACKET  *freepacks;             /* available packets */
54 < int     avgqlen;                /* average queue length when full */
54 > int     totqlen;                /* maximum queue length when full */
55  
56   char  *sigerr[NSIG];            /* signal error messages */
57  
# Line 222 | Line 222 | initrholo()                    /* get our holodeck running */
222                  endtime = starttime + vflt(TIME)*3600. + .5;
223                                                  /* start rtrace */
224          if (ncprocs > 0) {
225 <                i = start_rtrace();
225 >                totqlen = i = start_rtrace();
226                  if (i < 1)
227                          error(USER, "cannot start rtrace process(es)");
228                  if (vdef(REPORT)) {             /* make first report */
# Line 233 | Line 233 | initrholo()                    /* get our holodeck running */
233                  freepacks = (PACKET *)bmalloc(i*sizeof(PACKET));
234                  if (freepacks == NULL)
235                          goto memerr;
236 –                if (!(avgqlen = i/nprocs))      /* record mean queue length */
237 –                        avgqlen = 1;
236                  freepacks[--i].nr = 0;
237                  freepacks[i].next = NULL;
238                  if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) {
# Line 302 | Line 300 | rholo()                                /* holodeck main loop */
300                  report(t);
301                                          /* figure out good packet size */
302   #if MAXQTIME
303 <        pksiz = nraysdone*MAXQTIME/(avgqlen*(t - starttime + 1L));
303 >        pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
304          if (pksiz < 1)
305                  pksiz = 1;
306          else if (pksiz > RPACKSIZ)
# Line 506 | Line 504 | PACKET *pl;
504                  p->next = freepacks;            /* push onto free list */
505                  freepacks = p;
506          }
507 <        if (n2flush > 300/MAXQTIME*avgqlen*nprocs) {
507 >        if (n2flush > 300/MAXQTIME*totqlen) {
508                  hdflush(NULL);                  /* flush holodeck buffers */
509                  n2flush = 0;
510          }

Diff Legend

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