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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.111 by greg, Thu Nov 18 19:38:21 2021 UTC vs.
Revision 2.112 by greg, Mon Mar 7 17:52:14 2022 UTC

# Line 37 | Line 37 | static AMBTREE atrunk;         /* our ambient trunk node */
37   static FILE  *ambfp = NULL;     /* ambient file pointer */
38   static int  nunflshed = 0;      /* number of unflushed ambient values */
39  
40 – #ifndef SORT_THRESH
41 – #ifdef SMLMEM
42 – #define SORT_THRESH     ((16L<<20)/sizeof(AMBVAL))
43 – #else
44 – #define SORT_THRESH     ((64L<<20)/sizeof(AMBVAL))
45 – #endif
46 – #endif
47 – #ifndef SORT_INTVL
48 – #define SORT_INTVL      (SORT_THRESH<<1)
49 – #endif
50 – #ifndef MAX_SORT_INTVL
51 – #define MAX_SORT_INTVL  (SORT_INTVL<<6)
52 – #endif
53 –
54 –
40   static double  avsum = 0.;              /* computed ambient value sum (log) */
41   static unsigned int  navsum = 0;        /* number of values in avsum */
42   static unsigned int  nambvals = 0;      /* total number of indirect values */
43   static unsigned int  nambshare = 0;     /* number of values from file */
59 – static unsigned long  ambclock = 0;     /* ambient access clock */
60 – static unsigned long  lastsort = 0;     /* time of last value sort */
61 – static long  sortintvl = SORT_INTVL;    /* time until next sort */
44   static FILE  *ambinp = NULL;            /* auxiliary file for input */
45   static long  lastpos = -1;              /* last flush position */
46  
65 – #define MAXACLOCK       (1L<<30)        /* clock turnover value */
66 –        /*
67 –         * Track access times unless we are sharing ambient values
68 –         * through memory on a multiprocessor, when we want to avoid
69 –         * claiming our own memory (copy on write).  Go ahead anyway
70 –         * if more than two thirds of our values are unshared.
71 –         * Compile with -Dtracktime=0 to turn this code off.
72 –         */
73 – #ifndef tracktime
74 – #define tracktime       (shm_boundary == NULL || nambvals > 3*nambshare)
75 – #endif
76 –
47   #define  AMBFLUSH       (BUFSIZ/AMBVALSIZ)
48  
49   #define  newambval()    (AMBVAL *)malloc(sizeof(AMBVAL))
# Line 88 | Line 58 | static void freeambtree(AMBTREE  *atp);
58  
59   typedef void unloadtf_t(AMBVAL *);
60   static unloadtf_t avinsert;
91 – static unloadtf_t av2list;
61   static unloadtf_t avfree;
62   static void unloadatree(AMBTREE  *at, unloadtf_t *f);
63  
64 < static int aposcmp(const void *avp1, const void *avp2);
96 < static int avlmemi(AMBVAL *avaddr);
97 < static void sortambvals(int always);
64 > static void sortambvals(void);
65  
66   static int      plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang);
67   static double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
# Line 142 | Line 109 | setambacc(                             /* set ambient accuracy */
109          if (fabs(newa - olda) >= .05*(newa + olda)) {
110                  ambacc = newa;
111                  if (ambacc > FTINY && nambvals > 0)
112 <                        sortambvals(1);         /* rebuild tree */
112 >                        sortambvals();          /* rebuild tree */
113          }
114   }
115  
# Line 229 | Line 196 | ambdone(void)                  /* close ambient file and free memory
196          navsum = 0;
197          nambvals = 0;
198          nambshare = 0;
232 –        ambclock = 0;
233 –        lastsort = 0;
234 –        sortintvl = SORT_INTVL;
199   }
200  
201  
# Line 331 | Line 295 | multambient(           /* compute ambient component & multiply
295                  addcolor(aval, caustic);
296                  return;
297          }
334 –
335 –        if (tracktime)                          /* sort to minimize thrashing */
336 –                sortambvals(0);
298                                                  /* interpolate ambient value */
299          setcolor(acol, 0.0, 0.0, 0.0);
300          d = sumambient(acol, r, nrm, rdepth,
# Line 476 | Line 437 | sumambient(            /* get interpolated ambient value */
437                  double  u, v, d, delta_r2, delta_t2;
438                  COLOR   ct;
439                  FVECT   uvw[3];
479 –                                        /* record access */
480 –                if (tracktime)
481 –                        av->latick = ambclock;
440                  /*
441                   *  Ambient level test
442                   */
# Line 726 | Line 684 | avstore(                               /* allocate memory and save aval */
684          if ((av = newambval()) == NULL)
685                  error(SYSTEM, "out of memory in avstore");
686          *av = *aval;
729 –        av->latick = ambclock;
687          av->next = NULL;
688          nambvals++;
689          d = bright(av->val);
# Line 799 | Line 756 | unloadatree(                   /* unload an ambient value tree */
756   }
757  
758  
802 – static struct avl {
803 –        AMBVAL  *p;
804 –        unsigned long   t;
805 – }       *avlist1;                       /* ambient value list with ticks */
806 – static AMBVAL   **avlist2;              /* memory positions for sorting */
807 – static int      i_avlist;               /* index for lists */
808 –
809 – static int alatcmp(const void *av1, const void *av2);
810 –
759   static void
760   avfree(AMBVAL *av)
761   {
762          free(av);
763   }
764  
817 – static void
818 – av2list(
819 –        AMBVAL *av
820 – )
821 – {
822 – #ifdef DEBUG
823 –        if (i_avlist >= nambvals)
824 –                error(CONSISTENCY, "too many ambient values in av2list1");
825 – #endif
826 –        avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
827 –        avlist1[i_avlist++].t = av->latick;
828 – }
765  
830 –
831 – static int
832 – alatcmp(                        /* compare ambient values for MRA */
833 –        const void *av1,
834 –        const void *av2
835 – )
836 – {
837 –        long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
838 –        return(lc<0 ? -1 : lc>0 ? 1 : 0);
839 – }
840 –
841 –
842 – /* GW NOTE 2002/10/3:
843 – * I used to compare AMBVAL pointers, but found that this was the
844 – * cause of a serious consistency error with gcc, since the optimizer
845 – * uses some dangerous trick in pointer subtraction that
846 – * assumes pointers differ by exact struct size increments.
847 – */
848 – static int
849 – aposcmp(                        /* compare ambient value positions */
850 –        const void      *avp1,
851 –        const void      *avp2
852 – )
853 – {
854 –        long    diff = *(char * const *)avp1 - *(char * const *)avp2;
855 –        if (diff < 0)
856 –                return(-1);
857 –        return(diff > 0);
858 – }
859 –
860 –
861 – static int
862 – avlmemi(                                /* find list position from address */
863 –        AMBVAL  *avaddr
864 – )
865 – {
866 –        AMBVAL  **avlpp;
867 –
868 –        avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
869 –                        nambvals, sizeof(AMBVAL *), aposcmp);
870 –        if (avlpp == NULL)
871 –                error(CONSISTENCY, "address not found in avlmemi");
872 –        return(avlpp - avlist2);
873 – }
874 –
875 –
766   static void
767 < sortambvals(                    /* resort ambient values */
878 <        int     always
879 < )
767 > sortambvals(void)                       /* resort ambient values */
768   {
769 <        AMBTREE  oldatrunk;
770 <        AMBVAL  tav, *tap, *pnext;
771 <        int     i, j;
772 <                                        /* see if it's time yet */
773 <        if (!always && (ambclock++ < lastsort+sortintvl ||
886 <                        nambvals < SORT_THRESH))
887 <                return;
888 <        /*
889 <         * The idea here is to minimize memory thrashing
890 <         * in VM systems by improving reference locality.
891 <         * We do this by periodically sorting our stored ambient
892 <         * values in memory in order of most recently to least
893 <         * recently accessed.  This ordering was chosen so that new
894 <         * ambient values (which tend to be less important) go into
895 <         * higher memory with the infrequently accessed values.
896 <         *      Since we expect our values to need sorting less
897 <         * frequently as the process continues, we double our
898 <         * waiting interval after each call.
899 <         *      This routine is also called by setambacc() with
900 <         * the "always" parameter set to 1 so that the ambient
901 <         * tree will be rebuilt with the new accuracy parameter.
902 <         */
903 <        if (tracktime) {                /* allocate pointer arrays to sort */
904 <                avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
905 <                avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
906 <        } else {
907 <                avlist2 = NULL;
908 <                avlist1 = NULL;
909 <        }
910 <        if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
911 <                if (avlist2 != NULL)
912 <                        free(avlist2);
913 <                if (always) {           /* rebuild without sorting */
914 <                        oldatrunk = atrunk;
915 <                        atrunk.alist = NULL;
916 <                        atrunk.kid = NULL;
917 <                        unloadatree(&oldatrunk, avinsert);
918 <                }
919 <        } else {                        /* sort memory by last access time */
920 <                /*
921 <                 * Sorting memory is tricky because it isn't contiguous.
922 <                 * We have to sort an array of pointers by MRA and also
923 <                 * by memory position.  We then copy values in "loops"
924 <                 * to minimize memory hits.  Nevertheless, we will visit
925 <                 * everyone at least twice, and this is an expensive process
926 <                 * when we're thrashing, which is when we need to do it.
927 <                 */
928 < #ifdef DEBUG
929 <                sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
930 <                                nambvals, ambclock);
931 <                eputs(errmsg);
932 < #endif
933 <                i_avlist = 0;
934 <                unloadatree(&atrunk, av2list);  /* empty current tree */
935 < #ifdef DEBUG
936 <                if (i_avlist < nambvals)
937 <                        error(CONSISTENCY, "missing ambient values in sortambvals");
938 < #endif
939 <                qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
940 <                qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
941 <                for (i = 0; i < nambvals; i++) {
942 <                        if (avlist1[i].p == NULL)
943 <                                continue;
944 <                        tap = avlist2[i];
945 <                        tav = *tap;
946 <                        for (j = i; (pnext = avlist1[j].p) != tap;
947 <                                        j = avlmemi(pnext)) {
948 <                                *(avlist2[j]) = *pnext;
949 <                                avinsert(avlist2[j]);
950 <                                avlist1[j].p = NULL;
951 <                        }
952 <                        *(avlist2[j]) = tav;
953 <                        avinsert(avlist2[j]);
954 <                        avlist1[j].p = NULL;
955 <                }
956 <                free(avlist1);
957 <                free(avlist2);
958 <                                                /* compute new sort interval */
959 <                sortintvl = ambclock - lastsort;
960 <                if (sortintvl >= MAX_SORT_INTVL/2)
961 <                        sortintvl = MAX_SORT_INTVL;
962 <                else
963 <                        sortintvl <<= 1;        /* wait twice as long next */
964 < #ifdef DEBUG
965 <                eputs("done\n");
966 < #endif
967 <        }
968 <        if (ambclock >= MAXACLOCK)
969 <                ambclock = MAXACLOCK/2;
970 <        lastsort = ambclock;
769 >        AMBTREE  oldatrunk = atrunk;
770 >
771 >        atrunk.alist = NULL;
772 >        atrunk.kid = NULL;
773 >        unloadatree(&oldatrunk, avinsert);
774   }
775  
776  

Diff Legend

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