9 |
|
*/ |
10 |
|
|
11 |
|
#include "glare.h" |
12 |
< |
#include <sys/param.h> |
13 |
< |
/* compute rtrace buffer size */ |
14 |
< |
#ifndef PIPE_BUF |
15 |
< |
#define PIPE_BUF 512 /* hyperconservative */ |
16 |
< |
#endif |
17 |
< |
#define MAXPIX (PIPE_BUF/(6*sizeof(float)) - 1) |
12 |
> |
#include "resolu.h" |
13 |
> |
/* maximum rtrace buffer size */ |
14 |
> |
#define MAXPIX (4096/(6*sizeof(float))) |
15 |
|
|
16 |
< |
#ifndef BSD |
17 |
< |
#define vfork fork |
21 |
< |
#endif |
22 |
< |
|
23 |
< |
#define MAXSBUF 409580 /* maximum total size of scanline buffer */ |
24 |
< |
#define HSIZE 227 /* size of scanline hash table */ |
16 |
> |
#define MAXSBUF 786432 /* maximum total size of scanline buffer */ |
17 |
> |
#define HSIZE 317 /* size of scanline hash table */ |
18 |
|
#define NRETIRE 16 /* number of scanlines to retire at once */ |
19 |
|
|
20 |
< |
int rt_pid = -1; /* process id for rtrace */ |
28 |
< |
int fd_tort, fd_fromrt; /* pipe descriptors */ |
20 |
> |
int rt_pd[3] = {-1,-1,-1}; /* process id & descriptors for rtrace */ |
21 |
|
|
22 |
|
FILE *pictfp = NULL; /* picture file pointer */ |
23 |
|
double exposure; /* picture exposure */ |
36 |
|
#define scandata(sl) ((COLR *)((sl)+1)) |
37 |
|
#define shash(y) ((y)%HSIZE) |
38 |
|
|
39 |
+ |
static int maxpix; /* maximum number of pixels to buffer */ |
40 |
+ |
|
41 |
|
static SCAN *freelist; /* scanline free list */ |
42 |
|
static SCAN *hashtab[HSIZE]; /* scanline hash table */ |
43 |
|
|
44 |
|
static long ncall = 0L; /* number of calls to getpictscan */ |
45 |
|
static long nread = 0L; /* number of scanlines read */ |
46 |
+ |
static long nrecl = 0L; /* number of scanlines reclaimed */ |
47 |
|
|
48 |
+ |
static int wrongformat = 0; |
49 |
+ |
|
50 |
|
SCAN *scanretire(); |
51 |
|
|
52 |
|
extern long ftell(); |
72 |
|
if (sl->y == y) { /* reclaim */ |
73 |
|
sl->next = hashtab[hi]; |
74 |
|
hashtab[hi] = sl; |
75 |
+ |
nrecl++; |
76 |
|
} |
77 |
|
return(sl); |
78 |
|
} |
136 |
|
{ |
137 |
|
static long lastcall = 0L; /* ncall at last report */ |
138 |
|
static long lastread = 0L; /* nread at last report */ |
139 |
+ |
static long lastrecl = 0L; /* nrecl at last report */ |
140 |
|
|
141 |
|
if (ncall == lastcall) |
142 |
|
return; |
143 |
< |
fprintf(stderr, "%s: %ld scanlines read in %ld calls\n", |
144 |
< |
progname, nread-lastread, ncall-lastcall); |
143 |
> |
fprintf(stderr, "%s: %ld scanlines read (%ld reclaimed) in %ld calls\n", |
144 |
> |
progname, nread-lastread, nrecl-lastrecl, ncall-lastcall); |
145 |
|
lastcall = ncall; |
146 |
|
lastread = nread; |
147 |
+ |
lastrecl = nrecl; |
148 |
|
} |
149 |
|
#endif |
150 |
|
|
154 |
|
FVECT vd; |
155 |
|
{ |
156 |
|
FVECT pp; |
157 |
< |
double vpx, vpy, vpz; |
157 |
> |
FVECT ip; |
158 |
|
COLOR res; |
159 |
|
|
160 |
|
if (pictfp == NULL) |
162 |
|
pp[0] = pictview.vp[0] + vd[0]; |
163 |
|
pp[1] = pictview.vp[1] + vd[1]; |
164 |
|
pp[2] = pictview.vp[2] + vd[2]; |
165 |
< |
viewpixel(&vpx, &vpy, &vpz, &pictview, pp); |
166 |
< |
if (vpz <= FTINY || vpx < 0. || vpx >= 1. || vpy < 0. || vpy >= 1.) |
165 |
> |
viewloc(ip, &pictview, pp); |
166 |
> |
if (ip[2] <= FTINY || ip[0] < 0. || ip[0] >= 1. || |
167 |
> |
ip[1] < 0. || ip[1] >= 1.) |
168 |
|
return(-1.0); |
169 |
< |
colr_color(res, getpictscan((int)(vpy*pysiz))[(int)(vpx*pxsiz)]); |
169 |
> |
colr_color(res, getpictscan((int)(ip[1]*pysiz))[(int)(ip[0]*pxsiz)]); |
170 |
|
return(luminance(res)/exposure); |
171 |
|
} |
172 |
|
|
176 |
|
int vh, vv; |
177 |
|
{ |
178 |
|
FVECT dir; |
179 |
< |
float rt_buf[6]; |
179 |
> |
float rt_buf[12]; |
180 |
|
double res; |
181 |
|
|
182 |
|
if (compdir(dir, vh, vv) < 0) |
184 |
|
npixinvw++; |
185 |
|
if ((res = pict_val(dir)) >= 0.0) |
186 |
|
return(res); |
187 |
< |
if (rt_pid == -1) { |
187 |
> |
if (rt_pd[0] == -1) { |
188 |
|
npixmiss++; |
189 |
|
return(-1.0); |
190 |
|
} |
216 |
|
#endif |
217 |
|
n = 0; |
218 |
|
for (vh = -hsize; vh <= hsize; vh++) { |
219 |
< |
if (compdir(dir, vh, vv) < 0) { /* off viewable region */ |
219 |
> |
if (compdir(dir, vh, vv) < 0) { /* not in view */ |
220 |
|
vb[vh+hsize] = -1.0; |
221 |
|
continue; |
222 |
|
} |
223 |
|
npixinvw++; |
224 |
|
if ((vb[vh+hsize] = pict_val(dir)) >= 0.0) |
225 |
|
continue; |
226 |
< |
if (rt_pid == -1) { /* missing information */ |
226 |
> |
if (rt_pd[0] == -1) { /* missing information */ |
227 |
|
npixmiss++; |
228 |
|
continue; |
229 |
|
} |
230 |
|
/* send to rtrace */ |
231 |
< |
if (n >= MAXPIX) { /* flush */ |
231 |
> |
if (n >= maxpix) { /* flush */ |
232 |
|
rt_compute(rt_buf, n); |
233 |
|
while (n-- > 0) |
234 |
|
vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n); |
257 |
|
float *pb; |
258 |
|
int np; |
259 |
|
{ |
259 |
– |
static float nbuf[6] = {0.,0.,0.,0.,0.,0.}; |
260 |
– |
|
260 |
|
#ifdef DEBUG |
261 |
|
if (verbose && np > 1) |
262 |
|
fprintf(stderr, "%s: sending %d samples to rtrace...\n", |
263 |
|
progname, np); |
264 |
|
#endif |
265 |
< |
if (writebuf(fd_tort,(char *)pb,6*sizeof(float)*np) < 6*sizeof(float)*np |
266 |
< |
|| writebuf(fd_tort,(char *)nbuf,sizeof(nbuf)) < sizeof(nbuf)) { |
267 |
< |
fprintf(stderr, "%s: error writing to rtrace process\n", |
265 |
> |
bzero(pb+6*np, 6*sizeof(float)); |
266 |
> |
if (process(rt_pd, pb, pb, 3*sizeof(float)*np, |
267 |
> |
6*sizeof(float)*(np+1)) < 3*sizeof(float)*np) { |
268 |
> |
fprintf(stderr, "%s: rtrace communication error\n", |
269 |
|
progname); |
270 |
|
exit(1); |
271 |
|
} |
272 |
– |
if (readbuf(fd_fromrt, (char *)pb, 3*sizeof(float)*np) |
273 |
– |
< 3*sizeof(float)*np) { |
274 |
– |
fprintf(stderr, "%s: error reading from rtrace process\n", |
275 |
– |
progname); |
276 |
– |
exit(1); |
277 |
– |
} |
272 |
|
} |
273 |
|
|
274 |
|
|
275 |
|
getexpos(s) /* get exposure from header line */ |
276 |
|
char *s; |
277 |
|
{ |
278 |
+ |
char fmt[32]; |
279 |
+ |
|
280 |
|
if (isexpos(s)) |
281 |
|
exposure *= exposval(s); |
282 |
+ |
else if (isformat(s)) { |
283 |
+ |
formatval(fmt, s); |
284 |
+ |
wrongformat = strcmp(fmt, COLRFMT); |
285 |
+ |
} |
286 |
|
} |
287 |
|
|
288 |
|
|
289 |
|
open_pict(fn) /* open picture file */ |
290 |
|
char *fn; |
291 |
|
{ |
292 |
– |
register int i; |
293 |
– |
|
292 |
|
if ((pictfp = fopen(fn, "r")) == NULL) { |
293 |
|
fprintf("%s: cannot open\n", fn); |
294 |
|
exit(1); |
295 |
|
} |
296 |
|
exposure = 1.0; |
297 |
< |
getheader(pictfp, getexpos); |
298 |
< |
if (fgetresolu(&pxsiz, &pysiz, pictfp) != (YMAJOR|YDECR)) { |
299 |
< |
fprintf("%s: bad picture resolution\n", fn); |
297 |
> |
getheader(pictfp, getexpos, NULL); |
298 |
> |
if (wrongformat || !fscnresolu(&pxsiz, &pysiz, pictfp)) { |
299 |
> |
fprintf(stderr, "%s: incompatible picture format\n", fn); |
300 |
|
exit(1); |
301 |
|
} |
302 |
|
initscans(); |
305 |
|
|
306 |
|
close_pict() /* done with picture */ |
307 |
|
{ |
310 |
– |
register int i; |
311 |
– |
|
308 |
|
if (pictfp == NULL) |
309 |
|
return; |
310 |
|
fclose(pictfp); |
316 |
|
fork_rtrace(av) /* open pipe and start rtrace */ |
317 |
|
char *av[]; |
318 |
|
{ |
319 |
< |
int p0[2], p1[2]; |
319 |
> |
int rval; |
320 |
|
|
321 |
< |
if (pipe(p0) < 0 || pipe(p1) < 0) { |
321 |
> |
rval = open_process(rt_pd, av); |
322 |
> |
if (rval < 0) { |
323 |
|
perror(progname); |
324 |
|
exit(1); |
325 |
|
} |
326 |
< |
if ((rt_pid = vfork()) == 0) { /* if child */ |
327 |
< |
close(p0[1]); |
331 |
< |
close(p1[0]); |
332 |
< |
if (p0[0] != 0) { /* connect p0 to stdin */ |
333 |
< |
dup2(p0[0], 0); |
334 |
< |
close(p0[0]); |
335 |
< |
} |
336 |
< |
if (p1[1] != 0) { /* connect p1 to stdout */ |
337 |
< |
dup2(p1[1], 1); |
338 |
< |
close(p1[1]); |
339 |
< |
} |
340 |
< |
execvp(av[0], av); |
341 |
< |
perror(av[0]); |
342 |
< |
_exit(127); |
343 |
< |
} |
344 |
< |
if (rt_pid == -1) { |
345 |
< |
perror(progname); |
326 |
> |
if (rval == 0) { |
327 |
> |
fprintf(stderr, "%s: command not found\n", av[0]); |
328 |
|
exit(1); |
329 |
|
} |
330 |
< |
close(p0[0]); |
331 |
< |
close(p1[1]); |
332 |
< |
fd_tort = p0[1]; |
333 |
< |
fd_fromrt = p1[0]; |
330 |
> |
maxpix = rval/(6*sizeof(float)); |
331 |
> |
if (maxpix > MAXPIX) |
332 |
> |
maxpix = MAXPIX; |
333 |
> |
maxpix--; |
334 |
|
} |
335 |
|
|
336 |
|
|
337 |
|
done_rtrace() /* wait for rtrace to finish */ |
338 |
|
{ |
339 |
< |
int pid, status; |
339 |
> |
int status; |
340 |
|
|
341 |
< |
if (rt_pid == -1) |
342 |
< |
return; |
361 |
< |
close(fd_tort); |
362 |
< |
close(fd_fromrt); |
363 |
< |
while ((pid = wait(&status)) != -1 && pid != rt_pid) |
364 |
< |
; |
365 |
< |
if (pid == rt_pid && status != 0) { |
341 |
> |
status = close_process(rt_pd); |
342 |
> |
if (status > 0) { |
343 |
|
fprintf(stderr, "%s: bad status (%d) from rtrace\n", |
344 |
|
progname, status); |
345 |
|
exit(1); |
346 |
|
} |
347 |
< |
rt_pid = -1; |
347 |
> |
rt_pd[0] = -1; |
348 |
|
} |
349 |
|
|
350 |
|
|
374 |
– |
int |
375 |
– |
readbuf(fd, bpos, siz) |
376 |
– |
int fd; |
377 |
– |
char *bpos; |
378 |
– |
int siz; |
379 |
– |
{ |
380 |
– |
register int cc, nrem = siz; |
381 |
– |
|
382 |
– |
while (nrem > 0 && (cc = read(fd, bpos, nrem)) > 0) { |
383 |
– |
bpos += cc; |
384 |
– |
nrem -= cc; |
385 |
– |
} |
386 |
– |
if (cc < 0) |
387 |
– |
return(cc); |
388 |
– |
return(siz-nrem); |
389 |
– |
} |
390 |
– |
|
391 |
– |
|
392 |
– |
int |
393 |
– |
writebuf(fd, bpos, siz) |
394 |
– |
char *bpos; |
395 |
– |
int siz; |
396 |
– |
{ |
397 |
– |
register int cc, nrem = siz; |
398 |
– |
|
399 |
– |
while (nrem > 0 && (cc = write(fd, bpos, nrem)) > 0) { |
400 |
– |
bpos += cc; |
401 |
– |
nrem -= cc; |
402 |
– |
} |
403 |
– |
if (cc < 0) |
404 |
– |
return(cc); |
405 |
– |
return(siz-nrem); |
406 |
– |
} |
407 |
– |
|
408 |
– |
|
351 |
|
SCAN * |
352 |
|
scanretire() /* retire old scanlines to free list */ |
353 |
|
{ |
354 |
|
SCAN *sold[NRETIRE]; |
413 |
– |
SCAN head; |
355 |
|
int n; |
356 |
|
int h; |
357 |
|
register SCAN *sl; |
358 |
|
register int i; |
359 |
|
/* grab the NRETIRE oldest scanlines */ |
360 |
|
sold[n = 0] = NULL; |
361 |
< |
for (h = 0; h < HSIZE; h++) { |
362 |
< |
head.next = hashtab[h]; |
363 |
< |
sl = &head; |
364 |
< |
while (sl->next != NULL) { |
424 |
< |
for (i = n; i && sold[i-1]->lused > sl->next->lused; i--) |
425 |
< |
if (i == NRETIRE) { /* reallocate */ |
426 |
< |
register int oh; |
427 |
< |
oh = shash(sold[NRETIRE-1]->y); |
428 |
< |
sold[NRETIRE-1]->next = hashtab[oh]; |
429 |
< |
if (h == oh && sl == &head) |
430 |
< |
head.next = sl = sold[NRETIRE-1]; |
431 |
< |
else |
432 |
< |
hashtab[oh] = sold[NRETIRE-1]; |
433 |
< |
} else /* else bubble up */ |
361 |
> |
for (h = 0; h < HSIZE; h++) |
362 |
> |
for (sl = hashtab[h]; sl != NULL; sl = sl->next) { |
363 |
> |
for (i = n; i && sold[i-1]->lused > sl->lused; i--) |
364 |
> |
if (i < NRETIRE) |
365 |
|
sold[i] = sold[i-1]; |
366 |
|
if (i < NRETIRE) { |
367 |
< |
sold[i] = sl->next; |
437 |
< |
sl->next = sl->next->next; |
367 |
> |
sold[i] = sl; |
368 |
|
if (n < NRETIRE) /* grow list */ |
369 |
|
n++; |
370 |
< |
} else |
370 |
> |
} |
371 |
> |
} |
372 |
> |
/* put scanlines into free list */ |
373 |
> |
for (i = 0; i < n; i++) { |
374 |
> |
h = shash(sold[i]->y); |
375 |
> |
sl = hashtab[h]; |
376 |
> |
if (sl == sold[i]) |
377 |
> |
hashtab[h] = sl->next; |
378 |
> |
else { |
379 |
> |
while (sl->next != sold[i]) /* IS in list */ |
380 |
|
sl = sl->next; |
381 |
+ |
sl->next = sold[i]->next; |
382 |
|
} |
383 |
< |
hashtab[h] = head.next; |
383 |
> |
if (i > 0) { /* save oldest as return value */ |
384 |
> |
sold[i]->next = freelist; |
385 |
> |
freelist = sold[i]; |
386 |
> |
} |
387 |
|
} |
445 |
– |
/* put scanlines into free list */ |
446 |
– |
for (i = 1; i < n; i++) { |
447 |
– |
sold[i]->next = freelist; |
448 |
– |
freelist = sold[i]; |
449 |
– |
} |
388 |
|
return(sold[0]); |
389 |
|
} |
390 |
|
|
410 |
|
/* allocate scanline buffers */ |
411 |
|
scansize = sizeof(SCAN) + pxsiz*sizeof(COLR); |
412 |
|
#ifdef ALIGN |
413 |
< |
scansize = scansize+(sizeof(ALIGN)-1)) & ~(sizeof(ALIGN)-1); |
413 |
> |
scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1); |
414 |
|
#endif |
415 |
|
i = MAXSBUF / scansize; /* compute number to allocate */ |
416 |
|
if (i > HSIZE) |