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

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.44 by gwlarson, Wed Dec 30 08:02:37 1998 UTC vs.
Revision 3.49 by gwlarson, Wed Feb 10 16:24:07 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1998 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1999 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 20 | Line 20 | static char SCCSid[] = "$SunId$ SGI";
20   #ifndef MAXQTIME
21   #define MAXQTIME        5               /* target maximum seconds in queue */
22   #endif
23 +                                        /* manual cache flushing frequency */
24 + #ifndef RTFLUSH
25 + #if MAXQTIME
26 + #define RTFLUSH         (300/MAXQTIME*totqlen)  /* <= 5 minutes */
27 + #else
28 + #define RTFLUSH         (50*totqlen)            /* just guess */
29 + #endif
30 + #endif
31                          /* the following must be consistent with rholo.h */
32   int     NVARS = NRHVARS;                /* total number of variables */
33  
# Line 52 | Line 60 | long   nraysdone = 0L;         /* number of rays done */
60   long    npacksdone = 0L;        /* number of packets done */
61  
62   PACKET  *freepacks;             /* available packets */
63 < int     totqlen;                /* maximum queue length when full */
63 > int     totqlen;                /* maximum queue length (number of packets) */
64  
65   char  *sigerr[NSIG];            /* signal error messages */
66  
# Line 147 | Line 155 | int  signo;
155   {
156          static int  gotsig = 0;
157  
158 <        if (gotsig++)                   /* two signals and we're gone! */
158 >        if (gotsig > 1)                 /* we're going as fast as we can! */
159 >                return;
160 >        if (gotsig++) {                 /* two signals and we split */
161 >                hdsync(NULL, 0);        /* don't leave w/o saying goodbye */
162                  _exit(signo);
163 <
164 <        alarm(60);                      /* allow 60 seconds to clean up */
154 <        signal(SIGALRM, SIG_DFL);       /* make certain we do die */
163 >        }
164 >        alarm(300);                     /* allow 5 minutes to clean up */
165          eputs("signal - ");
166          eputs(sigerr[signo]);
167          eputs("\n");
# Line 313 | Line 323 | rholo()                                /* holodeck main loop */
323          if (reporttime > 0 && t >= reporttime)
324                  report(t);
325                                          /* figure out good packet size */
326 +        pksiz = RPACKSIZ;
327   #if MAXQTIME
328 <        pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
329 <        if (pksiz < 1)
330 <                pksiz = 1;
331 <        else if (pksiz > RPACKSIZ)
328 >        if (!chunkycmp) {
329 >                pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
330 >                if (pksiz < 1) pksiz = 1;
331 >                else if (pksiz > RPACKSIZ) pksiz = RPACKSIZ;
332 >        }
333   #endif
322                pksiz = RPACKSIZ;
334          idle = 0;                       /* get packets to process */
335          while (freepacks != NULL) {
336                  p = freepacks; freepacks = p->next; p->next = NULL;
# Line 511 | Line 522 | PACKET *pl;
522                                  p->nr*sizeof(RAYVAL));
523                          if (outdev != NULL)     /* display it */
524                                  disp_packet((PACKHEAD *)p);
525 <                        if (hdcachesize <= 0)   /* manual flushing */
525 >                        if (hdcachesize <= 0)
526                                  n2flush++;
527                          nraysdone += p->nr;
528                          npacksdone++;
# Line 520 | Line 531 | PACKET *pl;
531                  p->next = freepacks;            /* push onto free list */
532                  freepacks = p;
533          }
534 < #if MAXQTIME
535 <        if (n2flush > 300/MAXQTIME*totqlen) {
536 < #else
526 <        if (n2flush > 50*totqlen) {
527 < #endif
528 <                if (outdev == NULL)
529 <                        hdflush(NULL);          /* flush holodeck buffers */
534 >        if (n2flush > RTFLUSH) {
535 >                if (outdev != NULL)
536 >                        hdsync(NULL, 1);
537                  else
538 <                        hdsync(NULL, 1);        /* sync holodeck file */
538 >                        hdflush(NULL);
539                  n2flush = 0;
540          }
541   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines