| 22 |
|
#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ |
| 23 |
|
#endif |
| 24 |
|
|
| 25 |
– |
extern char *shm_boundary; /* memory sharing boundary */ |
| 26 |
– |
|
| 25 |
|
#ifndef MAXASET |
| 26 |
|
#define MAXASET 4095 /* maximum number of elements in ambient set */ |
| 27 |
|
#endif |
| 35 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
| 36 |
|
static int nunflshed = 0; /* number of unflushed ambient values */ |
| 37 |
|
|
| 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 |
– |
|
| 38 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
| 39 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
| 40 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
| 41 |
|
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 */ |
| 42 |
|
static FILE *ambinp = NULL; /* auxiliary file for input */ |
| 43 |
|
static long lastpos = -1; /* last flush position */ |
| 44 |
|
|
| 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 |
– |
|
| 45 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
| 46 |
|
|
| 47 |
< |
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
| 47 |
> |
#define AVSIZE (sizeof(AMBVAL)-sizeof(SCOLOR)+sizeof(COLORV)*NCSAMP) |
| 48 |
> |
#define newambval() (AMBVAL *)malloc(AVSIZE) |
| 49 |
|
|
| 50 |
< |
#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) |
| 50 |
> |
#define tfunc(x0, x, x1) (((x)-(x0))/((x1)-(x0))) |
| 51 |
|
|
| 52 |
< |
static void initambfile(int creat); |
| 52 |
> |
static void initambfile(int cre8); |
| 53 |
|
static void avsave(AMBVAL *av); |
| 54 |
|
static AMBVAL *avstore(AMBVAL *aval); |
| 55 |
|
static AMBTREE *newambtree(void); |
| 57 |
|
|
| 58 |
|
typedef void unloadtf_t(AMBVAL *); |
| 59 |
|
static unloadtf_t avinsert; |
| 91 |
– |
static unloadtf_t av2list; |
| 60 |
|
static unloadtf_t avfree; |
| 61 |
|
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
| 62 |
|
|
| 63 |
< |
static int aposcmp(const void *avp1, const void *avp2); |
| 96 |
< |
static int avlmemi(AMBVAL *avaddr); |
| 97 |
< |
static void sortambvals(int always); |
| 63 |
> |
static void sortambvals(void); |
| 64 |
|
|
| 65 |
|
static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang); |
| 66 |
< |
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
| 66 |
> |
static double sumambient(SCOLOR acol, RAY *r, FVECT rn, int al, |
| 67 |
|
AMBTREE *at, FVECT c0, double s); |
| 68 |
< |
static int makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
| 69 |
< |
static int extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
| 68 |
> |
static int makeambient(SCOLOR acol, RAY *r, FVECT rn, int al); |
| 69 |
> |
static int extambient(SCOLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
| 70 |
|
FVECT uvw[3]); |
| 71 |
|
|
| 72 |
|
#ifdef F_SETLKW |
| 108 |
|
if (fabs(newa - olda) >= .05*(newa + olda)) { |
| 109 |
|
ambacc = newa; |
| 110 |
|
if (ambacc > FTINY && nambvals > 0) |
| 111 |
< |
sortambvals(1); /* rebuild tree */ |
| 111 |
> |
sortambvals(); /* rebuild tree */ |
| 112 |
|
} |
| 113 |
|
} |
| 114 |
|
|
| 195 |
|
navsum = 0; |
| 196 |
|
nambvals = 0; |
| 197 |
|
nambshare = 0; |
| 232 |
– |
ambclock = 0; |
| 233 |
– |
lastsort = 0; |
| 234 |
– |
sortintvl = SORT_INTVL; |
| 198 |
|
} |
| 199 |
|
|
| 200 |
|
|
| 230 |
|
|
| 231 |
|
void |
| 232 |
|
multambient( /* compute ambient component & multiply by coef. */ |
| 233 |
< |
COLOR aval, |
| 233 |
> |
SCOLOR aval, |
| 234 |
|
RAY *r, |
| 235 |
|
FVECT nrm |
| 236 |
|
) |
| 237 |
|
{ |
| 238 |
+ |
static double logAvgAbsorp = 1; |
| 239 |
|
static int rdepth = 0; /* ambient recursion */ |
| 240 |
< |
COLOR acol, caustic; |
| 240 |
> |
SCOLOR acol, caustic; |
| 241 |
|
int i, ok; |
| 242 |
|
double d, l; |
| 243 |
|
|
| 247 |
|
if (ambPmap(aval, r, rdepth)) |
| 248 |
|
return; |
| 249 |
|
|
| 250 |
+ |
if (logAvgAbsorp > 0) /* exclude in -aw to avoid growth */ |
| 251 |
+ |
logAvgAbsorp = log(1.-AVGREFL); |
| 252 |
+ |
|
| 253 |
|
/* PMAP: Factor in specular-diffuse ambient (caustics) from photon |
| 254 |
|
* map, if enabled and ray is primary, else caustic is zero. Continue |
| 255 |
|
* with RADIANCE ambient calculation */ |
| 256 |
< |
copycolor(caustic, aval); |
| 257 |
< |
ambPmapCaustic(caustic, r, rdepth); |
| 258 |
< |
|
| 256 |
> |
{/* XXX TEMPORARY */ |
| 257 |
> |
COLOR pmc; |
| 258 |
> |
scolor_color(pmc, aval); |
| 259 |
> |
ambPmapCaustic(pmc, r, rdepth); |
| 260 |
> |
setscolor(caustic, colval(pmc,RED), colval(pmc,GRN), colval(pmc,BLU)); |
| 261 |
> |
} |
| 262 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
| 263 |
|
goto dumbamb; |
| 264 |
|
/* check number of bounces */ |
| 275 |
|
|
| 276 |
|
if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999) |
| 277 |
|
dgp = dgrad; /* compute rotational grad. */ |
| 278 |
< |
copycolor(acol, aval); |
| 278 |
> |
copyscolor(acol, aval); |
| 279 |
|
rdepth++; |
| 280 |
|
ok = doambient(acol, r, r->rweight, |
| 281 |
|
uvd, NULL, NULL, dgp, NULL); |
| 289 |
|
for (i = 3; i--; ) |
| 290 |
|
d += v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
| 291 |
|
if (d >= 0.05) |
| 292 |
< |
scalecolor(acol, d); |
| 292 |
> |
scalescolor(acol, d); |
| 293 |
|
} |
| 294 |
< |
copycolor(aval, acol); |
| 294 |
> |
copyscolor(aval, acol); |
| 295 |
|
|
| 296 |
|
/* PMAP: add in caustic */ |
| 297 |
< |
addcolor(aval, caustic); |
| 297 |
> |
saddscolor(aval, caustic); |
| 298 |
|
return; |
| 299 |
|
} |
| 330 |
– |
|
| 331 |
– |
if (tracktime) /* sort to minimize thrashing */ |
| 332 |
– |
sortambvals(0); |
| 300 |
|
/* interpolate ambient value */ |
| 301 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
| 301 |
> |
scolorblack(acol); |
| 302 |
|
d = sumambient(acol, r, nrm, rdepth, |
| 303 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
| 304 |
|
|
| 305 |
|
if (d > FTINY) { |
| 306 |
< |
d = 1.0/d; |
| 307 |
< |
scalecolor(acol, d); |
| 341 |
< |
multcolor(aval, acol); |
| 306 |
> |
scalescolor(acol, 1.0/d); |
| 307 |
> |
smultscolor(aval, acol); |
| 308 |
|
|
| 309 |
|
/* PMAP: add in caustic */ |
| 310 |
< |
addcolor(aval, caustic); |
| 310 |
> |
saddscolor(aval, caustic); |
| 311 |
|
return; |
| 312 |
|
} |
| 313 |
|
|
| 316 |
|
rdepth--; |
| 317 |
|
|
| 318 |
|
if (ok) { |
| 319 |
< |
multcolor(aval, acol); /* computed new value */ |
| 319 |
> |
smultscolor(aval, acol); /* computed new value */ |
| 320 |
|
|
| 321 |
|
/* PMAP: add in caustic */ |
| 322 |
< |
addcolor(aval, caustic); |
| 322 |
> |
saddscolor(aval, caustic); |
| 323 |
|
return; |
| 324 |
|
} |
| 325 |
|
|
| 326 |
|
dumbamb: /* return global value */ |
| 327 |
|
if ((ambvwt <= 0) | (navsum == 0)) { |
| 328 |
< |
multcolor(aval, ambval); |
| 328 |
> |
smultcolor(aval, ambval); |
| 329 |
|
|
| 330 |
|
/* PMAP: add in caustic */ |
| 331 |
< |
addcolor(aval, caustic); |
| 331 |
> |
saddscolor(aval, caustic); |
| 332 |
|
return; |
| 333 |
|
} |
| 334 |
|
|
| 335 |
|
l = bright(ambval); /* average in computations */ |
| 336 |
|
if (l > FTINY) { |
| 337 |
< |
d = (log(l)*(double)ambvwt + avsum) / |
| 337 |
> |
d = (log(l)*(double)ambvwt + avsum + logAvgAbsorp*navsum) / |
| 338 |
|
(double)(ambvwt + navsum); |
| 339 |
|
d = exp(d) / l; |
| 340 |
< |
scalecolor(aval, d); |
| 341 |
< |
multcolor(aval, ambval); /* apply color of ambval */ |
| 340 |
> |
scalescolor(aval, d); |
| 341 |
> |
smultcolor(aval, ambval); /* apply color of ambval */ |
| 342 |
|
} else { |
| 343 |
< |
d = exp( avsum / (double)navsum ); |
| 344 |
< |
scalecolor(aval, d); /* neutral color */ |
| 343 |
> |
d = exp( avsum/(double)navsum + logAvgAbsorp ); |
| 344 |
> |
scalescolor(aval, d); /* neutral color */ |
| 345 |
|
} |
| 346 |
|
} |
| 347 |
|
|
| 394 |
|
|
| 395 |
|
static double |
| 396 |
|
sumambient( /* get interpolated ambient value */ |
| 397 |
< |
COLOR acol, |
| 397 |
> |
SCOLOR acol, |
| 398 |
|
RAY *r, |
| 399 |
|
FVECT rn, |
| 400 |
|
int al, |
| 427 |
|
at->kid+i, ck0, s); |
| 428 |
|
} |
| 429 |
|
/* good enough? */ |
| 430 |
< |
if (wsum >= 0.05 && s > minarad*10.0) |
| 430 |
> |
if ((wsum >= 0.05) & (s*ambacc > minarad)) |
| 431 |
|
return(wsum); |
| 432 |
|
} |
| 433 |
|
/* adjust maximum angle */ |
| 436 |
|
/* sum this node */ |
| 437 |
|
for (av = at->alist; av != NULL; av = av->next) { |
| 438 |
|
double u, v, d, delta_r2, delta_t2; |
| 439 |
< |
COLOR ct; |
| 439 |
> |
SCOLOR sct; |
| 440 |
|
FVECT uvw[3]; |
| 475 |
– |
/* record access */ |
| 476 |
– |
if (tracktime) |
| 477 |
– |
av->latick = ambclock; |
| 441 |
|
/* |
| 442 |
|
* Ambient level test |
| 443 |
|
*/ |
| 459 |
|
*/ |
| 460 |
|
VSUB(ck0, r->rop, av->pos); |
| 461 |
|
d = DOT(ck0, uvw[2]); |
| 462 |
< |
if (d < -minarad*ambacc-.001) |
| 462 |
> |
if (d < -minarad*ambacc) |
| 463 |
|
continue; |
| 464 |
|
d /= av->rad[0]; |
| 465 |
|
delta_t2 = d*d; |
| 484 |
|
/* |
| 485 |
|
* Extrapolate value and compute final weight (hat function) |
| 486 |
|
*/ |
| 487 |
< |
if (!extambient(ct, av, r->rop, rn, uvw)) |
| 487 |
> |
if (!extambient(sct, av, r->rop, rn, uvw)) |
| 488 |
|
continue; |
| 489 |
|
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
| 490 |
|
tfunc(ambacc, sqrt(delta_t2), 0.0); |
| 491 |
< |
scalecolor(ct, d); |
| 492 |
< |
addcolor(acol, ct); |
| 491 |
> |
scalescolor(sct, d); |
| 492 |
> |
saddscolor(acol, sct); |
| 493 |
|
wsum += d; |
| 494 |
|
} |
| 495 |
|
return(wsum); |
| 498 |
|
|
| 499 |
|
static int |
| 500 |
|
makeambient( /* make a new ambient value for storage */ |
| 501 |
< |
COLOR acol, |
| 501 |
> |
SCOLOR acol, |
| 502 |
|
RAY *r, |
| 503 |
|
FVECT rn, |
| 504 |
|
int al |
| 513 |
|
amb.weight *= AVGREFL; |
| 514 |
|
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
| 515 |
|
amb.weight = 1.25*r->rweight; |
| 516 |
< |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
| 516 |
> |
setscolor(acol, AVGREFL, AVGREFL, AVGREFL); |
| 517 |
|
/* compute ambient */ |
| 518 |
|
i = doambient(acol, r, amb.weight, |
| 519 |
|
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
| 520 |
< |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
| 520 |
> |
scalescolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
| 521 |
|
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
| 522 |
|
return(i); |
| 523 |
|
/* store value */ |
| 525 |
|
amb.ndir = encodedir(r->ron); |
| 526 |
|
amb.udir = encodedir(uvw[0]); |
| 527 |
|
amb.lvl = al; |
| 528 |
< |
copycolor(amb.val, acol); |
| 528 |
> |
copyscolor(amb.val, acol); |
| 529 |
|
/* insert into tree */ |
| 530 |
|
avsave(&amb); /* and save to file */ |
| 531 |
|
if (rn != r->ron) { /* texture */ |
| 538 |
|
|
| 539 |
|
static int |
| 540 |
|
extambient( /* extrapolate value at pv, nv */ |
| 541 |
< |
COLOR cr, |
| 541 |
> |
SCOLOR scr, |
| 542 |
|
AMBVAL *ap, |
| 543 |
|
FVECT pv, |
| 544 |
|
FVECT nv, |
| 546 |
|
) |
| 547 |
|
{ |
| 548 |
|
const double min_d = 0.05; |
| 549 |
+ |
const double max_d = 20.; |
| 550 |
|
static FVECT my_uvw[3]; |
| 551 |
|
FVECT v1; |
| 552 |
|
int i; |
| 566 |
|
for (i = 3; i--; ) |
| 567 |
|
d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); |
| 568 |
|
|
| 569 |
< |
if (d < min_d) /* should not use if we can avoid it */ |
| 569 |
> |
if (d < min_d) /* clamp min/max scaling */ |
| 570 |
|
d = min_d; |
| 571 |
< |
copycolor(cr, ap->val); |
| 572 |
< |
scalecolor(cr, d); |
| 571 |
> |
else if (d > max_d) |
| 572 |
> |
d = max_d; |
| 573 |
> |
copyscolor(scr, ap->val); |
| 574 |
> |
scalescolor(scr, d); |
| 575 |
|
return(d > min_d); |
| 576 |
|
} |
| 577 |
|
|
| 634 |
|
if (mybuf == NULL) |
| 635 |
|
mybuf = (char *)bmalloc(BUFSIZ+8); |
| 636 |
|
setbuf(ambfp, mybuf); |
| 637 |
+ |
retry: |
| 638 |
|
if (cre8) { /* new file */ |
| 639 |
|
newheader("RADIANCE", ambfp); |
| 640 |
|
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
| 643 |
|
ambvwt, ambounce, ambacc); |
| 644 |
|
fprintf(ambfp, "-ad %d -as %d -ar %d ", |
| 645 |
|
ambdiv, ambssamp, ambres); |
| 646 |
+ |
fprintf(ambfp, "-dr %d -ds %g -dt %g -dc %g ", directrelay, |
| 647 |
+ |
srcsizerat, shadthresh, shadcert); |
| 648 |
+ |
fprintf(ambfp, "-ss %g -st %g -lr %d -lw %g ", specjitter, |
| 649 |
+ |
specthresh, maxdepth, minweight); |
| 650 |
+ |
fprintf(ambfp, "-cw %g %g -cs %d ", WLPART[3], WLPART[0], NCSAMP); |
| 651 |
|
if (octname != NULL) |
| 652 |
|
fputs(octname, ambfp); |
| 653 |
< |
fputc('\n', ambfp); |
| 653 |
> |
fputc('\n', ambfp); /* end of command line, not header! */ |
| 654 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
| 655 |
|
fputnow(ambfp); |
| 656 |
+ |
AMB_CNDX = CNDX; /* use current spectral sampling */ |
| 657 |
+ |
AMB_WLPART = WLPART; |
| 658 |
+ |
fputwlsplit(WLPART, ambfp); |
| 659 |
+ |
fputncomp(NCSAMP, ambfp); |
| 660 |
|
fputformat(AMBFMT, ambfp); |
| 661 |
|
fputc('\n', ambfp); |
| 662 |
|
putambmagic(ambfp); |
| 663 |
< |
} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) |
| 664 |
< |
error(USER, "bad ambient file"); |
| 663 |
> |
} else if (getheader(ambfp, amb_headline, NULL) < 0 || !hasambmagic(ambfp)) { |
| 664 |
> |
#ifndef F_SETLKW |
| 665 |
> |
static int ntries = 0; |
| 666 |
> |
if (++ntries < 4 && ftell(ambfp) == 0) { |
| 667 |
> |
sleep(2); |
| 668 |
> |
goto retry; |
| 669 |
> |
} |
| 670 |
> |
#endif |
| 671 |
> |
error(USER, "bad/incompatible ambient file"); |
| 672 |
> |
} |
| 673 |
> |
if ((AMB_CNDX != CNDX) | (AMB_WLPART != WLPART)) { |
| 674 |
> |
if (setspectrsamp(AMB_CNDX, AMB_WLPART) < 0) |
| 675 |
> |
error(USER, "bad wavelength sampling in ambient file"); |
| 676 |
> |
if (AMB_CNDX[3] == CNDX[3] && FABSEQ(AMB_WLPART[0],WLPART[0]) && |
| 677 |
> |
FABSEQ(AMB_WLPART[3],WLPART[3])) { |
| 678 |
> |
AMB_CNDX = CNDX; |
| 679 |
> |
AMB_WLPART = WLPART; /* just the same */ |
| 680 |
> |
} else |
| 681 |
> |
error(WARNING, "different ambient file wavelength sampling"); |
| 682 |
> |
} |
| 683 |
|
} |
| 684 |
|
|
| 685 |
|
|
| 712 |
|
|
| 713 |
|
if ((av = newambval()) == NULL) |
| 714 |
|
error(SYSTEM, "out of memory in avstore"); |
| 715 |
< |
*av = *aval; |
| 722 |
< |
av->latick = ambclock; |
| 715 |
> |
memcpy(av, aval, AVSIZE); /* AVSIZE <= sizeof(AMBVAL) */ |
| 716 |
|
av->next = NULL; |
| 717 |
|
nambvals++; |
| 718 |
< |
d = bright(av->val); |
| 718 |
> |
d = pbright(av->val); |
| 719 |
|
if (d > FTINY) { /* add to log sum for averaging */ |
| 720 |
|
avsum += log(d); |
| 721 |
|
navsum++; |
| 785 |
|
} |
| 786 |
|
|
| 787 |
|
|
| 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 |
– |
|
| 788 |
|
static void |
| 789 |
|
avfree(AMBVAL *av) |
| 790 |
|
{ |
| 791 |
|
free(av); |
| 792 |
|
} |
| 793 |
|
|
| 794 |
+ |
|
| 795 |
|
static void |
| 796 |
< |
av2list( |
| 812 |
< |
AMBVAL *av |
| 813 |
< |
) |
| 796 |
> |
sortambvals(void) /* resort ambient values */ |
| 797 |
|
{ |
| 798 |
< |
#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 |
< |
} |
| 798 |
> |
AMBTREE oldatrunk = atrunk; |
| 799 |
|
|
| 800 |
< |
|
| 801 |
< |
static int |
| 802 |
< |
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); |
| 800 |
> |
atrunk.alist = NULL; |
| 801 |
> |
atrunk.kid = NULL; |
| 802 |
> |
unloadatree(&oldatrunk, avinsert); |
| 803 |
|
} |
| 804 |
|
|
| 805 |
|
|
| 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 |
– |
|
| 806 |
|
#ifdef F_SETLKW |
| 807 |
|
|
| 808 |
|
static void |
| 814 |
|
|
| 815 |
|
if (typ == fls.l_type) /* already called? */ |
| 816 |
|
return; |
| 817 |
+ |
|
| 818 |
|
fls.l_type = typ; |
| 819 |
< |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) |
| 820 |
< |
error(SYSTEM, "cannot (un)lock ambient file"); |
| 819 |
> |
do |
| 820 |
> |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1) |
| 821 |
> |
return; |
| 822 |
> |
while (errno == EINTR); |
| 823 |
> |
|
| 824 |
> |
error(SYSTEM, "cannot (un)lock ambient file"); |
| 825 |
|
} |
| 826 |
|
|
| 827 |
|
|
