1 |
< |
/* Copyright (c) 1993 Regents of the University of California */ |
2 |
< |
|
3 |
< |
#ifndef lint |
4 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
5 |
< |
#endif |
6 |
< |
|
1 |
> |
static const char RCSid[] = "$Id$"; |
2 |
|
/* |
3 |
|
* ambient.c - routines dealing with ambient (inter-reflected) component. |
4 |
+ |
* |
5 |
+ |
* Declarations of external symbols in ambient.h |
6 |
|
*/ |
7 |
|
|
8 |
< |
#include "ray.h" |
8 |
> |
#include "copyright.h" |
9 |
|
|
10 |
< |
#include "octree.h" |
10 |
> |
#include <string.h> |
11 |
|
|
12 |
+ |
#include "platform.h" |
13 |
+ |
#include "ray.h" |
14 |
|
#include "otypes.h" |
15 |
< |
|
15 |
> |
#include "otspecial.h" |
16 |
> |
#include "resolu.h" |
17 |
|
#include "ambient.h" |
18 |
– |
|
18 |
|
#include "random.h" |
19 |
+ |
#include "pmapamb.h" |
20 |
|
|
21 |
< |
#define OCTSCALE 0.5 /* ceil((valid rad.)/(cube size)) */ |
21 |
> |
#ifndef OCTSCALE |
22 |
> |
#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ |
23 |
> |
#endif |
24 |
|
|
25 |
< |
typedef struct ambtree { |
24 |
< |
AMBVAL *alist; /* ambient value list */ |
25 |
< |
struct ambtree *kid; /* 8 child nodes */ |
26 |
< |
} AMBTREE; /* ambient octree */ |
25 |
> |
extern char *shm_boundary; /* memory sharing boundary */ |
26 |
|
|
27 |
< |
extern CUBE thescene; /* contains space boundaries */ |
28 |
< |
|
29 |
< |
#define MAXASET 511 /* maximum number of elements in ambient set */ |
27 |
> |
#ifndef MAXASET |
28 |
> |
#define MAXASET 4095 /* maximum number of elements in ambient set */ |
29 |
> |
#endif |
30 |
|
OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ |
31 |
|
|
32 |
|
double maxarad; /* maximum ambient radius */ |
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 |
+ |
|
55 |
+ |
static double avsum = 0.; /* computed ambient value sum (log) */ |
56 |
+ |
static unsigned int navsum = 0; /* number of values in avsum */ |
57 |
+ |
static unsigned int nambvals = 0; /* total number of indirect values */ |
58 |
+ |
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 */ |
62 |
+ |
static FILE *ambinp = NULL; /* auxiliary file for input */ |
63 |
+ |
static long lastpos = -1; /* last flush position */ |
64 |
+ |
|
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 |
+ |
|
77 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
78 |
|
|
79 |
< |
#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) |
79 |
> |
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
80 |
|
|
81 |
< |
#define newambtree() (AMBTREE *)calloc(8, sizeof(AMBTREE)) |
46 |
< |
#define freeambtree(t) free((char *)(t)) |
81 |
> |
#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) |
82 |
|
|
83 |
< |
extern long ftell(), lseek(); |
84 |
< |
static int initambfile(), avsave(), avinsert(), loadatree(); |
85 |
< |
static AMBVAL *avstore(); |
83 |
> |
static void initambfile(int creat); |
84 |
> |
static void avsave(AMBVAL *av); |
85 |
> |
static AMBVAL *avstore(AMBVAL *aval); |
86 |
> |
static AMBTREE *newambtree(void); |
87 |
> |
static void freeambtree(AMBTREE *atp); |
88 |
> |
|
89 |
> |
typedef void unloadtf_t(AMBVAL *); |
90 |
> |
static unloadtf_t avinsert; |
91 |
> |
static unloadtf_t av2list; |
92 |
> |
static unloadtf_t avfree; |
93 |
> |
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
94 |
> |
|
95 |
> |
static int aposcmp(const void *avp1, const void *avp2); |
96 |
> |
static int avlmemi(AMBVAL *avaddr); |
97 |
> |
static void sortambvals(int always); |
98 |
> |
|
99 |
> |
static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang); |
100 |
> |
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
101 |
> |
AMBTREE *at, FVECT c0, double s); |
102 |
> |
static int makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
103 |
> |
static int extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
104 |
> |
FVECT uvw[3]); |
105 |
> |
|
106 |
|
#ifdef F_SETLKW |
107 |
< |
static aflock(); |
107 |
> |
static void aflock(int typ); |
108 |
|
#endif |
109 |
|
|
110 |
|
|
111 |
< |
setambres(ar) /* set ambient resolution */ |
112 |
< |
int ar; |
111 |
> |
void |
112 |
> |
setambres( /* set ambient resolution */ |
113 |
> |
int ar |
114 |
> |
) |
115 |
|
{ |
116 |
|
ambres = ar < 0 ? 0 : ar; /* may be done already */ |
117 |
|
/* set min & max radii */ |
118 |
|
if (ar <= 0) { |
119 |
< |
minarad = 0.0; |
120 |
< |
maxarad = thescene.cusize / 2.0; |
119 |
> |
minarad = 0; |
120 |
> |
maxarad = thescene.cusize*0.2; |
121 |
|
} else { |
122 |
|
minarad = thescene.cusize / ar; |
123 |
< |
maxarad = 16.0 * minarad; /* heuristic */ |
124 |
< |
if (maxarad > thescene.cusize / 2.0) |
125 |
< |
maxarad = thescene.cusize / 2.0; |
123 |
> |
maxarad = 64.0 * minarad; /* heuristic */ |
124 |
> |
if (maxarad > thescene.cusize*0.2) |
125 |
> |
maxarad = thescene.cusize*0.2; |
126 |
|
} |
127 |
< |
if (maxarad <= FTINY) |
128 |
< |
maxarad = .001; |
127 |
> |
if (minarad <= FTINY) |
128 |
> |
minarad = 10.0*FTINY; |
129 |
> |
if (maxarad <= minarad) |
130 |
> |
maxarad = 64.0 * minarad; |
131 |
|
} |
132 |
|
|
133 |
|
|
134 |
< |
setambacc(newa) /* set ambient accuracy */ |
135 |
< |
double newa; |
134 |
> |
void |
135 |
> |
setambacc( /* set ambient accuracy */ |
136 |
> |
double newa |
137 |
> |
) |
138 |
|
{ |
139 |
< |
static double oldambacc = -1.0; |
140 |
< |
AMBTREE oldatrunk; |
141 |
< |
|
142 |
< |
ambacc = newa < 0.0 ? 0.0 : newa; /* may be done already */ |
143 |
< |
if (oldambacc < -FTINY) |
144 |
< |
oldambacc = ambacc; /* do nothing first call */ |
145 |
< |
if (fabs(newa - oldambacc) < 0.01) |
146 |
< |
return; /* insignificant -- don't bother */ |
86 |
< |
if (ambacc <= FTINY) |
87 |
< |
return; /* cannot build new tree */ |
88 |
< |
/* else need to rebuild tree */ |
89 |
< |
copystruct(&oldatrunk, &atrunk); |
90 |
< |
atrunk.alist = NULL; |
91 |
< |
atrunk.kid = NULL; |
92 |
< |
loadatree(&oldatrunk); |
93 |
< |
oldambacc = ambacc; /* remeber setting for next call */ |
139 |
> |
static double olda; /* remember previous setting here */ |
140 |
> |
|
141 |
> |
newa *= (newa > 0); |
142 |
> |
if (fabs(newa - olda) >= .05*(newa + olda)) { |
143 |
> |
ambacc = newa; |
144 |
> |
if (ambacc > FTINY && nambvals > 0) |
145 |
> |
sortambvals(1); /* rebuild tree */ |
146 |
> |
} |
147 |
|
} |
148 |
|
|
149 |
|
|
150 |
< |
setambient(afile) /* initialize calculation */ |
151 |
< |
char *afile; |
150 |
> |
void |
151 |
> |
setambient(void) /* initialize calculation */ |
152 |
|
{ |
153 |
< |
long headlen; |
153 |
> |
int readonly = 0; |
154 |
> |
long flen; |
155 |
|
AMBVAL amb; |
156 |
+ |
/* make sure we're fresh */ |
157 |
+ |
ambdone(); |
158 |
|
/* init ambient limits */ |
159 |
|
setambres(ambres); |
160 |
|
setambacc(ambacc); |
161 |
< |
if (afile == NULL) |
161 |
> |
if (ambfile == NULL || !ambfile[0]) |
162 |
|
return; |
163 |
|
if (ambacc <= FTINY) { |
164 |
|
sprintf(errmsg, "zero ambient accuracy so \"%s\" not opened", |
165 |
< |
afile); |
165 |
> |
ambfile); |
166 |
|
error(WARNING, errmsg); |
167 |
|
return; |
168 |
|
} |
169 |
|
/* open ambient file */ |
170 |
< |
if ((ambfp = fopen(afile, "r+")) != NULL) { |
171 |
< |
initambfile(0); |
172 |
< |
headlen = ftell(ambfp); |
170 |
> |
if ((ambfp = fopen(ambfile, "r+")) == NULL) |
171 |
> |
readonly = (ambfp = fopen(ambfile, "r")) != NULL; |
172 |
> |
if (ambfp != NULL) { |
173 |
> |
initambfile(0); /* file exists */ |
174 |
> |
lastpos = ftell(ambfp); |
175 |
|
while (readambval(&amb, ambfp)) |
176 |
< |
avinsert(avstore(&amb)); |
177 |
< |
/* align */ |
178 |
< |
fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1); |
179 |
< |
} else if ((ambfp = fopen(afile, "w+")) != NULL) |
180 |
< |
initambfile(1); |
181 |
< |
else { |
182 |
< |
sprintf(errmsg, "cannot open ambient file \"%s\"", afile); |
176 |
> |
avstore(&amb); |
177 |
> |
nambshare = nambvals; /* share loaded values */ |
178 |
> |
if (readonly) { |
179 |
> |
sprintf(errmsg, |
180 |
> |
"loaded %u values from read-only ambient file", |
181 |
> |
nambvals); |
182 |
> |
error(WARNING, errmsg); |
183 |
> |
fclose(ambfp); /* close file so no writes */ |
184 |
> |
ambfp = NULL; |
185 |
> |
return; /* avoid ambsync() */ |
186 |
> |
} |
187 |
> |
/* align file pointer */ |
188 |
> |
lastpos += (long)nambvals*AMBVALSIZ; |
189 |
> |
flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); |
190 |
> |
if (flen != lastpos) { |
191 |
> |
sprintf(errmsg, |
192 |
> |
"ignoring last %ld values in ambient file (corrupted)", |
193 |
> |
(flen - lastpos)/AMBVALSIZ); |
194 |
> |
error(WARNING, errmsg); |
195 |
> |
fseek(ambfp, lastpos, SEEK_SET); |
196 |
> |
ftruncate(fileno(ambfp), (off_t)lastpos); |
197 |
> |
} |
198 |
> |
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
199 |
> |
initambfile(1); /* else create new file */ |
200 |
> |
fflush(ambfp); |
201 |
> |
lastpos = ftell(ambfp); |
202 |
> |
} else { |
203 |
> |
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
204 |
|
error(SYSTEM, errmsg); |
205 |
|
} |
206 |
< |
nunflshed++; /* lie */ |
207 |
< |
ambsync(); |
206 |
> |
#ifdef F_SETLKW |
207 |
> |
aflock(F_UNLCK); /* release file */ |
208 |
> |
#endif |
209 |
|
} |
210 |
|
|
211 |
|
|
212 |
< |
ambnotify(obj) /* record new modifier */ |
213 |
< |
OBJECT obj; |
212 |
> |
void |
213 |
> |
ambdone(void) /* close ambient file and free memory */ |
214 |
|
{ |
215 |
+ |
if (ambfp != NULL) { /* close ambient file */ |
216 |
+ |
ambsync(); |
217 |
+ |
fclose(ambfp); |
218 |
+ |
ambfp = NULL; |
219 |
+ |
if (ambinp != NULL) { |
220 |
+ |
fclose(ambinp); |
221 |
+ |
ambinp = NULL; |
222 |
+ |
} |
223 |
+ |
lastpos = -1; |
224 |
+ |
} |
225 |
+ |
/* free ambient tree */ |
226 |
+ |
unloadatree(&atrunk, avfree); |
227 |
+ |
/* reset state variables */ |
228 |
+ |
avsum = 0.; |
229 |
+ |
navsum = 0; |
230 |
+ |
nambvals = 0; |
231 |
+ |
nambshare = 0; |
232 |
+ |
ambclock = 0; |
233 |
+ |
lastsort = 0; |
234 |
+ |
sortintvl = SORT_INTVL; |
235 |
+ |
} |
236 |
+ |
|
237 |
+ |
|
238 |
+ |
void |
239 |
+ |
ambnotify( /* record new modifier */ |
240 |
+ |
OBJECT obj |
241 |
+ |
) |
242 |
+ |
{ |
243 |
|
static int hitlimit = 0; |
244 |
< |
register OBJREC *o = objptr(obj); |
245 |
< |
register char **amblp; |
244 |
> |
OBJREC *o; |
245 |
> |
char **amblp; |
246 |
|
|
247 |
+ |
if (obj == OVOID) { /* starting over */ |
248 |
+ |
ambset[0] = 0; |
249 |
+ |
hitlimit = 0; |
250 |
+ |
return; |
251 |
+ |
} |
252 |
+ |
o = objptr(obj); |
253 |
|
if (hitlimit || !ismodifier(o->otype)) |
254 |
|
return; |
255 |
|
for (amblp = amblist; *amblp != NULL; amblp++) |
265 |
|
} |
266 |
|
|
267 |
|
|
268 |
< |
ambient(acol, r) /* compute ambient component for ray */ |
269 |
< |
COLOR acol; |
270 |
< |
register RAY *r; |
268 |
> |
void |
269 |
> |
multambient( /* compute ambient component & multiply by coef. */ |
270 |
> |
COLOR aval, |
271 |
> |
RAY *r, |
272 |
> |
FVECT nrm |
273 |
> |
) |
274 |
|
{ |
275 |
|
static int rdepth = 0; /* ambient recursion */ |
276 |
< |
double d; |
276 |
> |
COLOR acol, caustic; |
277 |
> |
int i, ok; |
278 |
> |
double d, l; |
279 |
|
|
280 |
+ |
/* PMAP: Factor in ambient from photon map, if enabled and ray is |
281 |
+ |
* ambient. Return as all ambient components accounted for, else |
282 |
+ |
* continue. */ |
283 |
+ |
if (ambPmap(aval, r, rdepth)) |
284 |
+ |
return; |
285 |
+ |
|
286 |
+ |
/* PMAP: Factor in specular-diffuse ambient (caustics) from photon |
287 |
+ |
* map, if enabled and ray is primary, else caustic is zero. Continue |
288 |
+ |
* with RADIANCE ambient calculation */ |
289 |
+ |
copycolor(caustic, aval); |
290 |
+ |
ambPmapCaustic(caustic, r, rdepth); |
291 |
+ |
|
292 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
293 |
|
goto dumbamb; |
294 |
|
/* check number of bounces */ |
300 |
|
goto dumbamb; |
301 |
|
|
302 |
|
if (ambacc <= FTINY) { /* no ambient storage */ |
303 |
+ |
FVECT uvd[2]; |
304 |
+ |
float dgrad[2], *dgp = NULL; |
305 |
+ |
|
306 |
+ |
if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999) |
307 |
+ |
dgp = dgrad; /* compute rotational grad. */ |
308 |
+ |
copycolor(acol, aval); |
309 |
|
rdepth++; |
310 |
< |
d = doambient(acol, r, r->rweight, NULL, NULL); |
310 |
> |
ok = doambient(acol, r, r->rweight, |
311 |
> |
uvd, NULL, NULL, dgp, NULL); |
312 |
|
rdepth--; |
313 |
< |
if (d == 0.0) |
313 |
> |
if (!ok) |
314 |
|
goto dumbamb; |
315 |
+ |
if ((ok > 0) & (dgp != NULL)) { /* apply texture */ |
316 |
+ |
FVECT v1; |
317 |
+ |
VCROSS(v1, r->ron, nrm); |
318 |
+ |
d = 1.0; |
319 |
+ |
for (i = 3; i--; ) |
320 |
+ |
d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
321 |
+ |
if (d >= 0.05) |
322 |
+ |
scalecolor(acol, d); |
323 |
+ |
} |
324 |
+ |
copycolor(aval, acol); |
325 |
+ |
|
326 |
+ |
/* PMAP: add in caustic */ |
327 |
+ |
addcolor(aval, caustic); |
328 |
|
return; |
329 |
|
} |
330 |
< |
/* get ambient value */ |
330 |
> |
|
331 |
> |
if (tracktime) /* sort to minimize thrashing */ |
332 |
> |
sortambvals(0); |
333 |
> |
/* interpolate ambient value */ |
334 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
335 |
< |
d = sumambient(acol, r, rdepth, |
335 |
> |
d = sumambient(acol, r, nrm, rdepth, |
336 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
337 |
< |
if (d > FTINY) |
338 |
< |
scalecolor(acol, 1.0/d); |
339 |
< |
else { |
340 |
< |
d = makeambient(acol, r, rdepth++); |
341 |
< |
rdepth--; |
337 |
> |
|
338 |
> |
if (d > FTINY) { |
339 |
> |
d = 1.0/d; |
340 |
> |
scalecolor(acol, d); |
341 |
> |
multcolor(aval, acol); |
342 |
> |
|
343 |
> |
/* PMAP: add in caustic */ |
344 |
> |
addcolor(aval, caustic); |
345 |
> |
return; |
346 |
|
} |
347 |
< |
if (d > FTINY) |
347 |
> |
|
348 |
> |
rdepth++; /* need to cache new value */ |
349 |
> |
ok = makeambient(acol, r, nrm, rdepth-1); |
350 |
> |
rdepth--; |
351 |
> |
|
352 |
> |
if (ok) { |
353 |
> |
multcolor(aval, acol); /* computed new value */ |
354 |
> |
|
355 |
> |
/* PMAP: add in caustic */ |
356 |
> |
addcolor(aval, caustic); |
357 |
|
return; |
358 |
+ |
} |
359 |
+ |
|
360 |
|
dumbamb: /* return global value */ |
361 |
< |
copycolor(acol, ambval); |
361 |
> |
if ((ambvwt <= 0) | (navsum == 0)) { |
362 |
> |
multcolor(aval, ambval); |
363 |
> |
|
364 |
> |
/* PMAP: add in caustic */ |
365 |
> |
addcolor(aval, caustic); |
366 |
> |
return; |
367 |
> |
} |
368 |
> |
|
369 |
> |
l = bright(ambval); /* average in computations */ |
370 |
> |
if (l > FTINY) { |
371 |
> |
d = (log(l)*(double)ambvwt + avsum) / |
372 |
> |
(double)(ambvwt + navsum); |
373 |
> |
d = exp(d) / l; |
374 |
> |
scalecolor(aval, d); |
375 |
> |
multcolor(aval, ambval); /* apply color of ambval */ |
376 |
> |
} else { |
377 |
> |
d = exp( avsum / (double)navsum ); |
378 |
> |
scalecolor(aval, d); /* neutral color */ |
379 |
> |
} |
380 |
|
} |
381 |
|
|
382 |
|
|
383 |
< |
double |
384 |
< |
sumambient(acol, r, al, at, c0, s) /* get interpolated ambient value */ |
385 |
< |
COLOR acol; |
199 |
< |
register RAY *r; |
200 |
< |
int al; |
201 |
< |
AMBTREE *at; |
202 |
< |
FVECT c0; |
203 |
< |
double s; |
383 |
> |
/* Plug a potential leak where ambient cache value is occluded */ |
384 |
> |
static int |
385 |
> |
plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang) |
386 |
|
{ |
387 |
< |
double d, e1, e2, wt, wsum; |
388 |
< |
COLOR ct; |
389 |
< |
FVECT ck0; |
390 |
< |
int i; |
391 |
< |
register int j; |
392 |
< |
register AMBVAL *av; |
393 |
< |
/* do this node */ |
394 |
< |
wsum = 0.0; |
387 |
> |
const double cost70sq = 0.1169778; /* cos(70deg)^2 */ |
388 |
> |
RAY rtst; |
389 |
> |
FVECT vdif; |
390 |
> |
double normdot, ndotd, nadotd; |
391 |
> |
double a, b, c, t[2]; |
392 |
> |
|
393 |
> |
ang += 2.*PI*(ang < 0); /* check direction flags */ |
394 |
> |
if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) ) |
395 |
> |
return(0); |
396 |
> |
/* |
397 |
> |
* Generate test ray, targeting 20 degrees above sample point plane |
398 |
> |
* along surface normal from cache position. This should be high |
399 |
> |
* enough to miss local geometry we don't really care about. |
400 |
> |
*/ |
401 |
> |
VSUB(vdif, ap->pos, r->rop); |
402 |
> |
normdot = DOT(anorm, r->ron); |
403 |
> |
ndotd = DOT(vdif, r->ron); |
404 |
> |
nadotd = DOT(vdif, anorm); |
405 |
> |
a = normdot*normdot - cost70sq; |
406 |
> |
b = 2.0*(normdot*ndotd - nadotd*cost70sq); |
407 |
> |
c = ndotd*ndotd - DOT(vdif,vdif)*cost70sq; |
408 |
> |
if (quadratic(t, a, b, c) != 2) |
409 |
> |
return(1); /* should rarely happen */ |
410 |
> |
if (t[1] <= FTINY) |
411 |
> |
return(0); /* should fail behind test */ |
412 |
> |
rayorigin(&rtst, SHADOW, r, NULL); |
413 |
> |
VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */ |
414 |
> |
rtst.rmax = normalize(rtst.rdir); /* short ray test */ |
415 |
> |
while (localhit(&rtst, &thescene)) { /* check for occluder */ |
416 |
> |
OBJREC *m = findmaterial(rtst.ro); |
417 |
> |
if (m != NULL && !istransp(m->otype) && !isBSDFproxy(m) && |
418 |
> |
(rtst.clipset == NULL || |
419 |
> |
!inset(rtst.clipset, rtst.ro->omod))) |
420 |
> |
return(1); /* plug light leak */ |
421 |
> |
VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */ |
422 |
> |
rtst.rmax -= rtst.rot; |
423 |
> |
rayclear(&rtst); |
424 |
> |
} |
425 |
> |
return(0); /* seems we're OK */ |
426 |
> |
} |
427 |
> |
|
428 |
> |
|
429 |
> |
static double |
430 |
> |
sumambient( /* get interpolated ambient value */ |
431 |
> |
COLOR acol, |
432 |
> |
RAY *r, |
433 |
> |
FVECT rn, |
434 |
> |
int al, |
435 |
> |
AMBTREE *at, |
436 |
> |
FVECT c0, |
437 |
> |
double s |
438 |
> |
) |
439 |
> |
{ /* initial limit is 10 degrees plus ambacc radians */ |
440 |
> |
const double minangle = 10.0 * PI/180.; |
441 |
> |
double maxangle = minangle + ambacc; |
442 |
> |
double wsum = 0.0; |
443 |
> |
FVECT ck0; |
444 |
> |
int i, j; |
445 |
> |
AMBVAL *av; |
446 |
> |
|
447 |
> |
if (at->kid != NULL) { /* sum children first */ |
448 |
> |
s *= 0.5; |
449 |
> |
for (i = 0; i < 8; i++) { |
450 |
> |
for (j = 0; j < 3; j++) { |
451 |
> |
ck0[j] = c0[j]; |
452 |
> |
if (1<<j & i) |
453 |
> |
ck0[j] += s; |
454 |
> |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
455 |
> |
break; |
456 |
> |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
457 |
> |
break; |
458 |
> |
} |
459 |
> |
if (j == 3) |
460 |
> |
wsum += sumambient(acol, r, rn, al, |
461 |
> |
at->kid+i, ck0, s); |
462 |
> |
} |
463 |
> |
/* good enough? */ |
464 |
> |
if (wsum >= 0.05 && s > minarad*10.0) |
465 |
> |
return(wsum); |
466 |
> |
} |
467 |
> |
/* adjust maximum angle */ |
468 |
> |
if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6)) |
469 |
> |
maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.; |
470 |
> |
/* sum this node */ |
471 |
|
for (av = at->alist; av != NULL; av = av->next) { |
472 |
+ |
double u, v, d, delta_r2, delta_t2; |
473 |
+ |
COLOR ct; |
474 |
+ |
FVECT uvw[3]; |
475 |
+ |
/* record access */ |
476 |
+ |
if (tracktime) |
477 |
+ |
av->latick = ambclock; |
478 |
|
/* |
479 |
< |
* Ambient level test. |
479 |
> |
* Ambient level test |
480 |
|
*/ |
481 |
< |
if (av->lvl > al) /* list sorted, so this works */ |
481 |
> |
if (av->lvl > al || /* list sorted, so this works */ |
482 |
> |
(av->lvl == al) & (av->weight < 0.9*r->rweight)) |
483 |
|
break; |
484 |
< |
if (av->weight < r->rweight-FTINY) |
484 |
> |
/* |
485 |
> |
* Direction test using unperturbed normal |
486 |
> |
*/ |
487 |
> |
decodedir(uvw[2], av->ndir); |
488 |
> |
d = DOT(uvw[2], r->ron); |
489 |
> |
if (d <= 0.0) /* >= 90 degrees */ |
490 |
|
continue; |
491 |
+ |
delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */ |
492 |
+ |
if (delta_r2 >= maxangle*maxangle) |
493 |
+ |
continue; |
494 |
|
/* |
495 |
< |
* Ambient radius test. |
495 |
> |
* Modified ray behind test |
496 |
|
*/ |
497 |
< |
e1 = 0.0; |
498 |
< |
for (j = 0; j < 3; j++) { |
499 |
< |
d = av->pos[j] - r->rop[j]; |
227 |
< |
e1 += d * d; |
228 |
< |
} |
229 |
< |
e1 /= av->rad * av->rad; |
230 |
< |
if (e1 > ambacc*ambacc*1.21) |
497 |
> |
VSUB(ck0, r->rop, av->pos); |
498 |
> |
d = DOT(ck0, uvw[2]); |
499 |
> |
if (d < -minarad*ambacc-.001) |
500 |
|
continue; |
501 |
+ |
d /= av->rad[0]; |
502 |
+ |
delta_t2 = d*d; |
503 |
+ |
if (delta_t2 >= ambacc*ambacc) |
504 |
+ |
continue; |
505 |
|
/* |
506 |
< |
* Normal direction test. |
506 |
> |
* Elliptical radii test based on Hessian |
507 |
|
*/ |
508 |
< |
e2 = (1.0 - DOT(av->dir, r->ron)) * r->rweight; |
509 |
< |
if (e2 < 0.0) e2 = 0.0; |
510 |
< |
if (e1 + e2 > ambacc*ambacc*1.21) |
508 |
> |
decodedir(uvw[0], av->udir); |
509 |
> |
VCROSS(uvw[1], uvw[2], uvw[0]); |
510 |
> |
d = (u = DOT(ck0, uvw[0])) / av->rad[0]; |
511 |
> |
delta_t2 += d*d; |
512 |
> |
d = (v = DOT(ck0, uvw[1])) / av->rad[1]; |
513 |
> |
delta_t2 += d*d; |
514 |
> |
if (delta_t2 >= ambacc*ambacc) |
515 |
|
continue; |
516 |
|
/* |
517 |
< |
* Ray behind test. |
517 |
> |
* Test for potential light leak |
518 |
|
*/ |
519 |
< |
d = 0.0; |
243 |
< |
for (j = 0; j < 3; j++) |
244 |
< |
d += (r->rop[j] - av->pos[j]) * |
245 |
< |
(av->dir[j] + r->ron[j]); |
246 |
< |
if (d*0.5 < -minarad*ambacc-.001) |
519 |
> |
if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u))) |
520 |
|
continue; |
521 |
|
/* |
522 |
< |
* Jittering final test reduces image artifacts. |
522 |
> |
* Extrapolate value and compute final weight (hat function) |
523 |
|
*/ |
524 |
< |
wt = sqrt(e1) + sqrt(e2); |
252 |
< |
wt *= .9 + .2*urand(9015+samplendx); |
253 |
< |
if (wt > ambacc) |
524 |
> |
if (!extambient(ct, av, r->rop, rn, uvw)) |
525 |
|
continue; |
526 |
< |
if (wt <= 1e-3) |
527 |
< |
wt = 1e3; |
528 |
< |
else |
258 |
< |
wt = 1.0 / wt; |
259 |
< |
wsum += wt; |
260 |
< |
extambient(ct, av, r->rop, r->ron); |
261 |
< |
scalecolor(ct, wt); |
526 |
> |
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
527 |
> |
tfunc(ambacc, sqrt(delta_t2), 0.0); |
528 |
> |
scalecolor(ct, d); |
529 |
|
addcolor(acol, ct); |
530 |
+ |
wsum += d; |
531 |
|
} |
264 |
– |
if (at->kid == NULL) |
265 |
– |
return(wsum); |
266 |
– |
/* do children */ |
267 |
– |
s *= 0.5; |
268 |
– |
for (i = 0; i < 8; i++) { |
269 |
– |
for (j = 0; j < 3; j++) { |
270 |
– |
ck0[j] = c0[j]; |
271 |
– |
if (1<<j & i) |
272 |
– |
ck0[j] += s; |
273 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
274 |
– |
break; |
275 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
276 |
– |
break; |
277 |
– |
} |
278 |
– |
if (j == 3) |
279 |
– |
wsum += sumambient(acol, r, al, at->kid+i, ck0, s); |
280 |
– |
} |
532 |
|
return(wsum); |
533 |
|
} |
534 |
|
|
535 |
|
|
536 |
< |
double |
537 |
< |
makeambient(acol, r, al) /* make a new ambient value */ |
538 |
< |
COLOR acol; |
539 |
< |
register RAY *r; |
540 |
< |
int al; |
536 |
> |
static int |
537 |
> |
makeambient( /* make a new ambient value for storage */ |
538 |
> |
COLOR acol, |
539 |
> |
RAY *r, |
540 |
> |
FVECT rn, |
541 |
> |
int al |
542 |
> |
) |
543 |
|
{ |
544 |
|
AMBVAL amb; |
545 |
< |
FVECT gp, gd; |
546 |
< |
/* compute weight */ |
547 |
< |
amb.weight = pow(AVGREFL, (double)al); |
548 |
< |
if (r->rweight < 0.2*amb.weight) /* heuristic */ |
549 |
< |
amb.weight = r->rweight; |
545 |
> |
FVECT uvw[3]; |
546 |
> |
int i; |
547 |
> |
|
548 |
> |
amb.weight = 1.0; /* compute weight */ |
549 |
> |
for (i = al; i-- > 0; ) |
550 |
> |
amb.weight *= AVGREFL; |
551 |
> |
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
552 |
> |
amb.weight = 1.25*r->rweight; |
553 |
> |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
554 |
|
/* compute ambient */ |
555 |
< |
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
556 |
< |
if (amb.rad == 0.0) |
557 |
< |
return(0.0); |
558 |
< |
/* store it */ |
555 |
> |
i = doambient(acol, r, amb.weight, |
556 |
> |
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
557 |
> |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
558 |
> |
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
559 |
> |
return(i); |
560 |
> |
/* store value */ |
561 |
|
VCOPY(amb.pos, r->rop); |
562 |
< |
VCOPY(amb.dir, r->ron); |
562 |
> |
amb.ndir = encodedir(r->ron); |
563 |
> |
amb.udir = encodedir(uvw[0]); |
564 |
|
amb.lvl = al; |
565 |
|
copycolor(amb.val, acol); |
306 |
– |
VCOPY(amb.gpos, gp); |
307 |
– |
VCOPY(amb.gdir, gd); |
566 |
|
/* insert into tree */ |
567 |
|
avsave(&amb); /* and save to file */ |
568 |
< |
return(amb.rad); |
568 |
> |
if (rn != r->ron) { /* texture */ |
569 |
> |
VCOPY(uvw[2], r->ron); |
570 |
> |
extambient(acol, &amb, r->rop, rn, uvw); |
571 |
> |
} |
572 |
> |
return(1); |
573 |
|
} |
574 |
|
|
575 |
|
|
576 |
< |
extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ |
577 |
< |
COLOR cr; |
578 |
< |
register AMBVAL *ap; |
579 |
< |
FVECT pv, nv; |
576 |
> |
static int |
577 |
> |
extambient( /* extrapolate value at pv, nv */ |
578 |
> |
COLOR cr, |
579 |
> |
AMBVAL *ap, |
580 |
> |
FVECT pv, |
581 |
> |
FVECT nv, |
582 |
> |
FVECT uvw[3] |
583 |
> |
) |
584 |
|
{ |
585 |
< |
FVECT v1, v2; |
586 |
< |
register int i; |
587 |
< |
double d; |
585 |
> |
const double min_d = 0.05; |
586 |
> |
static FVECT my_uvw[3]; |
587 |
> |
FVECT v1; |
588 |
> |
int i; |
589 |
> |
double d = 1.0; /* zeroeth order */ |
590 |
|
|
591 |
< |
d = 1.0; /* zeroeth order */ |
592 |
< |
/* gradient due to translation */ |
593 |
< |
for (i = 0; i < 3; i++) |
594 |
< |
d += ap->gpos[i]*(pv[i]-ap->pos[i]); |
595 |
< |
/* gradient due to rotation */ |
328 |
< |
VCOPY(v1, ap->dir); |
329 |
< |
fcross(v2, v1, nv); |
330 |
< |
d += DOT(ap->gdir, v2); |
331 |
< |
if (d <= 0.0) { |
332 |
< |
setcolor(cr, 0.0, 0.0, 0.0); |
333 |
< |
return; |
591 |
> |
if (uvw == NULL) { /* need local coordinates? */ |
592 |
> |
decodedir(my_uvw[2], ap->ndir); |
593 |
> |
decodedir(my_uvw[0], ap->udir); |
594 |
> |
VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]); |
595 |
> |
uvw = my_uvw; |
596 |
|
} |
597 |
+ |
for (i = 3; i--; ) /* gradient due to translation */ |
598 |
+ |
d += (pv[i] - ap->pos[i]) * |
599 |
+ |
(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]); |
600 |
+ |
|
601 |
+ |
VCROSS(v1, uvw[2], nv); /* gradient due to rotation */ |
602 |
+ |
for (i = 3; i--; ) |
603 |
+ |
d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); |
604 |
+ |
|
605 |
+ |
if (d < min_d) /* should not use if we can avoid it */ |
606 |
+ |
d = min_d; |
607 |
|
copycolor(cr, ap->val); |
608 |
|
scalecolor(cr, d); |
609 |
+ |
return(d > min_d); |
610 |
|
} |
611 |
|
|
612 |
|
|
613 |
< |
static |
614 |
< |
initambfile(creat) /* initialize ambient file */ |
615 |
< |
int creat; |
613 |
> |
static void |
614 |
> |
avinsert( /* insert ambient value in our tree */ |
615 |
> |
AMBVAL *av |
616 |
> |
) |
617 |
|
{ |
618 |
< |
extern char *progname, *octname, VersionID[]; |
618 |
> |
AMBTREE *at; |
619 |
> |
AMBVAL *ap; |
620 |
> |
AMBVAL avh; |
621 |
> |
FVECT ck0; |
622 |
> |
double s; |
623 |
> |
int branch; |
624 |
> |
int i; |
625 |
|
|
626 |
+ |
if (av->rad[0] <= FTINY) |
627 |
+ |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
628 |
+ |
at = &atrunk; |
629 |
+ |
VCOPY(ck0, thescene.cuorg); |
630 |
+ |
s = thescene.cusize; |
631 |
+ |
while (s*(OCTSCALE/2) > av->rad[1]*ambacc) { |
632 |
+ |
if (at->kid == NULL) |
633 |
+ |
if ((at->kid = newambtree()) == NULL) |
634 |
+ |
error(SYSTEM, "out of memory in avinsert"); |
635 |
+ |
s *= 0.5; |
636 |
+ |
branch = 0; |
637 |
+ |
for (i = 0; i < 3; i++) |
638 |
+ |
if (av->pos[i] > ck0[i] + s) { |
639 |
+ |
ck0[i] += s; |
640 |
+ |
branch |= 1 << i; |
641 |
+ |
} |
642 |
+ |
at = at->kid + branch; |
643 |
+ |
} |
644 |
+ |
avh.next = at->alist; /* order by increasing level */ |
645 |
+ |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
646 |
+ |
if ( ap->next->lvl > av->lvl || |
647 |
+ |
(ap->next->lvl == av->lvl) & |
648 |
+ |
(ap->next->weight <= av->weight) ) |
649 |
+ |
break; |
650 |
+ |
av->next = ap->next; |
651 |
+ |
ap->next = (AMBVAL*)av; |
652 |
+ |
at->alist = avh.next; |
653 |
+ |
} |
654 |
+ |
|
655 |
+ |
|
656 |
+ |
static void |
657 |
+ |
initambfile( /* initialize ambient file */ |
658 |
+ |
int cre8 |
659 |
+ |
) |
660 |
+ |
{ |
661 |
+ |
extern char *progname, *octname; |
662 |
+ |
static char *mybuf = NULL; |
663 |
+ |
|
664 |
|
#ifdef F_SETLKW |
665 |
< |
aflock(creat ? F_WRLCK : F_RDLCK); |
665 |
> |
aflock(cre8 ? F_WRLCK : F_RDLCK); |
666 |
|
#endif |
667 |
< |
#ifdef MSDOS |
668 |
< |
setmode(fileno(ambfp), O_BINARY); |
669 |
< |
#endif |
670 |
< |
setbuf(ambfp, bmalloc(BUFSIZ+8)); |
671 |
< |
if (creat) { /* new file */ |
672 |
< |
fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ", |
667 |
> |
SET_FILE_BINARY(ambfp); |
668 |
> |
if (mybuf == NULL) |
669 |
> |
mybuf = (char *)bmalloc(BUFSIZ+8); |
670 |
> |
setbuf(ambfp, mybuf); |
671 |
> |
if (cre8) { /* new file */ |
672 |
> |
newheader("RADIANCE", ambfp); |
673 |
> |
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
674 |
|
progname, colval(ambval,RED), |
675 |
|
colval(ambval,GRN), colval(ambval,BLU), |
676 |
< |
ambounce, ambacc); |
677 |
< |
fprintf(ambfp, "-ad %d -as %d -ar %d %s\n", |
678 |
< |
ambdiv, ambssamp, ambres, |
679 |
< |
octname==NULL ? "" : octname); |
676 |
> |
ambvwt, ambounce, ambacc); |
677 |
> |
fprintf(ambfp, "-ad %d -as %d -ar %d ", |
678 |
> |
ambdiv, ambssamp, ambres); |
679 |
> |
if (octname != NULL) |
680 |
> |
fputs(octname, ambfp); |
681 |
> |
fputc('\n', ambfp); |
682 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
683 |
+ |
fputnow(ambfp); |
684 |
|
fputformat(AMBFMT, ambfp); |
685 |
< |
putc('\n', ambfp); |
685 |
> |
fputc('\n', ambfp); |
686 |
|
putambmagic(ambfp); |
687 |
|
} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) |
688 |
|
error(USER, "bad ambient file"); |
689 |
|
} |
690 |
|
|
691 |
|
|
692 |
< |
static |
693 |
< |
avsave(av) /* insert and save an ambient value */ |
694 |
< |
AMBVAL *av; |
692 |
> |
static void |
693 |
> |
avsave( /* insert and save an ambient value */ |
694 |
> |
AMBVAL *av |
695 |
> |
) |
696 |
|
{ |
697 |
< |
avinsert(avstore(av)); |
697 |
> |
avstore(av); |
698 |
|
if (ambfp == NULL) |
699 |
|
return; |
700 |
|
if (writambval(av, ambfp) < 0) |
704 |
|
goto writerr; |
705 |
|
return; |
706 |
|
writerr: |
707 |
< |
error(SYSTEM, "error writing ambient file"); |
707 |
> |
error(SYSTEM, "error writing to ambient file"); |
708 |
|
} |
709 |
|
|
710 |
|
|
711 |
|
static AMBVAL * |
712 |
< |
avstore(aval) /* allocate memory and store aval */ |
713 |
< |
register AMBVAL *aval; |
712 |
> |
avstore( /* allocate memory and save aval */ |
713 |
> |
AMBVAL *aval |
714 |
> |
) |
715 |
|
{ |
716 |
< |
register AMBVAL *av; |
716 |
> |
AMBVAL *av; |
717 |
> |
double d; |
718 |
|
|
719 |
|
if ((av = newambval()) == NULL) |
720 |
|
error(SYSTEM, "out of memory in avstore"); |
721 |
< |
copystruct(av, aval); |
721 |
> |
*av = *aval; |
722 |
> |
av->latick = ambclock; |
723 |
> |
av->next = NULL; |
724 |
> |
nambvals++; |
725 |
> |
d = bright(av->val); |
726 |
> |
if (d > FTINY) { /* add to log sum for averaging */ |
727 |
> |
avsum += log(d); |
728 |
> |
navsum++; |
729 |
> |
} |
730 |
> |
avinsert(av); /* insert in our cache tree */ |
731 |
|
return(av); |
732 |
|
} |
733 |
|
|
734 |
|
|
735 |
< |
static |
736 |
< |
avinsert(av) /* insert ambient value in our tree */ |
737 |
< |
register AMBVAL *av; |
735 |
> |
#define ATALLOCSZ 512 /* #/8 trees to allocate at once */ |
736 |
> |
|
737 |
> |
static AMBTREE *atfreelist = NULL; /* free ambient tree structures */ |
738 |
> |
|
739 |
> |
|
740 |
> |
static AMBTREE * |
741 |
> |
newambtree(void) /* allocate 8 ambient tree structs */ |
742 |
|
{ |
743 |
< |
register AMBTREE *at; |
406 |
< |
register AMBVAL *ap; |
407 |
< |
AMBVAL avh; |
408 |
< |
FVECT ck0; |
409 |
< |
double s; |
410 |
< |
int branch; |
411 |
< |
register int i; |
743 |
> |
AMBTREE *atp, *upperlim; |
744 |
|
|
745 |
< |
if (av->rad <= FTINY) |
746 |
< |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
747 |
< |
at = &atrunk; |
748 |
< |
VCOPY(ck0, thescene.cuorg); |
749 |
< |
s = thescene.cusize; |
750 |
< |
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
751 |
< |
if (at->kid == NULL) |
752 |
< |
if ((at->kid = newambtree()) == NULL) |
753 |
< |
error(SYSTEM, "out of memory in avinsert"); |
422 |
< |
s *= 0.5; |
423 |
< |
branch = 0; |
424 |
< |
for (i = 0; i < 3; i++) |
425 |
< |
if (av->pos[i] > ck0[i] + s) { |
426 |
< |
ck0[i] += s; |
427 |
< |
branch |= 1 << i; |
428 |
< |
} |
429 |
< |
at = at->kid + branch; |
745 |
> |
if (atfreelist == NULL) { /* get more nodes */ |
746 |
> |
atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE)); |
747 |
> |
if (atfreelist == NULL) |
748 |
> |
return(NULL); |
749 |
> |
/* link new free list */ |
750 |
> |
upperlim = atfreelist + 8*(ATALLOCSZ-1); |
751 |
> |
for (atp = atfreelist; atp < upperlim; atp += 8) |
752 |
> |
atp->kid = atp + 8; |
753 |
> |
atp->kid = NULL; |
754 |
|
} |
755 |
< |
avh.next = at->alist; /* order by increasing level */ |
756 |
< |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
757 |
< |
if (ap->next->lvl >= av->lvl) |
758 |
< |
break; |
435 |
< |
av->next = ap->next; |
436 |
< |
ap->next = av; |
437 |
< |
at->alist = avh.next; |
755 |
> |
atp = atfreelist; |
756 |
> |
atfreelist = atp->kid; |
757 |
> |
memset(atp, 0, 8*sizeof(AMBTREE)); |
758 |
> |
return(atp); |
759 |
|
} |
760 |
|
|
761 |
|
|
762 |
< |
static |
763 |
< |
loadatree(at) /* move tree to main store */ |
764 |
< |
register AMBTREE *at; |
762 |
> |
static void |
763 |
> |
freeambtree( /* free 8 ambient tree structs */ |
764 |
> |
AMBTREE *atp |
765 |
> |
) |
766 |
|
{ |
767 |
< |
register AMBVAL *av; |
768 |
< |
register int i; |
767 |
> |
atp->kid = atfreelist; |
768 |
> |
atfreelist = atp; |
769 |
> |
} |
770 |
> |
|
771 |
> |
|
772 |
> |
static void |
773 |
> |
unloadatree( /* unload an ambient value tree */ |
774 |
> |
AMBTREE *at, |
775 |
> |
unloadtf_t *f |
776 |
> |
) |
777 |
> |
{ |
778 |
> |
AMBVAL *av; |
779 |
> |
int i; |
780 |
|
/* transfer values at this node */ |
781 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
782 |
|
at->alist = av->next; |
783 |
< |
avinsert(av); |
783 |
> |
av->next = NULL; |
784 |
> |
(*f)(av); |
785 |
|
} |
786 |
|
if (at->kid == NULL) |
787 |
|
return; |
788 |
|
for (i = 0; i < 8; i++) /* transfer and free children */ |
789 |
< |
loadatree(at->kid+i); |
789 |
> |
unloadatree(at->kid+i, f); |
790 |
|
freeambtree(at->kid); |
791 |
+ |
at->kid = NULL; |
792 |
|
} |
793 |
|
|
794 |
|
|
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 |
+ |
|
804 |
+ |
static void |
805 |
+ |
avfree(AMBVAL *av) |
806 |
+ |
{ |
807 |
+ |
free(av); |
808 |
+ |
} |
809 |
+ |
|
810 |
+ |
static void |
811 |
+ |
av2list( |
812 |
+ |
AMBVAL *av |
813 |
+ |
) |
814 |
+ |
{ |
815 |
+ |
#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 |
+ |
} |
822 |
+ |
|
823 |
+ |
|
824 |
+ |
static int |
825 |
+ |
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); |
832 |
+ |
} |
833 |
+ |
|
834 |
+ |
|
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 |
+ |
|
967 |
|
#ifdef F_SETLKW |
968 |
|
|
969 |
< |
static |
970 |
< |
aflock(typ) /* lock/unlock ambient file */ |
971 |
< |
int typ; |
969 |
> |
static void |
970 |
> |
aflock( /* lock/unlock ambient file */ |
971 |
> |
int typ |
972 |
> |
) |
973 |
|
{ |
974 |
|
static struct flock fls; /* static so initialized to zeroes */ |
975 |
|
|
976 |
+ |
if (typ == fls.l_type) /* already called? */ |
977 |
+ |
return; |
978 |
+ |
|
979 |
|
fls.l_type = typ; |
980 |
< |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) |
981 |
< |
error(SYSTEM, "cannot (un)lock ambient file"); |
980 |
> |
do |
981 |
> |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1) |
982 |
> |
return; |
983 |
> |
while (errno == EINTR); |
984 |
> |
|
985 |
> |
error(SYSTEM, "cannot (un)lock ambient file"); |
986 |
|
} |
987 |
|
|
988 |
|
|
989 |
|
int |
990 |
< |
ambsync() /* synchronize ambient file */ |
990 |
> |
ambsync(void) /* synchronize ambient file */ |
991 |
|
{ |
477 |
– |
static FILE *ambinp = NULL; |
478 |
– |
static long lastpos = -1; |
992 |
|
long flen; |
993 |
|
AMBVAL avs; |
994 |
< |
register int n; |
994 |
> |
int n; |
995 |
|
|
996 |
< |
if (nunflshed == 0) |
996 |
> |
if (ambfp == NULL) /* no ambient file? */ |
997 |
|
return(0); |
998 |
< |
if (lastpos < 0) /* initializing (locked in initambfile) */ |
999 |
< |
goto syncend; |
487 |
< |
/* gain exclusive access */ |
488 |
< |
aflock(F_WRLCK); |
998 |
> |
/* gain appropriate access */ |
999 |
> |
aflock(nunflshed ? F_WRLCK : F_RDLCK); |
1000 |
|
/* see if file has grown */ |
1001 |
< |
if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0) |
1001 |
> |
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
1002 |
|
goto seekerr; |
1003 |
< |
if (n = flen - lastpos) { /* file has grown */ |
1004 |
< |
if (ambinp == NULL) { /* use duplicate filedes */ |
1005 |
< |
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
1003 |
> |
if ((n = flen - lastpos) > 0) { /* file has grown */ |
1004 |
> |
if (ambinp == NULL) { /* get new file pointer */ |
1005 |
> |
ambinp = fopen(ambfile, "rb"); |
1006 |
|
if (ambinp == NULL) |
1007 |
< |
error(SYSTEM, "fdopen failed in ambsync"); |
1007 |
> |
error(SYSTEM, "fopen failed in ambsync"); |
1008 |
|
} |
1009 |
< |
if (fseek(ambinp, lastpos, 0) < 0) |
1009 |
> |
if (fseek(ambinp, lastpos, SEEK_SET) < 0) |
1010 |
|
goto seekerr; |
1011 |
|
while (n >= AMBVALSIZ) { /* load contributed values */ |
1012 |
< |
readambval(&avs, ambinp); |
1013 |
< |
avinsert(avstore(&avs)); |
1012 |
> |
if (!readambval(&avs, ambinp)) { |
1013 |
> |
sprintf(errmsg, |
1014 |
> |
"ambient file \"%s\" corrupted near character %ld", |
1015 |
> |
ambfile, flen - n); |
1016 |
> |
error(WARNING, errmsg); |
1017 |
> |
break; |
1018 |
> |
} |
1019 |
> |
avstore(&avs); |
1020 |
|
n -= AMBVALSIZ; |
1021 |
|
} |
1022 |
< |
/*** seek always as safety measure |
1023 |
< |
if (n) ***/ /* alignment */ |
1024 |
< |
if (lseek(fileno(ambfp), flen-n, 0) < 0) |
508 |
< |
goto seekerr; |
1022 |
> |
lastpos = flen - n; /* check alignment */ |
1023 |
> |
if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
1024 |
> |
goto seekerr; |
1025 |
|
} |
510 |
– |
#ifdef DEBUG |
511 |
– |
if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) { |
512 |
– |
sprintf(errmsg, "ambient file buffer at %d rather than %d", |
513 |
– |
ambfp->_ptr - ambfp->_base, |
514 |
– |
nunflshed*AMBVALSIZ); |
515 |
– |
error(CONSISTENCY, errmsg); |
516 |
– |
} |
517 |
– |
#endif |
518 |
– |
syncend: |
1026 |
|
n = fflush(ambfp); /* calls write() at last */ |
1027 |
< |
if ((lastpos = lseek(fileno(ambfp), 0L, 1)) < 0) |
521 |
< |
goto seekerr; |
1027 |
> |
lastpos += (long)nunflshed*AMBVALSIZ; |
1028 |
|
aflock(F_UNLCK); /* release file */ |
1029 |
|
nunflshed = 0; |
1030 |
|
return(n); |
1031 |
|
seekerr: |
1032 |
|
error(SYSTEM, "seek failed in ambsync"); |
1033 |
+ |
return(EOF); /* pro forma return */ |
1034 |
|
} |
1035 |
|
|
1036 |
< |
#else |
1036 |
> |
#else /* ! F_SETLKW */ |
1037 |
|
|
1038 |
|
int |
1039 |
< |
ambsync() /* flush ambient file */ |
1039 |
> |
ambsync(void) /* flush ambient file */ |
1040 |
|
{ |
1041 |
< |
if (nunflshed == 0) |
1041 |
> |
if (ambfp == NULL) |
1042 |
|
return(0); |
1043 |
|
nunflshed = 0; |
1044 |
|
return(fflush(ambfp)); |
1045 |
|
} |
1046 |
|
|
1047 |
< |
#endif |
1047 |
> |
#endif /* ! F_SETLKW */ |