7 |
|
* Declarations of external symbols in ambient.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
/* ==================================================================== |
11 |
< |
* The Radiance Software License, Version 1.0 |
12 |
< |
* |
13 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
14 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
15 |
< |
* |
16 |
< |
* Redistribution and use in source and binary forms, with or without |
17 |
< |
* modification, are permitted provided that the following conditions |
18 |
< |
* are met: |
19 |
< |
* |
20 |
< |
* 1. Redistributions of source code must retain the above copyright |
21 |
< |
* notice, this list of conditions and the following disclaimer. |
22 |
< |
* |
23 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
24 |
< |
* notice, this list of conditions and the following disclaimer in |
25 |
< |
* the documentation and/or other materials provided with the |
26 |
< |
* distribution. |
27 |
< |
* |
28 |
< |
* 3. The end-user documentation included with the redistribution, |
29 |
< |
* if any, must include the following acknowledgment: |
30 |
< |
* "This product includes Radiance software |
31 |
< |
* (http://radsite.lbl.gov/) |
32 |
< |
* developed by the Lawrence Berkeley National Laboratory |
33 |
< |
* (http://www.lbl.gov/)." |
34 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
35 |
< |
* if and wherever such third-party acknowledgments normally appear. |
36 |
< |
* |
37 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
38 |
< |
* and "The Regents of the University of California" must |
39 |
< |
* not be used to endorse or promote products derived from this |
40 |
< |
* software without prior written permission. For written |
41 |
< |
* permission, please contact [email protected]. |
42 |
< |
* |
43 |
< |
* 5. Products derived from this software may not be called "Radiance", |
44 |
< |
* nor may "Radiance" appear in their name, without prior written |
45 |
< |
* permission of Lawrence Berkeley National Laboratory. |
46 |
< |
* |
47 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
48 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
49 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
50 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
51 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
52 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
53 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
54 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
55 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
56 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
57 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
58 |
< |
* SUCH DAMAGE. |
59 |
< |
* ==================================================================== |
60 |
< |
* |
61 |
< |
* This software consists of voluntary contributions made by many |
62 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
63 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
64 |
< |
* <http://www.lbl.gov/>. |
65 |
< |
*/ |
10 |
> |
#include "copyright.h" |
11 |
|
|
12 |
< |
#include "ray.h" |
12 |
> |
#include <string.h> |
13 |
|
|
14 |
+ |
#include "platform.h" |
15 |
+ |
#include "ray.h" |
16 |
|
#include "otypes.h" |
17 |
< |
|
17 |
> |
#include "resolu.h" |
18 |
|
#include "ambient.h" |
72 |
– |
|
19 |
|
#include "random.h" |
20 |
|
|
21 |
|
#ifndef OCTSCALE |
24 |
|
|
25 |
|
extern char *shm_boundary; /* memory sharing boundary */ |
26 |
|
|
27 |
< |
#define MAXASET 511 /* maximum number of elements in ambient set */ |
27 |
> |
#ifndef MAXASET |
28 |
> |
#define MAXASET 2047 /* 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 */ |
38 |
|
static int nunflshed = 0; /* number of unflushed ambient values */ |
39 |
|
|
40 |
|
#ifndef SORT_THRESH |
41 |
< |
#ifdef BIGMEM |
94 |
< |
#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) |
95 |
< |
#else |
41 |
> |
#ifdef SMLMEM |
42 |
|
#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL)) |
43 |
+ |
#else |
44 |
+ |
#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) |
45 |
|
#endif |
46 |
|
#endif |
47 |
|
#ifndef SORT_INTVL |
78 |
|
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
79 |
|
#define freeav(av) free((void *)av); |
80 |
|
|
81 |
< |
static void initambfile(), avsave(), avinsert(), sortambvals(), unloadatree(); |
82 |
< |
static int avlmemi(); |
83 |
< |
static AMBVAL *avstore(); |
81 |
> |
static void initambfile(int creat); |
82 |
> |
static void avsave(AMBVAL *av); |
83 |
> |
static AMBVAL *avstore(AMBVAL *aval); |
84 |
> |
static AMBTREE *newambtree(void); |
85 |
> |
static void freeambtree(AMBTREE *atp); |
86 |
> |
|
87 |
> |
typedef void unloadtf_t(void *); |
88 |
> |
static unloadtf_t avinsert; |
89 |
> |
static unloadtf_t av2list; |
90 |
> |
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
91 |
> |
|
92 |
> |
static int aposcmp(const void *avp1, const void *avp2); |
93 |
> |
static int avlmemi(AMBVAL *avaddr); |
94 |
> |
static void sortambvals(int always); |
95 |
> |
|
96 |
|
#ifdef F_SETLKW |
97 |
< |
static void aflock(); |
97 |
> |
static void aflock(int typ); |
98 |
|
#endif |
99 |
|
|
100 |
|
|
101 |
< |
void |
102 |
< |
setambres(ar) /* set ambient resolution */ |
103 |
< |
int ar; |
101 |
> |
extern void |
102 |
> |
setambres( /* set ambient resolution */ |
103 |
> |
int ar |
104 |
> |
) |
105 |
|
{ |
106 |
|
ambres = ar < 0 ? 0 : ar; /* may be done already */ |
107 |
|
/* set min & max radii */ |
121 |
|
} |
122 |
|
|
123 |
|
|
124 |
< |
void |
125 |
< |
setambacc(newa) /* set ambient accuracy */ |
126 |
< |
double newa; |
124 |
> |
extern void |
125 |
> |
setambacc( /* set ambient accuracy */ |
126 |
> |
double newa |
127 |
> |
) |
128 |
|
{ |
129 |
|
double ambdiff; |
130 |
|
|
136 |
|
} |
137 |
|
|
138 |
|
|
139 |
< |
void |
140 |
< |
setambient() /* initialize calculation */ |
139 |
> |
extern void |
140 |
> |
setambient(void) /* initialize calculation */ |
141 |
|
{ |
142 |
|
int readonly = 0; |
143 |
|
long pos, flen; |
175 |
|
} |
176 |
|
/* align file pointer */ |
177 |
|
pos += (long)nambvals*AMBVALSIZ; |
178 |
< |
flen = lseek(fileno(ambfp), (off_t)0L, 2); |
178 |
> |
flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); |
179 |
|
if (flen != pos) { |
180 |
|
sprintf(errmsg, |
181 |
|
"ignoring last %ld values in ambient file (corrupted)", |
182 |
|
(flen - pos)/AMBVALSIZ); |
183 |
|
error(WARNING, errmsg); |
184 |
|
fseek(ambfp, pos, 0); |
185 |
+ |
#ifndef _WIN32 /* XXX we need a replacement for that one */ |
186 |
|
ftruncate(fileno(ambfp), (off_t)pos); |
187 |
+ |
#endif |
188 |
|
} |
189 |
|
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
190 |
|
initambfile(1); /* else create new file */ |
192 |
|
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
193 |
|
error(SYSTEM, errmsg); |
194 |
|
} |
195 |
< |
nunflshed++; /* lie */ |
232 |
< |
ambsync(); |
195 |
> |
ambsync(); /* load previous values */ |
196 |
|
} |
197 |
|
|
198 |
|
|
199 |
< |
void |
200 |
< |
ambdone() /* close ambient file and free memory */ |
199 |
> |
extern void |
200 |
> |
ambdone(void) /* close ambient file and free memory */ |
201 |
|
{ |
202 |
|
if (ambfp != NULL) { /* close ambient file */ |
203 |
|
ambsync(); |
222 |
|
} |
223 |
|
|
224 |
|
|
225 |
< |
void |
226 |
< |
ambnotify(obj) /* record new modifier */ |
227 |
< |
OBJECT obj; |
225 |
> |
extern void |
226 |
> |
ambnotify( /* record new modifier */ |
227 |
> |
OBJECT obj |
228 |
> |
) |
229 |
|
{ |
230 |
|
static int hitlimit = 0; |
231 |
|
register OBJREC *o; |
252 |
|
} |
253 |
|
|
254 |
|
|
255 |
< |
void |
256 |
< |
ambient(acol, r, nrm) /* compute ambient component for ray */ |
257 |
< |
COLOR acol; |
258 |
< |
register RAY *r; |
259 |
< |
FVECT nrm; |
255 |
> |
extern void |
256 |
> |
multambient( /* compute ambient component & multiply by coef. */ |
257 |
> |
COLOR aval, |
258 |
> |
register RAY *r, |
259 |
> |
FVECT nrm |
260 |
> |
) |
261 |
|
{ |
262 |
|
static int rdepth = 0; /* ambient recursion */ |
263 |
+ |
COLOR acol; |
264 |
|
double d, l; |
265 |
|
|
266 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
274 |
|
goto dumbamb; |
275 |
|
|
276 |
|
if (ambacc <= FTINY) { /* no ambient storage */ |
277 |
+ |
copycolor(acol, aval); |
278 |
|
rdepth++; |
279 |
|
d = doambient(acol, r, r->rweight, NULL, NULL); |
280 |
|
rdepth--; |
281 |
|
if (d <= FTINY) |
282 |
|
goto dumbamb; |
283 |
+ |
copycolor(aval, acol); |
284 |
|
return; |
285 |
|
} |
286 |
|
|
287 |
|
if (tracktime) /* sort to minimize thrashing */ |
288 |
|
sortambvals(0); |
289 |
< |
/* get ambient value */ |
289 |
> |
/* interpolate ambient value */ |
290 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
291 |
|
d = sumambient(acol, r, nrm, rdepth, |
292 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
293 |
|
if (d > FTINY) { |
294 |
< |
scalecolor(acol, 1.0/d); |
294 |
> |
d = 1.0/d; |
295 |
> |
scalecolor(acol, d); |
296 |
> |
multcolor(aval, acol); |
297 |
|
return; |
298 |
|
} |
299 |
|
rdepth++; /* need to cache new value */ |
300 |
|
d = makeambient(acol, r, nrm, rdepth-1); |
301 |
|
rdepth--; |
302 |
< |
if (d > FTINY) |
302 |
> |
if (d > FTINY) { |
303 |
> |
multcolor(aval, acol); /* got new value */ |
304 |
|
return; |
305 |
+ |
} |
306 |
|
dumbamb: /* return global value */ |
307 |
< |
copycolor(acol, ambval); |
308 |
< |
if (ambvwt <= 0 | navsum == 0) |
307 |
> |
if ((ambvwt <= 0) | (navsum == 0)) { |
308 |
> |
multcolor(aval, ambval); |
309 |
|
return; |
310 |
+ |
} |
311 |
|
l = bright(ambval); /* average in computations */ |
312 |
|
if (l > FTINY) { |
313 |
|
d = (log(l)*(double)ambvwt + avsum) / |
314 |
|
(double)(ambvwt + navsum); |
315 |
|
d = exp(d) / l; |
316 |
< |
scalecolor(acol, d); /* apply color of ambval */ |
316 |
> |
scalecolor(aval, d); |
317 |
> |
multcolor(aval, ambval); /* apply color of ambval */ |
318 |
|
} else { |
319 |
|
d = exp( avsum / (double)navsum ); |
320 |
< |
setcolor(acol, d, d, d); /* neutral color */ |
320 |
> |
scalecolor(aval, d); /* neutral color */ |
321 |
|
} |
322 |
|
} |
323 |
|
|
324 |
|
|
325 |
< |
double |
326 |
< |
sumambient(acol, r, rn, al, at, c0, s) /* get interpolated ambient value */ |
327 |
< |
COLOR acol; |
328 |
< |
register RAY *r; |
329 |
< |
FVECT rn; |
330 |
< |
int al; |
331 |
< |
AMBTREE *at; |
332 |
< |
FVECT c0; |
333 |
< |
double s; |
325 |
> |
extern double |
326 |
> |
sumambient( /* get interpolated ambient value */ |
327 |
> |
COLOR acol, |
328 |
> |
register RAY *r, |
329 |
> |
FVECT rn, |
330 |
> |
int al, |
331 |
> |
AMBTREE *at, |
332 |
> |
FVECT c0, |
333 |
> |
double s |
334 |
> |
) |
335 |
|
{ |
336 |
|
double d, e1, e2, wt, wsum; |
337 |
|
COLOR ct; |
351 |
|
*/ |
352 |
|
if (av->lvl > al) /* list sorted, so this works */ |
353 |
|
break; |
354 |
< |
if (av->weight < r->rweight-FTINY) |
354 |
> |
if (av->weight < 0.9*r->rweight) |
355 |
|
continue; |
356 |
|
/* |
357 |
|
* Ambient radius test. |
430 |
|
break; |
431 |
|
} |
432 |
|
if (j == 3) |
433 |
< |
wsum += sumambient(acol, r, rn, al, at->kid+i, ck0, s); |
433 |
> |
wsum += sumambient(acol, r, rn, al, |
434 |
> |
at->kid+i, ck0, s); |
435 |
|
} |
436 |
|
return(wsum); |
437 |
|
} |
438 |
|
|
439 |
|
|
440 |
< |
double |
441 |
< |
makeambient(acol, r, rn, al) /* make a new ambient value */ |
442 |
< |
COLOR acol; |
443 |
< |
register RAY *r; |
444 |
< |
FVECT rn; |
445 |
< |
int al; |
440 |
> |
extern double |
441 |
> |
makeambient( /* make a new ambient value for storage */ |
442 |
> |
COLOR acol, |
443 |
> |
RAY *r, |
444 |
> |
FVECT rn, |
445 |
> |
int al |
446 |
> |
) |
447 |
|
{ |
448 |
|
AMBVAL amb; |
449 |
|
FVECT gp, gd; |
450 |
< |
/* compute weight */ |
451 |
< |
amb.weight = pow(AVGREFL, (double)al); |
452 |
< |
if (r->rweight < 0.1*amb.weight) /* heuristic */ |
453 |
< |
amb.weight = r->rweight; |
450 |
> |
int i; |
451 |
> |
|
452 |
> |
amb.weight = 1.0; /* compute weight */ |
453 |
> |
for (i = al; i-- > 0; ) |
454 |
> |
amb.weight *= AVGREFL; |
455 |
> |
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
456 |
> |
amb.weight = 1.25*r->rweight; |
457 |
> |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
458 |
|
/* compute ambient */ |
459 |
|
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
460 |
< |
if (amb.rad <= FTINY) |
460 |
> |
if (amb.rad <= FTINY) { |
461 |
> |
setcolor(acol, 0.0, 0.0, 0.0); |
462 |
|
return(0.0); |
463 |
< |
/* store it */ |
463 |
> |
} |
464 |
> |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
465 |
> |
/* store value */ |
466 |
|
VCOPY(amb.pos, r->rop); |
467 |
|
VCOPY(amb.dir, r->ron); |
468 |
|
amb.lvl = al; |
477 |
|
} |
478 |
|
|
479 |
|
|
480 |
< |
void |
481 |
< |
extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ |
482 |
< |
COLOR cr; |
483 |
< |
register AMBVAL *ap; |
484 |
< |
FVECT pv, nv; |
480 |
> |
extern void |
481 |
> |
extambient( /* extrapolate value at pv, nv */ |
482 |
> |
COLOR cr, |
483 |
> |
register AMBVAL *ap, |
484 |
> |
FVECT pv, |
485 |
> |
FVECT nv |
486 |
> |
) |
487 |
|
{ |
488 |
|
FVECT v1; |
489 |
|
register int i; |
506 |
|
|
507 |
|
|
508 |
|
static void |
509 |
< |
initambfile(creat) /* initialize ambient file */ |
510 |
< |
int creat; |
509 |
> |
initambfile( /* initialize ambient file */ |
510 |
> |
int creat |
511 |
> |
) |
512 |
|
{ |
513 |
|
extern char *progname, *octname; |
514 |
|
static char *mybuf = NULL; |
516 |
|
#ifdef F_SETLKW |
517 |
|
aflock(creat ? F_WRLCK : F_RDLCK); |
518 |
|
#endif |
519 |
< |
#ifdef MSDOS |
533 |
< |
setmode(fileno(ambfp), O_BINARY); |
534 |
< |
#endif |
519 |
> |
SET_FILE_BINARY(ambfp); |
520 |
|
if (mybuf == NULL) |
521 |
|
mybuf = (char *)bmalloc(BUFSIZ+8); |
522 |
|
setbuf(ambfp, mybuf); |
543 |
|
|
544 |
|
|
545 |
|
static void |
546 |
< |
avsave(av) /* insert and save an ambient value */ |
547 |
< |
AMBVAL *av; |
546 |
> |
avsave( /* insert and save an ambient value */ |
547 |
> |
AMBVAL *av |
548 |
> |
) |
549 |
|
{ |
550 |
|
avinsert(avstore(av)); |
551 |
|
if (ambfp == NULL) |
562 |
|
|
563 |
|
|
564 |
|
static AMBVAL * |
565 |
< |
avstore(aval) /* allocate memory and store aval */ |
566 |
< |
register AMBVAL *aval; |
565 |
> |
avstore( /* allocate memory and store aval */ |
566 |
> |
register AMBVAL *aval |
567 |
> |
) |
568 |
|
{ |
569 |
|
register AMBVAL *av; |
570 |
|
double d; |
571 |
|
|
572 |
|
if ((av = newambval()) == NULL) |
573 |
|
error(SYSTEM, "out of memory in avstore"); |
574 |
< |
copystruct(av, aval); |
574 |
> |
*av = *aval; |
575 |
|
av->latick = ambclock; |
576 |
|
av->next = NULL; |
577 |
|
nambvals++; |
590 |
|
|
591 |
|
|
592 |
|
static AMBTREE * |
593 |
< |
newambtree() /* allocate 8 ambient tree structs */ |
593 |
> |
newambtree(void) /* allocate 8 ambient tree structs */ |
594 |
|
{ |
595 |
|
register AMBTREE *atp, *upperlim; |
596 |
|
|
606 |
|
} |
607 |
|
atp = atfreelist; |
608 |
|
atfreelist = atp->kid; |
609 |
< |
bzero((char *)atp, 8*sizeof(AMBTREE)); |
609 |
> |
memset((char *)atp, '\0', 8*sizeof(AMBTREE)); |
610 |
|
return(atp); |
611 |
|
} |
612 |
|
|
613 |
|
|
614 |
|
static void |
615 |
< |
freeambtree(atp) /* free 8 ambient tree structs */ |
616 |
< |
AMBTREE *atp; |
615 |
> |
freeambtree( /* free 8 ambient tree structs */ |
616 |
> |
AMBTREE *atp |
617 |
> |
) |
618 |
|
{ |
619 |
|
atp->kid = atfreelist; |
620 |
|
atfreelist = atp; |
622 |
|
|
623 |
|
|
624 |
|
static void |
625 |
< |
avinsert(av) /* insert ambient value in our tree */ |
626 |
< |
register AMBVAL *av; |
625 |
> |
avinsert( /* insert ambient value in our tree */ |
626 |
> |
void *av |
627 |
> |
) |
628 |
|
{ |
629 |
|
register AMBTREE *at; |
630 |
|
register AMBVAL *ap; |
634 |
|
int branch; |
635 |
|
register int i; |
636 |
|
|
637 |
< |
if (av->rad <= FTINY) |
637 |
> |
if (((AMBVAL*)av)->rad <= FTINY) |
638 |
|
error(CONSISTENCY, "zero ambient radius in avinsert"); |
639 |
|
at = &atrunk; |
640 |
|
VCOPY(ck0, thescene.cuorg); |
641 |
|
s = thescene.cusize; |
642 |
< |
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
642 |
> |
while (s*(OCTSCALE/2) > ((AMBVAL*)av)->rad*ambacc) { |
643 |
|
if (at->kid == NULL) |
644 |
|
if ((at->kid = newambtree()) == NULL) |
645 |
|
error(SYSTEM, "out of memory in avinsert"); |
646 |
|
s *= 0.5; |
647 |
|
branch = 0; |
648 |
|
for (i = 0; i < 3; i++) |
649 |
< |
if (av->pos[i] > ck0[i] + s) { |
649 |
> |
if (((AMBVAL*)av)->pos[i] > ck0[i] + s) { |
650 |
|
ck0[i] += s; |
651 |
|
branch |= 1 << i; |
652 |
|
} |
654 |
|
} |
655 |
|
avh.next = at->alist; /* order by increasing level */ |
656 |
|
for (ap = &avh; ap->next != NULL; ap = ap->next) |
657 |
< |
if (ap->next->lvl >= av->lvl) |
657 |
> |
if (ap->next->lvl >= ((AMBVAL*)av)->lvl) |
658 |
|
break; |
659 |
< |
av->next = ap->next; |
660 |
< |
ap->next = av; |
659 |
> |
((AMBVAL*)av)->next = ap->next; |
660 |
> |
ap->next = (AMBVAL*)av; |
661 |
|
at->alist = avh.next; |
662 |
|
} |
663 |
|
|
664 |
|
|
665 |
|
static void |
666 |
< |
unloadatree(at, f) /* unload an ambient value tree */ |
667 |
< |
register AMBTREE *at; |
668 |
< |
void (*f)(); |
666 |
> |
unloadatree( /* unload an ambient value tree */ |
667 |
> |
register AMBTREE *at, |
668 |
> |
unloadtf_t *f |
669 |
> |
) |
670 |
|
{ |
671 |
|
register AMBVAL *av; |
672 |
|
register int i; |
691 |
|
static AMBVAL **avlist2; /* memory positions for sorting */ |
692 |
|
static int i_avlist; /* index for lists */ |
693 |
|
|
694 |
+ |
static int alatcmp(const void *av1, const void *av2); |
695 |
|
|
696 |
< |
static int |
697 |
< |
av2list(av) |
698 |
< |
register AMBVAL *av; |
696 |
> |
static void |
697 |
> |
av2list( |
698 |
> |
void *av |
699 |
> |
) |
700 |
|
{ |
701 |
|
#ifdef DEBUG |
702 |
|
if (i_avlist >= nambvals) |
703 |
|
error(CONSISTENCY, "too many ambient values in av2list1"); |
704 |
|
#endif |
705 |
< |
avlist1[i_avlist].p = avlist2[i_avlist] = av; |
706 |
< |
avlist1[i_avlist++].t = av->latick; |
705 |
> |
avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av; |
706 |
> |
avlist1[i_avlist++].t = ((AMBVAL*)av)->latick; |
707 |
|
} |
708 |
|
|
709 |
|
|
710 |
|
static int |
711 |
< |
alatcmp(av1, av2) /* compare ambient values for MRA */ |
712 |
< |
struct avl *av1, *av2; |
711 |
> |
alatcmp( /* compare ambient values for MRA */ |
712 |
> |
const void *av1, |
713 |
> |
const void *av2 |
714 |
> |
) |
715 |
|
{ |
716 |
< |
register long lc = av2->t - av1->t; |
716 |
> |
register long lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t; |
717 |
|
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
718 |
|
} |
719 |
|
|
725 |
|
* assumes pointers differ by exact struct size increments. |
726 |
|
*/ |
727 |
|
static int |
728 |
< |
aposcmp(avp1, avp2) /* compare ambient value positions */ |
729 |
< |
const void *avp1, *avp2; |
728 |
> |
aposcmp( /* compare ambient value positions */ |
729 |
> |
const void *avp1, |
730 |
> |
const void *avp2 |
731 |
> |
) |
732 |
|
{ |
733 |
|
register long diff = *(char * const *)avp1 - *(char * const *)avp2; |
734 |
|
if (diff < 0) |
738 |
|
|
739 |
|
#if 1 |
740 |
|
static int |
741 |
< |
avlmemi(avaddr) /* find list position from address */ |
742 |
< |
AMBVAL *avaddr; |
741 |
> |
avlmemi( /* find list position from address */ |
742 |
> |
AMBVAL *avaddr |
743 |
> |
) |
744 |
|
{ |
745 |
|
register AMBVAL **avlpp; |
746 |
|
|
757 |
|
|
758 |
|
|
759 |
|
static void |
760 |
< |
sortambvals(always) /* resort ambient values */ |
761 |
< |
int always; |
760 |
> |
sortambvals( /* resort ambient values */ |
761 |
> |
int always |
762 |
> |
) |
763 |
|
{ |
764 |
|
AMBTREE oldatrunk; |
765 |
|
AMBVAL tav, *tap, *pnext; |
794 |
|
if (avlist2 != NULL) |
795 |
|
free((void *)avlist2); |
796 |
|
if (always) { /* rebuild without sorting */ |
797 |
< |
copystruct(&oldatrunk, &atrunk); |
797 |
> |
oldatrunk = atrunk; |
798 |
|
atrunk.alist = NULL; |
799 |
|
atrunk.kid = NULL; |
800 |
|
unloadatree(&oldatrunk, avinsert); |
825 |
|
if (avlist1[i].p == NULL) |
826 |
|
continue; |
827 |
|
tap = avlist2[i]; |
828 |
< |
copystruct(&tav, tap); |
828 |
> |
tav = *tap; |
829 |
|
for (j = i; (pnext = avlist1[j].p) != tap; |
830 |
|
j = avlmemi(pnext)) { |
831 |
< |
copystruct(avlist2[j], pnext); |
831 |
> |
*(avlist2[j]) = *pnext; |
832 |
|
avinsert(avlist2[j]); |
833 |
|
avlist1[j].p = NULL; |
834 |
|
} |
835 |
< |
copystruct(avlist2[j], &tav); |
835 |
> |
*(avlist2[j]) = tav; |
836 |
|
avinsert(avlist2[j]); |
837 |
|
avlist1[j].p = NULL; |
838 |
|
} |
857 |
|
#ifdef F_SETLKW |
858 |
|
|
859 |
|
static void |
860 |
< |
aflock(typ) /* lock/unlock ambient file */ |
861 |
< |
int typ; |
860 |
> |
aflock( /* lock/unlock ambient file */ |
861 |
> |
int typ |
862 |
> |
) |
863 |
|
{ |
864 |
|
static struct flock fls; /* static so initialized to zeroes */ |
865 |
|
|
869 |
|
} |
870 |
|
|
871 |
|
|
872 |
< |
int |
873 |
< |
ambsync() /* synchronize ambient file */ |
872 |
> |
extern int |
873 |
> |
ambsync(void) /* synchronize ambient file */ |
874 |
|
{ |
875 |
|
long flen; |
876 |
|
AMBVAL avs; |
877 |
|
register int n; |
878 |
|
|
880 |
– |
if (nunflshed == 0) |
881 |
– |
return(0); |
879 |
|
if (lastpos < 0) /* initializing (locked in initambfile) */ |
880 |
|
goto syncend; |
881 |
< |
/* gain exclusive access */ |
882 |
< |
aflock(F_WRLCK); |
881 |
> |
/* gain appropriate access */ |
882 |
> |
aflock(nunflshed ? F_WRLCK : F_RDLCK); |
883 |
|
/* see if file has grown */ |
884 |
< |
if ((flen = lseek(fileno(ambfp), (off_t)0L, 2)) < 0) |
884 |
> |
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
885 |
|
goto seekerr; |
886 |
< |
if (n = flen - lastpos) { /* file has grown */ |
886 |
> |
if ( (n = flen - lastpos) ) { /* file has grown */ |
887 |
|
if (ambinp == NULL) { /* use duplicate filedes */ |
888 |
|
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
889 |
|
if (ambinp == NULL) |
904 |
|
} |
905 |
|
/*** seek always as safety measure |
906 |
|
if (n) ***/ /* alignment */ |
907 |
< |
if (lseek(fileno(ambfp), (off_t)(flen-n), 0) < 0) |
907 |
> |
if (lseek(fileno(ambfp), (off_t)(flen-n), SEEK_SET) < 0) |
908 |
|
goto seekerr; |
909 |
|
} |
910 |
|
#ifdef DEBUG |
917 |
|
#endif |
918 |
|
syncend: |
919 |
|
n = fflush(ambfp); /* calls write() at last */ |
920 |
< |
if ((lastpos = lseek(fileno(ambfp), (off_t)0L, 1)) < 0) |
920 |
> |
if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) |
921 |
|
goto seekerr; |
922 |
|
aflock(F_UNLCK); /* release file */ |
923 |
|
nunflshed = 0; |
924 |
|
return(n); |
925 |
|
seekerr: |
926 |
|
error(SYSTEM, "seek failed in ambsync"); |
927 |
+ |
return -1; /* pro forma return */ |
928 |
|
} |
929 |
|
|
930 |
|
#else |
931 |
|
|
932 |
< |
int |
933 |
< |
ambsync() /* flush ambient file */ |
932 |
> |
extern int |
933 |
> |
ambsync(void) /* flush ambient file */ |
934 |
|
{ |
937 |
– |
if (nunflshed == 0) |
938 |
– |
return(0); |
935 |
|
nunflshed = 0; |
936 |
|
return(fflush(ambfp)); |
937 |
|
} |