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.108 by greg, Tue May 14 17:39:10 2019 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 272 | Line 236 | multambient(           /* compute ambient component & multiply
236          FVECT  nrm
237   )
238   {
239 +        static double  logAvgAbsorp = 1;
240          static int  rdepth = 0;                 /* ambient recursion */
241          COLOR   acol, caustic;
242          int     i, ok;
# Line 283 | Line 248 | multambient(           /* compute ambient component & multiply
248          if (ambPmap(aval, r, rdepth))
249                  return;
250  
251 +        if (logAvgAbsorp > 0)                   /* exclude in -aw to avoid growth */
252 +                logAvgAbsorp = log(1.-AVGREFL);
253 +
254          /* PMAP: Factor in specular-diffuse ambient (caustics) from photon
255           * map, if enabled and ray is primary, else caustic is zero.  Continue
256           * with RADIANCE ambient calculation */
# Line 327 | Line 295 | multambient(           /* compute ambient component & multiply
295                  addcolor(aval, caustic);
296                  return;
297          }
330 –
331 –        if (tracktime)                          /* sort to minimize thrashing */
332 –                sortambvals(0);
298                                                  /* interpolate ambient value */
299          setcolor(acol, 0.0, 0.0, 0.0);
300          d = sumambient(acol, r, nrm, rdepth,
# Line 368 | Line 333 | dumbamb:                                       /* return global value */
333          
334          l = bright(ambval);                     /* average in computations */  
335          if (l > FTINY) {
336 <                d = (log(l)*(double)ambvwt + avsum) /
336 >                d = (log(l)*(double)ambvwt + avsum + logAvgAbsorp*navsum) /
337                                  (double)(ambvwt + navsum);
338                  d = exp(d) / l;
339                  scalecolor(aval, d);
340                  multcolor(aval, ambval);        /* apply color of ambval */
341          } else {
342 <                d = exp( avsum / (double)navsum );
342 >                d = exp( avsum/(double)navsum + logAvgAbsorp );
343                  scalecolor(aval, d);            /* neutral color */
344          }
345   }
# Line 472 | Line 437 | sumambient(            /* get interpolated ambient value */
437                  double  u, v, d, delta_r2, delta_t2;
438                  COLOR   ct;
439                  FVECT   uvw[3];
475 –                                        /* record access */
476 –                if (tracktime)
477 –                        av->latick = ambclock;
440                  /*
441                   *  Ambient level test
442                   */
# Line 583 | Line 545 | extambient(            /* extrapolate value at pv, nv */
545   )
546   {
547          const double    min_d = 0.05;
548 +        const double    max_d = 20.;
549          static FVECT    my_uvw[3];
550          FVECT           v1;
551          int             i;
# Line 602 | Line 565 | extambient(            /* extrapolate value at pv, nv */
565          for (i = 3; i--; )
566                  d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
567          
568 <        if (d < min_d)                  /* should not use if we can avoid it */
568 >        if (d < min_d)                  /* clamp min/max scaling */
569                  d = min_d;
570 +        else if (d > max_d)
571 +                d = max_d;
572          copycolor(cr, ap->val);
573          scalecolor(cr, d);
574          return(d > min_d);
# Line 719 | Line 684 | avstore(                               /* allocate memory and save aval */
684          if ((av = newambval()) == NULL)
685                  error(SYSTEM, "out of memory in avstore");
686          *av = *aval;
722 –        av->latick = ambclock;
687          av->next = NULL;
688          nambvals++;
689          d = bright(av->val);
# Line 792 | Line 756 | unloadatree(                   /* unload an ambient value tree */
756   }
757  
758  
795 – static struct avl {
796 –        AMBVAL  *p;
797 –        unsigned long   t;
798 – }       *avlist1;                       /* ambient value list with ticks */
799 – static AMBVAL   **avlist2;              /* memory positions for sorting */
800 – static int      i_avlist;               /* index for lists */
801 –
802 – static int alatcmp(const void *av1, const void *av2);
803 –
759   static void
760   avfree(AMBVAL *av)
761   {
762          free(av);
763   }
764  
765 +
766   static void
767 < av2list(
812 <        AMBVAL *av
813 < )
767 > sortambvals(void)                       /* resort ambient values */
768   {
769 < #ifdef DEBUG
816 <        if (i_avlist >= nambvals)
817 <                error(CONSISTENCY, "too many ambient values in av2list1");
818 < #endif
819 <        avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
820 <        avlist1[i_avlist++].t = av->latick;
821 < }
769 >        AMBTREE  oldatrunk = atrunk;
770  
771 <
772 < static int
773 < alatcmp(                        /* compare ambient values for MRA */
826 <        const void *av1,
827 <        const void *av2
828 < )
829 < {
830 <        long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
831 <        return(lc<0 ? -1 : lc>0 ? 1 : 0);
771 >        atrunk.alist = NULL;
772 >        atrunk.kid = NULL;
773 >        unloadatree(&oldatrunk, avinsert);
774   }
775  
776  
835 – /* GW NOTE 2002/10/3:
836 – * I used to compare AMBVAL pointers, but found that this was the
837 – * cause of a serious consistency error with gcc, since the optimizer
838 – * uses some dangerous trick in pointer subtraction that
839 – * assumes pointers differ by exact struct size increments.
840 – */
841 – static int
842 – aposcmp(                        /* compare ambient value positions */
843 –        const void      *avp1,
844 –        const void      *avp2
845 – )
846 – {
847 –        long    diff = *(char * const *)avp1 - *(char * const *)avp2;
848 –        if (diff < 0)
849 –                return(-1);
850 –        return(diff > 0);
851 – }
852 –
853 –
854 – static int
855 – avlmemi(                                /* find list position from address */
856 –        AMBVAL  *avaddr
857 – )
858 – {
859 –        AMBVAL  **avlpp;
860 –
861 –        avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
862 –                        nambvals, sizeof(AMBVAL *), aposcmp);
863 –        if (avlpp == NULL)
864 –                error(CONSISTENCY, "address not found in avlmemi");
865 –        return(avlpp - avlist2);
866 – }
867 –
868 –
869 – static void
870 – sortambvals(                    /* resort ambient values */
871 –        int     always
872 – )
873 – {
874 –        AMBTREE  oldatrunk;
875 –        AMBVAL  tav, *tap, *pnext;
876 –        int     i, j;
877 –                                        /* see if it's time yet */
878 –        if (!always && (ambclock++ < lastsort+sortintvl ||
879 –                        nambvals < SORT_THRESH))
880 –                return;
881 –        /*
882 –         * The idea here is to minimize memory thrashing
883 –         * in VM systems by improving reference locality.
884 –         * We do this by periodically sorting our stored ambient
885 –         * values in memory in order of most recently to least
886 –         * recently accessed.  This ordering was chosen so that new
887 –         * ambient values (which tend to be less important) go into
888 –         * higher memory with the infrequently accessed values.
889 –         *      Since we expect our values to need sorting less
890 –         * frequently as the process continues, we double our
891 –         * waiting interval after each call.
892 –         *      This routine is also called by setambacc() with
893 –         * the "always" parameter set to 1 so that the ambient
894 –         * tree will be rebuilt with the new accuracy parameter.
895 –         */
896 –        if (tracktime) {                /* allocate pointer arrays to sort */
897 –                avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
898 –                avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
899 –        } else {
900 –                avlist2 = NULL;
901 –                avlist1 = NULL;
902 –        }
903 –        if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
904 –                if (avlist2 != NULL)
905 –                        free(avlist2);
906 –                if (always) {           /* rebuild without sorting */
907 –                        oldatrunk = atrunk;
908 –                        atrunk.alist = NULL;
909 –                        atrunk.kid = NULL;
910 –                        unloadatree(&oldatrunk, avinsert);
911 –                }
912 –        } else {                        /* sort memory by last access time */
913 –                /*
914 –                 * Sorting memory is tricky because it isn't contiguous.
915 –                 * We have to sort an array of pointers by MRA and also
916 –                 * by memory position.  We then copy values in "loops"
917 –                 * to minimize memory hits.  Nevertheless, we will visit
918 –                 * everyone at least twice, and this is an expensive process
919 –                 * when we're thrashing, which is when we need to do it.
920 –                 */
921 – #ifdef DEBUG
922 –                sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
923 –                                nambvals, ambclock);
924 –                eputs(errmsg);
925 – #endif
926 –                i_avlist = 0;
927 –                unloadatree(&atrunk, av2list);  /* empty current tree */
928 – #ifdef DEBUG
929 –                if (i_avlist < nambvals)
930 –                        error(CONSISTENCY, "missing ambient values in sortambvals");
931 – #endif
932 –                qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
933 –                qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
934 –                for (i = 0; i < nambvals; i++) {
935 –                        if (avlist1[i].p == NULL)
936 –                                continue;
937 –                        tap = avlist2[i];
938 –                        tav = *tap;
939 –                        for (j = i; (pnext = avlist1[j].p) != tap;
940 –                                        j = avlmemi(pnext)) {
941 –                                *(avlist2[j]) = *pnext;
942 –                                avinsert(avlist2[j]);
943 –                                avlist1[j].p = NULL;
944 –                        }
945 –                        *(avlist2[j]) = tav;
946 –                        avinsert(avlist2[j]);
947 –                        avlist1[j].p = NULL;
948 –                }
949 –                free(avlist1);
950 –                free(avlist2);
951 –                                                /* compute new sort interval */
952 –                sortintvl = ambclock - lastsort;
953 –                if (sortintvl >= MAX_SORT_INTVL/2)
954 –                        sortintvl = MAX_SORT_INTVL;
955 –                else
956 –                        sortintvl <<= 1;        /* wait twice as long next */
957 – #ifdef DEBUG
958 –                eputs("done\n");
959 – #endif
960 –        }
961 –        if (ambclock >= MAXACLOCK)
962 –                ambclock = MAXACLOCK/2;
963 –        lastsort = ambclock;
964 – }
965 –
966 –
777   #ifdef  F_SETLKW
778  
779   static void
# Line 975 | Line 785 | aflock(                        /* lock/unlock ambient file */
785  
786          if (typ == fls.l_type)          /* already called? */
787                  return;
788 +
789          fls.l_type = typ;
790 <        if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
791 <                error(SYSTEM, "cannot (un)lock ambient file");
790 >        do
791 >                if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1)
792 >                        return;
793 >        while (errno == EINTR);
794 >        
795 >        error(SYSTEM, "cannot (un)lock ambient file");
796   }
797  
798  

Diff Legend

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