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

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.24 by gwlarson, Fri Nov 13 15:57:13 1998 UTC vs.
Revision 3.28 by gwlarson, Sat Jan 9 09:17:10 1999 UTC

# Line 9 | Line 9 | static char SCCSid[] = "$SunId$ SGI";
9   */
10  
11   #include "rholo.h"
12 + #include <sys/types.h>
13  
14 + #ifndef NFRAG2CHUNK
15 + #define NFRAG2CHUNK     4096    /* number of fragments to start chunking */
16 + #endif
17 +
18 + #ifndef abs
19   #define abs(x)          ((x) > 0 ? (x) : -(x))
20 + #endif
21 + #ifndef sgn
22   #define sgn(x)          ((x) > 0 ? 1 : (x) < 0 ? -1 : 0)
23 + #endif
24  
25 + #define rchunk(n)       (((n)+(RPACKSIZ/2))/RPACKSIZ)
26 +
27 + extern time_t   time();
28 +
29   static PACKHEAD *complist=NULL; /* list of beams to compute */
30   static int      complen=0;      /* length of complist */
31   static int      listpos=0;      /* current list position for next_packet */
32   static int      lastin= -1;     /* last ordered position in list */
33 + static int      chunky=0;       /* clump beams together on disk */
34  
35  
36   int
37   beamcmp(b0, b1)                         /* comparison for compute order */
38   register PACKHEAD       *b0, *b1;
39   {
40 <        return( b1->nr*(b0->nc+1) - b0->nr*(b1->nc+1) );
40 >        BEAMI   *bip0, *bip1;
41 >        register long   c;
42 >                                        /* first check desired quantities */
43 >        if (chunky)
44 >                c = rchunk(b1->nr)*(rchunk(b0->nc)+1L) -
45 >                                rchunk(b0->nr)*(rchunk(b1->nc)+1L);
46 >        else
47 >                c = b1->nr*(b0->nc+1L) - b0->nr*(b1->nc+1L);
48 >        if (c > 0) return(1);
49 >        if (c < 0) return(-1);
50 >                                /* only one file, so skip the following: */
51 > #if 0
52 >                                        /* next, check file descriptors */
53 >        c = hdlist[b0->hd]->fd - hdlist[b1->hd]->fd;
54 >        if (c) return(c);
55 > #endif
56 >                                        /* finally, check file positions */
57 >        bip0 = &hdlist[b0->hd]->bi[b0->bi];
58 >        bip1 = &hdlist[b1->hd]->bi[b1->bi];
59 >                                        /* put diskless beams last */
60 >        if (!bip0->nrd)
61 >                return(bip1->nrd > 0);
62 >        if (!bip1->nrd)
63 >                return(-1);
64 >        c = bip0->fo - bip1->fo;
65 >        return(c < 0 ? -1 : c > 0);
66   }
67  
68  
# Line 76 | Line 115 | int    nents;
115          register PACKHEAD       *csm;
116          register int    i;
117                                          /* search for common members */
79        qsort((char *)clist, nents, sizeof(PACKHEAD), beamidcmp);
118          for (csm = clist+nents; csm-- > clist; )
119                  csm->nc = -1;
120 +        qsort((char *)clist, nents, sizeof(PACKHEAD), beamidcmp);
121          for (i = 0; i < complen; i++) {
122                  csm = (PACKHEAD *)bsearch((char *)(complist+i), (char *)clist,
123                                  nents, sizeof(PACKHEAD), beamidcmp);
# Line 159 | Line 198 | int    nents;
198          default:
199                  error(CONSISTENCY, "bundle_set called with unknown operation");
200          }
201 <        if (outdev == NULL)             /* nothing to display? */
201 >        if (outdev == NULL || !nents)   /* nothing to display? */
202                  return;
203                                          /* load and display beams we have */
204          hbarr = (HDBEAMI *)malloc(nents*sizeof(HDBEAMI));
# Line 169 | Line 208 | int    nents;
208          }
209          hdloadbeams(hbarr, nents, dispbeam);
210          free((char *)hbarr);
211 +        if (hdfragflags&FF_READ) {
212 +                listpos = 0;
213 +                lastin = -1;            /* need to re-sort list */
214 +        }
215          return;
216   memerr:
217          error(SYSTEM, "out of memory in bundle_set");
# Line 219 | Line 262 | init_global()                  /* initialize global ray computation *
262                  free((char *)complist);
263                  done_packets(flush_queue());
264          }
265 +                                        /* reseed random number generator */
266 +        srandom(time(NULL));
267                                          /* allocate beam list */
268          complen = 0;
269          for (j = 0; hdlist[j] != NULL; j++)
# Line 249 | Line 294 | init_global()                  /* initialize global ray computation *
294                  complist[k].nr = frac*complist[k].nr + 0.5;
295          listpos = 0; lastin = -1;       /* perform initial sort */
296          sortcomplist();
297 +                                        /* no view vicinity */
298 +        myeye.rng = 0;
299   }
300  
301  
# Line 278 | Line 325 | int    n1, n2;
325   sortcomplist()                  /* fix our list order */
326   {
327          PACKHEAD        *list2;
328 +        int     listlen;
329          register int    i;
330  
331          if (complen <= 0)       /* check to see if there is even a list */
332                  return;
333 +        if (!chunky)            /* check to see if fragment list is full */
334 +                if (!hdfragOK(hdlist[0]->fd, &listlen, NULL)
335 + #if NFRAG2CHUNK
336 +                                || listlen >= NFRAG2CHUNK
337 + #endif
338 +                                ) {
339 + #ifdef DEBUG
340 +                        error(WARNING, "using chunky comparison mode");
341 + #endif
342 +                        chunky++;       /* use "chunky" comparison */
343 +                        lastin = -1;    /* need to re-sort list */
344 +                }
345 + #ifdef DEBUG
346 +                        else
347 +                                fprintf(stderr, "sortcomplist: %d fragments\n",
348 +                                                listlen);
349 + #endif
350          if (lastin < 0 || listpos*4 >= complen*3)
351                  qsort((char *)complist, complen, sizeof(PACKHEAD), beamcmp);
352          else if (listpos) {     /* else sort and merge sublist */
# Line 304 | Line 369 | sortcomplist()                 /* fix our list order */
369          } else if (i < complen-1) {
370                  list2 = (PACKHEAD *)realloc((char *)complist,
371                                  (i+1)*sizeof(PACKHEAD));
372 <                if (list2 != NULL) {
372 >                if (list2 != NULL)
373                          complist = list2;
374 <                        complen = i+1;
310 <                }
374 >                complen = i+1;
375          }
376          listpos = 0; lastin = i;
377   }
# Line 318 | Line 382 | sortcomplist()                 /* fix our list order */
382   * more or less evenly distributed, such that computing a packet causes
383   * a given bundle to move way down in the computation order.  We keep
384   * track of where the computed bundle with the highest priority would end
385 < * up, and if we get further in our compute list than this, we resort the
385 > * up, and if we get further in our compute list than this, we re-sort the
386   * list and start again from the beginning.  Since
387   * a merge sort is used, the sorting costs are minimal.
388   */
# Line 338 | Line 402 | int    n;
402          p->nr = complist[listpos].nr - p->nc;
403          if (p->nr <= 0)
404                  return(0);
405 < #ifdef DEBUG
406 <        if (n < 1 | n > RPACKSIZ)
343 <                error(CONSISTENCY, "next_packet called with bad n value");
344 < #endif
405 >        DCHECK(n < 1 | n > RPACKSIZ,
406 >                        CONSISTENCY, "next_packet called with bad n value");
407          if (p->nr > n)
408                  p->nr = n;
409          complist[listpos].nc += p->nr;  /* find where this one would go */
410 +        if (hdgetbeam(hdlist[p->hd], p->bi) != NULL)
411 +                hdfreefrag(hdlist[p->hd], p->bi);
412          while (lastin > listpos &&
413                          beamcmp(complist+lastin, complist+listpos) > 0)
414                  lastin--;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines