1 |
< |
/* Copyright (c) 1993 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1995 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
18 |
|
|
19 |
|
#include "random.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 |
> |
#ifndef AMBVWT |
25 |
> |
#define AMBVWT 250 /* relative ambient value weight (# calcs) */ |
26 |
> |
#endif |
27 |
|
|
28 |
|
typedef struct ambtree { |
29 |
|
AMBVAL *alist; /* ambient value list */ |
32 |
|
|
33 |
|
extern CUBE thescene; /* contains space boundaries */ |
34 |
|
|
35 |
+ |
extern char *shm_boundary; /* memory sharing boundary */ |
36 |
+ |
|
37 |
|
#define MAXASET 511 /* maximum number of elements in ambient set */ |
38 |
|
OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ |
39 |
|
|
45 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
46 |
|
static int nunflshed = 0; /* number of unflushed ambient values */ |
47 |
|
|
48 |
+ |
#ifndef SORT_THRESH |
49 |
+ |
#ifdef BIGMEM |
50 |
+ |
#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) |
51 |
+ |
#else |
52 |
+ |
#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL)) |
53 |
+ |
#endif |
54 |
+ |
#endif |
55 |
+ |
#ifndef SORT_INTVL |
56 |
+ |
#define SORT_INTVL (SORT_THRESH*256) |
57 |
+ |
#endif |
58 |
+ |
#ifndef MAX_SORT_INTVL |
59 |
+ |
#define MAX_SORT_INTVL (SORT_INTVL<<4) |
60 |
+ |
#endif |
61 |
+ |
|
62 |
+ |
static COLOR avsum = BLKCOLOR; /* computed ambient value sum */ |
63 |
+ |
static unsigned int nambvals = 0; /* number of computed ambient values */ |
64 |
+ |
static unsigned long ambclock = 0; /* ambient access clock */ |
65 |
+ |
static unsigned long lastsort = 0; /* time of last value sort */ |
66 |
+ |
static long sortintvl = SORT_INTVL; /* time until next sort */ |
67 |
+ |
|
68 |
+ |
#define MAXACLOCK (1L<<30) /* clock turnover value */ |
69 |
+ |
/* |
70 |
+ |
* Track access times unless we are sharing ambient values |
71 |
+ |
* through memory on a multiprocessor, when we want to avoid |
72 |
+ |
* claiming our own memory (copy on write). |
73 |
+ |
*/ |
74 |
+ |
#define tracktime (shm_boundary == NULL || ambfp == NULL) |
75 |
+ |
|
76 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
77 |
|
|
78 |
|
#define newambval() (AMBVAL *)bmalloc(sizeof(AMBVAL)) |
79 |
|
|
45 |
– |
#define newambtree() (AMBTREE *)calloc(8, sizeof(AMBTREE)) |
46 |
– |
#define freeambtree(t) free((char *)(t)) |
47 |
– |
|
80 |
|
extern long ftell(), lseek(); |
81 |
< |
static int initambfile(), avsave(), avinsert(), loadtree(); |
81 |
> |
static int initambfile(), avsave(), avinsert(), sortambvals(); |
82 |
|
static AMBVAL *avstore(); |
83 |
|
#ifdef F_SETLKW |
84 |
|
static aflock(); |
88 |
|
setambres(ar) /* set ambient resolution */ |
89 |
|
int ar; |
90 |
|
{ |
91 |
< |
ambres = ar; /* may be done already */ |
91 |
> |
ambres = ar < 0 ? 0 : ar; /* may be done already */ |
92 |
|
/* set min & max radii */ |
93 |
|
if (ar <= 0) { |
94 |
< |
minarad = 0.0; |
94 |
> |
minarad = 0; |
95 |
|
maxarad = thescene.cusize / 2.0; |
96 |
|
} else { |
97 |
|
minarad = thescene.cusize / ar; |
98 |
< |
maxarad = 16.0 * minarad; /* heuristic */ |
98 |
> |
maxarad = 64 * minarad; /* heuristic */ |
99 |
|
if (maxarad > thescene.cusize / 2.0) |
100 |
|
maxarad = thescene.cusize / 2.0; |
101 |
|
} |
102 |
< |
if (maxarad <= FTINY) |
103 |
< |
maxarad = .001; |
102 |
> |
if (minarad <= FTINY) |
103 |
> |
minarad = 10*FTINY; |
104 |
> |
if (maxarad <= minarad) |
105 |
> |
maxarad = 64 * minarad; |
106 |
|
} |
107 |
|
|
108 |
|
|
109 |
< |
resetambacc(newa) /* change ambient accuracy setting */ |
109 |
> |
setambacc(newa) /* set ambient accuracy */ |
110 |
|
double newa; |
111 |
|
{ |
112 |
< |
AMBTREE oldatrunk; |
112 |
> |
double ambdiff; |
113 |
|
|
114 |
< |
if (fabs(newa - ambacc) < 0.01) |
115 |
< |
return; /* insignificant -- don't bother */ |
116 |
< |
ambacc = newa; |
117 |
< |
if (ambacc <= FTINY) |
118 |
< |
return; /* cannot build new tree */ |
85 |
< |
/* else need to rebuild tree */ |
86 |
< |
copystruct(&oldatrunk, &atrunk); |
87 |
< |
atrunk.alist = NULL; |
88 |
< |
atrunk.kid = NULL; |
89 |
< |
loadtree(&oldatrunk); |
114 |
> |
if (newa < 0.0) |
115 |
> |
newa = 0.0; |
116 |
> |
ambdiff = fabs(newa - ambacc); |
117 |
> |
if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0) |
118 |
> |
sortambvals(1); /* rebuild tree */ |
119 |
|
} |
120 |
|
|
121 |
|
|
126 |
|
AMBVAL amb; |
127 |
|
/* init ambient limits */ |
128 |
|
setambres(ambres); |
129 |
+ |
setambacc(ambacc); |
130 |
|
if (afile == NULL) |
131 |
|
return; |
132 |
|
if (ambacc <= FTINY) { |
133 |
< |
sprintf(errmsg, "zero ambient accuracy so \"%s\" not loaded", |
133 |
> |
sprintf(errmsg, "zero ambient accuracy so \"%s\" not opened", |
134 |
|
afile); |
135 |
|
error(WARNING, errmsg); |
136 |
|
return; |
140 |
|
initambfile(0); |
141 |
|
headlen = ftell(ambfp); |
142 |
|
while (readambval(&amb, ambfp)) |
143 |
< |
avinsert(avstore(&amb), &atrunk, |
114 |
< |
thescene.cuorg, thescene.cusize); |
143 |
> |
avinsert(avstore(&amb)); |
144 |
|
/* align */ |
145 |
|
fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1); |
146 |
|
} else if ((ambfp = fopen(afile, "w+")) != NULL) |
197 |
|
rdepth++; |
198 |
|
d = doambient(acol, r, r->rweight, NULL, NULL); |
199 |
|
rdepth--; |
200 |
< |
if (d == 0.0) |
200 |
> |
if (d <= FTINY) |
201 |
|
goto dumbamb; |
202 |
|
return; |
203 |
|
} |
204 |
+ |
/* resort memory? */ |
205 |
+ |
sortambvals(0); |
206 |
|
/* get ambient value */ |
207 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
208 |
|
d = sumambient(acol, r, rdepth, |
209 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
210 |
< |
if (d > FTINY) |
210 |
> |
if (d > FTINY) { |
211 |
|
scalecolor(acol, 1.0/d); |
212 |
< |
else { |
182 |
< |
d = makeambient(acol, r, rdepth++); |
183 |
< |
rdepth--; |
212 |
> |
return; |
213 |
|
} |
214 |
+ |
rdepth++; /* need to cache new value */ |
215 |
+ |
d = makeambient(acol, r, rdepth-1); |
216 |
+ |
rdepth--; |
217 |
|
if (d > FTINY) |
218 |
|
return; |
219 |
|
dumbamb: /* return global value */ |
220 |
|
copycolor(acol, ambval); |
221 |
+ |
#if AMBVWT |
222 |
+ |
if (nambvals == 0) |
223 |
+ |
return; |
224 |
+ |
scalecolor(acol, (double)AMBVWT); |
225 |
+ |
addcolor(acol, avsum); /* average in computations */ |
226 |
+ |
d = 1.0/(AMBVWT+nambvals); |
227 |
+ |
scalecolor(acol, d); |
228 |
+ |
#endif |
229 |
|
} |
230 |
|
|
231 |
|
|
244 |
|
int i; |
245 |
|
register int j; |
246 |
|
register AMBVAL *av; |
247 |
< |
/* do this node */ |
247 |
> |
|
248 |
|
wsum = 0.0; |
249 |
+ |
/* do this node */ |
250 |
|
for (av = at->alist; av != NULL; av = av->next) { |
251 |
+ |
if (tracktime) |
252 |
+ |
av->latick = ambclock++; |
253 |
|
/* |
254 |
|
* Ambient level test. |
255 |
|
*/ |
256 |
< |
if (av->lvl > al || av->weight < r->rweight-FTINY) |
256 |
> |
if (av->lvl > al) /* list sorted, so this works */ |
257 |
> |
break; |
258 |
> |
if (av->weight < r->rweight-FTINY) |
259 |
|
continue; |
260 |
|
/* |
261 |
|
* Ambient radius test. |
262 |
|
*/ |
263 |
< |
e1 = 0.0; |
264 |
< |
for (j = 0; j < 3; j++) { |
265 |
< |
d = av->pos[j] - r->rop[j]; |
266 |
< |
e1 += d * d; |
267 |
< |
} |
263 |
> |
d = av->pos[0] - r->rop[0]; |
264 |
> |
e1 = d * d; |
265 |
> |
d = av->pos[1] - r->rop[1]; |
266 |
> |
e1 += d * d; |
267 |
> |
d = av->pos[2] - r->rop[2]; |
268 |
> |
e1 += d * d; |
269 |
|
e1 /= av->rad * av->rad; |
270 |
|
if (e1 > ambacc*ambacc*1.21) |
271 |
|
continue; |
289 |
|
* Jittering final test reduces image artifacts. |
290 |
|
*/ |
291 |
|
wt = sqrt(e1) + sqrt(e2); |
292 |
< |
wt *= .9 + .2*urand(9015+samplendx); |
247 |
< |
if (wt > ambacc) |
292 |
> |
if (wt > ambacc*(.9+.2*urand(9015+samplendx))) |
293 |
|
continue; |
294 |
|
if (wt <= 1e-3) |
295 |
|
wt = 1e3; |
331 |
|
FVECT gp, gd; |
332 |
|
/* compute weight */ |
333 |
|
amb.weight = pow(AVGREFL, (double)al); |
334 |
< |
if (r->rweight < 0.2*amb.weight) /* heuristic */ |
334 |
> |
if (r->rweight < 0.1*amb.weight) /* heuristic */ |
335 |
|
amb.weight = r->rweight; |
336 |
|
/* compute ambient */ |
337 |
|
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
338 |
< |
if (amb.rad == 0.0) |
338 |
> |
if (amb.rad <= FTINY) |
339 |
|
return(0.0); |
340 |
|
/* store it */ |
341 |
|
VCOPY(amb.pos, r->rop); |
388 |
|
#ifdef MSDOS |
389 |
|
setmode(fileno(ambfp), O_BINARY); |
390 |
|
#endif |
391 |
< |
setbuf(ambfp, bmalloc(BUFSIZ)); |
391 |
> |
setbuf(ambfp, bmalloc(BUFSIZ+8)); |
392 |
|
if (creat) { /* new file */ |
393 |
+ |
newheader("RADIANCE", ambfp); |
394 |
|
fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ", |
395 |
|
progname, colval(ambval,RED), |
396 |
|
colval(ambval,GRN), colval(ambval,BLU), |
411 |
|
avsave(av) /* insert and save an ambient value */ |
412 |
|
AMBVAL *av; |
413 |
|
{ |
414 |
< |
avinsert(avstore(av), &atrunk, thescene.cuorg, thescene.cusize); |
414 |
> |
avinsert(avstore(av)); |
415 |
|
if (ambfp == NULL) |
416 |
|
return; |
417 |
|
if (writambval(av, ambfp) < 0) |
434 |
|
if ((av = newambval()) == NULL) |
435 |
|
error(SYSTEM, "out of memory in avstore"); |
436 |
|
copystruct(av, aval); |
437 |
+ |
av->latick = ambclock; |
438 |
+ |
av->next = NULL; |
439 |
+ |
addcolor(avsum, av->val); /* add to sum for averaging */ |
440 |
+ |
nambvals++; |
441 |
|
return(av); |
442 |
|
} |
443 |
|
|
444 |
|
|
445 |
+ |
#define ATALLOCSZ 512 /* #/8 trees to allocate at once */ |
446 |
+ |
|
447 |
+ |
static AMBTREE *atfreelist = NULL; /* free ambient tree structures */ |
448 |
+ |
|
449 |
+ |
|
450 |
|
static |
451 |
< |
avinsert(av, at, c0, s) /* insert ambient value in a tree */ |
451 |
> |
AMBTREE * |
452 |
> |
newambtree() /* allocate 8 ambient tree structs */ |
453 |
> |
{ |
454 |
> |
register AMBTREE *atp, *upperlim; |
455 |
> |
|
456 |
> |
if (atfreelist == NULL) { /* get more nodes */ |
457 |
> |
atfreelist = (AMBTREE *)bmalloc(ATALLOCSZ*8*sizeof(AMBTREE)); |
458 |
> |
if (atfreelist == NULL) |
459 |
> |
return(NULL); |
460 |
> |
/* link new free list */ |
461 |
> |
upperlim = atfreelist + 8*(ATALLOCSZ-1); |
462 |
> |
for (atp = atfreelist; atp < upperlim; atp += 8) |
463 |
> |
atp->kid = atp + 8; |
464 |
> |
atp->kid = NULL; |
465 |
> |
} |
466 |
> |
atp = atfreelist; |
467 |
> |
atfreelist = atp->kid; |
468 |
> |
bzero((char *)atp, 8*sizeof(AMBTREE)); |
469 |
> |
return(atp); |
470 |
> |
} |
471 |
> |
|
472 |
> |
|
473 |
> |
static |
474 |
> |
freeambtree(atp) /* free 8 ambient tree structs */ |
475 |
> |
AMBTREE *atp; |
476 |
> |
{ |
477 |
> |
atp->kid = atfreelist; |
478 |
> |
atfreelist = atp; |
479 |
> |
} |
480 |
> |
|
481 |
> |
|
482 |
> |
static |
483 |
> |
avinsert(av) /* insert ambient value in our tree */ |
484 |
|
register AMBVAL *av; |
398 |
– |
register AMBTREE *at; |
399 |
– |
FVECT c0; |
400 |
– |
double s; |
485 |
|
{ |
486 |
+ |
register AMBTREE *at; |
487 |
+ |
register AMBVAL *ap; |
488 |
+ |
AMBVAL avh; |
489 |
|
FVECT ck0; |
490 |
+ |
double s; |
491 |
|
int branch; |
492 |
|
register int i; |
493 |
|
|
494 |
|
if (av->rad <= FTINY) |
495 |
|
error(CONSISTENCY, "zero ambient radius in avinsert"); |
496 |
< |
VCOPY(ck0, c0); |
496 |
> |
at = &atrunk; |
497 |
> |
VCOPY(ck0, thescene.cuorg); |
498 |
> |
s = thescene.cusize; |
499 |
|
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
500 |
|
if (at->kid == NULL) |
501 |
|
if ((at->kid = newambtree()) == NULL) |
509 |
|
} |
510 |
|
at = at->kid + branch; |
511 |
|
} |
512 |
< |
av->next = at->alist; |
513 |
< |
at->alist = av; |
512 |
> |
avh.next = at->alist; /* order by increasing level */ |
513 |
> |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
514 |
> |
if (ap->next->lvl >= av->lvl) |
515 |
> |
break; |
516 |
> |
av->next = ap->next; |
517 |
> |
ap->next = av; |
518 |
> |
at->alist = avh.next; |
519 |
|
} |
520 |
|
|
521 |
|
|
522 |
|
static |
523 |
< |
loadtree(at) /* move tree to main store */ |
523 |
> |
unloadatree(at, f) /* unload an ambient value tree */ |
524 |
|
register AMBTREE *at; |
525 |
+ |
int (*f)(); |
526 |
|
{ |
527 |
|
register AMBVAL *av; |
528 |
|
register int i; |
529 |
|
/* transfer values at this node */ |
530 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
531 |
|
at->alist = av->next; |
532 |
< |
avinsert(av, &atrunk, thescene.cuorg, thescene.cusize); |
532 |
> |
(*f)(av); |
533 |
|
} |
534 |
+ |
if (at->kid == NULL) |
535 |
+ |
return; |
536 |
|
for (i = 0; i < 8; i++) /* transfer and free children */ |
537 |
< |
loadtree(at->kid+i); |
537 |
> |
unloadatree(at->kid+i, f); |
538 |
|
freeambtree(at->kid); |
539 |
+ |
at->kid = NULL; |
540 |
|
} |
541 |
|
|
542 |
|
|
543 |
+ |
static AMBVAL **avlist1, **avlist2; /* ambient value lists for sorting */ |
544 |
+ |
static int i_avlist; /* index for lists */ |
545 |
+ |
|
546 |
+ |
|
547 |
+ |
static |
548 |
+ |
av2list(av) |
549 |
+ |
AMBVAL *av; |
550 |
+ |
{ |
551 |
+ |
#ifdef DEBUG |
552 |
+ |
if (i_avlist >= nambvals) |
553 |
+ |
error(CONSISTENCY, "too many ambient values in av2list1"); |
554 |
+ |
#endif |
555 |
+ |
avlist1[i_avlist] = avlist2[i_avlist] = av; |
556 |
+ |
i_avlist++; |
557 |
+ |
} |
558 |
+ |
|
559 |
+ |
|
560 |
+ |
static int |
561 |
+ |
alatcmp(avp1, avp2) /* compare ambient values for MRA */ |
562 |
+ |
AMBVAL **avp1, **avp2; |
563 |
+ |
{ |
564 |
+ |
return((**avp2).latick - (**avp1).latick); |
565 |
+ |
} |
566 |
+ |
|
567 |
+ |
|
568 |
+ |
static int |
569 |
+ |
aposcmp(avp1, avp2) /* compare ambient value positions */ |
570 |
+ |
AMBVAL **avp1, **avp2; |
571 |
+ |
{ |
572 |
+ |
return(*avp1 - *avp2); |
573 |
+ |
} |
574 |
+ |
|
575 |
+ |
|
576 |
+ |
#ifdef DEBUG |
577 |
+ |
static int |
578 |
+ |
avlmemi(avaddr) /* find list position from address */ |
579 |
+ |
AMBVAL *avaddr; |
580 |
+ |
{ |
581 |
+ |
register AMBVAL **avlpp; |
582 |
+ |
|
583 |
+ |
avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, |
584 |
+ |
nambvals, sizeof(AMBVAL *), aposcmp); |
585 |
+ |
if (avlpp == NULL) |
586 |
+ |
error(CONSISTENCY, "address not found in avlmemi"); |
587 |
+ |
return(avlpp - avlist2); |
588 |
+ |
} |
589 |
+ |
#else |
590 |
+ |
#define avlmemi(avaddr) ((AMBVAL **)bsearch((char *)&avaddr,(char *)avlist2, \ |
591 |
+ |
nambvals,sizeof(AMBVAL *),aposcmp) - avlist2) |
592 |
+ |
#endif |
593 |
+ |
|
594 |
+ |
|
595 |
+ |
static |
596 |
+ |
sortambvals(always) /* resort ambient values */ |
597 |
+ |
int always; |
598 |
+ |
{ |
599 |
+ |
AMBTREE oldatrunk; |
600 |
+ |
AMBVAL tav, *tap, *pnext; |
601 |
+ |
register int i, j; |
602 |
+ |
/* see if it's time yet */ |
603 |
+ |
if (!always && (ambclock < lastsort+sortintvl || |
604 |
+ |
nambvals < SORT_THRESH)) |
605 |
+ |
return; |
606 |
+ |
/* |
607 |
+ |
* The idea here is to minimize memory thrashing |
608 |
+ |
* in VM systems by improving reference locality. |
609 |
+ |
* We do this by periodically sorting our stored ambient |
610 |
+ |
* values in memory in order of most recently to least |
611 |
+ |
* recently accessed. This ordering was chosen so that new |
612 |
+ |
* ambient values (which tend to be less important) go into |
613 |
+ |
* higher memory with the infrequently accessed values. |
614 |
+ |
* Since we expect our values to need sorting less |
615 |
+ |
* frequently as the process continues, we double our |
616 |
+ |
* waiting interval after each call. |
617 |
+ |
* This routine is also called by setambacc() with |
618 |
+ |
* the "always" parameter set to 1 so that the ambient |
619 |
+ |
* tree will be rebuilt with the new accuracy parameter. |
620 |
+ |
*/ |
621 |
+ |
if (tracktime) { /* allocate pointer arrays to sort */ |
622 |
+ |
avlist1 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
623 |
+ |
avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
624 |
+ |
} else |
625 |
+ |
avlist1 = avlist2 = NULL; |
626 |
+ |
if (avlist2 == NULL) { /* no time tracking -- rebuild tree? */ |
627 |
+ |
if (avlist1 != NULL) |
628 |
+ |
free((char *)avlist1); |
629 |
+ |
if (always) { /* rebuild without sorting */ |
630 |
+ |
copystruct(&oldatrunk, &atrunk); |
631 |
+ |
atrunk.alist = NULL; |
632 |
+ |
atrunk.kid = NULL; |
633 |
+ |
unloadatree(&oldatrunk, avinsert); |
634 |
+ |
} |
635 |
+ |
} else { /* sort memory by last access time */ |
636 |
+ |
/* |
637 |
+ |
* Sorting memory is tricky because it isn't contiguous. |
638 |
+ |
* We have to sort an array of pointers by MRA and also |
639 |
+ |
* by memory position. We then copy values in "loops" |
640 |
+ |
* to minimize memory hits. Nevertheless, we will visit |
641 |
+ |
* everyone at least twice, and this is an expensive process |
642 |
+ |
* when we're thrashing, which is when we need to do it. |
643 |
+ |
*/ |
644 |
+ |
#ifdef DEBUG |
645 |
+ |
sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...", |
646 |
+ |
nambvals, ambclock); |
647 |
+ |
eputs(errmsg); |
648 |
+ |
#endif |
649 |
+ |
i_avlist = 0; |
650 |
+ |
unloadatree(&atrunk, av2list); /* empty current tree */ |
651 |
+ |
#ifdef DEBUG |
652 |
+ |
if (i_avlist < nambvals) |
653 |
+ |
error(CONSISTENCY, "missing ambient values in sortambvals"); |
654 |
+ |
#endif |
655 |
+ |
qsort((char *)avlist1, nambvals, sizeof(AMBVAL *), alatcmp); |
656 |
+ |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
657 |
+ |
for (i = 0; i < nambvals; i++) { |
658 |
+ |
if (avlist1[i] == NULL) |
659 |
+ |
continue; |
660 |
+ |
tap = avlist2[i]; |
661 |
+ |
copystruct(&tav, tap); |
662 |
+ |
for (j = i; (pnext = avlist1[j]) != tap; |
663 |
+ |
j = avlmemi(pnext)) { |
664 |
+ |
copystruct(avlist2[j], pnext); |
665 |
+ |
avinsert(avlist2[j]); |
666 |
+ |
avlist1[j] = NULL; |
667 |
+ |
} |
668 |
+ |
copystruct(avlist2[j], &tav); |
669 |
+ |
avinsert(avlist2[j]); |
670 |
+ |
avlist1[j] = NULL; |
671 |
+ |
} |
672 |
+ |
free((char *)avlist1); |
673 |
+ |
free((char *)avlist2); |
674 |
+ |
/* compute new sort interval */ |
675 |
+ |
sortintvl = ambclock - lastsort; |
676 |
+ |
if (sortintvl >= MAX_SORT_INTVL/2) |
677 |
+ |
sortintvl = MAX_SORT_INTVL; |
678 |
+ |
else |
679 |
+ |
sortintvl <<= 1; /* wait twice as long next */ |
680 |
+ |
#ifdef DEBUG |
681 |
+ |
eputs("done\n"); |
682 |
+ |
#endif |
683 |
+ |
} |
684 |
+ |
if (ambclock >= MAXACLOCK) |
685 |
+ |
ambclock = MAXACLOCK/2; |
686 |
+ |
lastsort = ambclock; |
687 |
+ |
} |
688 |
+ |
|
689 |
+ |
|
690 |
|
#ifdef F_SETLKW |
691 |
|
|
692 |
|
static |
718 |
|
aflock(F_WRLCK); |
719 |
|
/* see if file has grown */ |
720 |
|
if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0) |
721 |
< |
error(SYSTEM, "cannot seek on ambient file"); |
721 |
> |
goto seekerr; |
722 |
|
if (n = flen - lastpos) { /* file has grown */ |
723 |
|
if (ambinp == NULL) { /* use duplicate filedes */ |
724 |
|
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
726 |
|
error(SYSTEM, "fdopen failed in ambsync"); |
727 |
|
} |
728 |
|
if (fseek(ambinp, lastpos, 0) < 0) |
729 |
< |
error(SYSTEM, "fseek failed in ambsync"); |
729 |
> |
goto seekerr; |
730 |
|
while (n >= AMBVALSIZ) { /* load contributed values */ |
731 |
|
readambval(&avs, ambinp); |
732 |
< |
avinsert(avstore(&avs), &atrunk, |
487 |
< |
thescene.cuorg, thescene.cusize); |
732 |
> |
avinsert(avstore(&avs)); |
733 |
|
n -= AMBVALSIZ; |
734 |
|
} |
735 |
< |
if (n) /* alignment */ |
736 |
< |
lseek(fileno(ambfp), flen-n, 0); |
735 |
> |
/*** seek always as safety measure |
736 |
> |
if (n) ***/ /* alignment */ |
737 |
> |
if (lseek(fileno(ambfp), flen-n, 0) < 0) |
738 |
> |
goto seekerr; |
739 |
|
} |
740 |
+ |
#ifdef DEBUG |
741 |
+ |
if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) { |
742 |
+ |
sprintf(errmsg, "ambient file buffer at %d rather than %d", |
743 |
+ |
ambfp->_ptr - ambfp->_base, |
744 |
+ |
nunflshed*AMBVALSIZ); |
745 |
+ |
error(CONSISTENCY, errmsg); |
746 |
+ |
} |
747 |
+ |
#endif |
748 |
|
syncend: |
749 |
|
n = fflush(ambfp); /* calls write() at last */ |
750 |
< |
lastpos = lseek(fileno(ambfp), 0L, 1); |
750 |
> |
if ((lastpos = lseek(fileno(ambfp), 0L, 1)) < 0) |
751 |
> |
goto seekerr; |
752 |
|
aflock(F_UNLCK); /* release file */ |
753 |
|
nunflshed = 0; |
754 |
|
return(n); |
755 |
+ |
seekerr: |
756 |
+ |
error(SYSTEM, "seek failed in ambsync"); |
757 |
|
} |
758 |
|
|
759 |
|
#else |