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 |
> |
/* maximum rtrace buffer size */ |
13 |
> |
#define MAXPIX (4096/(6*sizeof(float))) |
14 |
|
|
15 |
< |
#ifndef BSD |
20 |
< |
#define vfork fork |
21 |
< |
#endif |
22 |
< |
|
23 |
< |
#define MAXSBUF 524268 /* maximum total size of scanline buffer */ |
15 |
> |
#define MAXSBUF 786432 /* maximum total size of scanline buffer */ |
16 |
|
#define HSIZE 317 /* size of scanline hash table */ |
17 |
|
#define NRETIRE 16 /* number of scanlines to retire at once */ |
18 |
|
|
19 |
< |
int rt_pid = -1; /* process id for rtrace */ |
28 |
< |
int fd_tort, fd_fromrt; /* pipe descriptors */ |
19 |
> |
int rt_pd[3] = {-1,-1,-1}; /* process id & descriptors for rtrace */ |
20 |
|
|
21 |
|
FILE *pictfp = NULL; /* picture file pointer */ |
22 |
|
double exposure; /* picture exposure */ |
35 |
|
#define scandata(sl) ((COLR *)((sl)+1)) |
36 |
|
#define shash(y) ((y)%HSIZE) |
37 |
|
|
38 |
+ |
static int maxpix; /* maximum number of pixels to buffer */ |
39 |
+ |
|
40 |
|
static SCAN *freelist; /* scanline free list */ |
41 |
|
static SCAN *hashtab[HSIZE]; /* scanline hash table */ |
42 |
|
|
43 |
|
static long ncall = 0L; /* number of calls to getpictscan */ |
44 |
|
static long nread = 0L; /* number of scanlines read */ |
45 |
+ |
static long nrecl = 0L; /* number of scanlines reclaimed */ |
46 |
|
|
47 |
+ |
static int wrongformat = 0; |
48 |
+ |
|
49 |
|
SCAN *scanretire(); |
50 |
|
|
51 |
|
extern long ftell(); |
71 |
|
if (sl->y == y) { /* reclaim */ |
72 |
|
sl->next = hashtab[hi]; |
73 |
|
hashtab[hi] = sl; |
74 |
< |
#ifdef DEBUG |
79 |
< |
if (verbose) |
80 |
< |
fprintf(stderr, |
81 |
< |
"%s: scanline %d reclaimed\n", |
82 |
< |
progname, y); |
83 |
< |
#endif |
74 |
> |
nrecl++; |
75 |
|
} |
76 |
|
return(sl); |
77 |
|
} |
135 |
|
{ |
136 |
|
static long lastcall = 0L; /* ncall at last report */ |
137 |
|
static long lastread = 0L; /* nread at last report */ |
138 |
+ |
static long lastrecl = 0L; /* nrecl at last report */ |
139 |
|
|
140 |
|
if (ncall == lastcall) |
141 |
|
return; |
142 |
< |
fprintf(stderr, "%s: %ld scanlines read in %ld calls\n", |
143 |
< |
progname, nread-lastread, ncall-lastcall); |
142 |
> |
fprintf(stderr, "%s: %ld scanlines read (%ld reclaimed) in %ld calls\n", |
143 |
> |
progname, nread-lastread, nrecl-lastrecl, ncall-lastcall); |
144 |
|
lastcall = ncall; |
145 |
|
lastread = nread; |
146 |
+ |
lastrecl = nrecl; |
147 |
|
} |
148 |
|
#endif |
149 |
|
|
170 |
|
|
171 |
|
|
172 |
|
double |
173 |
< |
getviewpix(vh, vv, se) /* compute single view pixel */ |
173 |
> |
getviewpix(vh, vv) /* compute single view pixel */ |
174 |
|
int vh, vv; |
182 |
– |
SPANERR *se; |
175 |
|
{ |
176 |
|
FVECT dir; |
177 |
< |
float rt_buf[6]; |
177 |
> |
float rt_buf[12]; |
178 |
|
double res; |
179 |
|
|
180 |
< |
if (compdir(dir, vh, vv, se) < 0) |
180 |
> |
if (compdir(dir, vh, vv) < 0) |
181 |
|
return(-1.0); |
182 |
|
npixinvw++; |
183 |
|
if ((res = pict_val(dir)) >= 0.0) |
184 |
|
return(res); |
185 |
< |
if (rt_pid == -1) { |
185 |
> |
if (rt_pd[0] == -1) { |
186 |
|
npixmiss++; |
187 |
|
return(-1.0); |
188 |
|
} |
204 |
|
float rt_buf[6*MAXPIX]; /* rtrace send/receive buffer */ |
205 |
|
register int n; /* number of pixels in buffer */ |
206 |
|
short buf_vh[MAXPIX]; /* pixel positions */ |
215 |
– |
SPANERR sperr; |
207 |
|
FVECT dir; |
208 |
|
register int vh; |
209 |
|
|
212 |
|
fprintf(stderr, "%s: computing view span at %d...\n", |
213 |
|
progname, vv); |
214 |
|
#endif |
224 |
– |
setspanerr(&sperr, vv); |
215 |
|
n = 0; |
216 |
|
for (vh = -hsize; vh <= hsize; vh++) { |
217 |
< |
if (compdir(dir, vh, vv, &sperr) < 0) { /* not in view */ |
217 |
> |
if (compdir(dir, vh, vv) < 0) { /* not in view */ |
218 |
|
vb[vh+hsize] = -1.0; |
219 |
|
continue; |
220 |
|
} |
221 |
|
npixinvw++; |
222 |
|
if ((vb[vh+hsize] = pict_val(dir)) >= 0.0) |
223 |
|
continue; |
224 |
< |
if (rt_pid == -1) { /* missing information */ |
224 |
> |
if (rt_pd[0] == -1) { /* missing information */ |
225 |
|
npixmiss++; |
226 |
|
continue; |
227 |
|
} |
228 |
|
/* send to rtrace */ |
229 |
< |
if (n >= MAXPIX) { /* flush */ |
229 |
> |
if (n >= maxpix) { /* flush */ |
230 |
|
rt_compute(rt_buf, n); |
231 |
|
while (n-- > 0) |
232 |
|
vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n); |
255 |
|
float *pb; |
256 |
|
int np; |
257 |
|
{ |
268 |
– |
static float nbuf[6] = {0.,0.,0.,0.,0.,0.}; |
269 |
– |
|
258 |
|
#ifdef DEBUG |
259 |
|
if (verbose && np > 1) |
260 |
|
fprintf(stderr, "%s: sending %d samples to rtrace...\n", |
261 |
|
progname, np); |
262 |
|
#endif |
263 |
< |
if (writebuf(fd_tort,(char *)pb,6*sizeof(float)*np) < 6*sizeof(float)*np |
264 |
< |
|| writebuf(fd_tort,(char *)nbuf,sizeof(nbuf)) < sizeof(nbuf)) { |
265 |
< |
fprintf(stderr, "%s: error writing to rtrace process\n", |
263 |
> |
bzero(pb+6*np, 6*sizeof(float)); |
264 |
> |
if (process(rt_pd, pb, pb, 3*sizeof(float)*np, |
265 |
> |
6*sizeof(float)*(np+1)) < 3*sizeof(float)*np) { |
266 |
> |
fprintf(stderr, "%s: rtrace communication error\n", |
267 |
|
progname); |
268 |
|
exit(1); |
269 |
|
} |
281 |
– |
if (readbuf(fd_fromrt, (char *)pb, 3*sizeof(float)*np) |
282 |
– |
< 3*sizeof(float)*np) { |
283 |
– |
fprintf(stderr, "%s: error reading from rtrace process\n", |
284 |
– |
progname); |
285 |
– |
exit(1); |
286 |
– |
} |
270 |
|
} |
271 |
|
|
272 |
|
|
273 |
|
getexpos(s) /* get exposure from header line */ |
274 |
|
char *s; |
275 |
|
{ |
276 |
+ |
char fmt[32]; |
277 |
+ |
|
278 |
|
if (isexpos(s)) |
279 |
|
exposure *= exposval(s); |
280 |
+ |
else if (isformat(s)) { |
281 |
+ |
formatval(fmt, s); |
282 |
+ |
wrongformat = strcmp(fmt, COLRFMT); |
283 |
+ |
} |
284 |
|
} |
285 |
|
|
286 |
|
|
292 |
|
exit(1); |
293 |
|
} |
294 |
|
exposure = 1.0; |
295 |
< |
getheader(pictfp, getexpos); |
296 |
< |
if (fgetresolu(&pxsiz, &pysiz, pictfp) != (YMAJOR|YDECR)) { |
297 |
< |
fprintf("%s: bad picture resolution\n", fn); |
295 |
> |
getheader(pictfp, getexpos, NULL); |
296 |
> |
if (wrongformat || |
297 |
> |
fgetresolu(&pxsiz, &pysiz, pictfp) != (YMAJOR|YDECR)) { |
298 |
> |
fprintf("%s: bad picture format\n", fn); |
299 |
|
exit(1); |
300 |
|
} |
301 |
|
initscans(); |
315 |
|
fork_rtrace(av) /* open pipe and start rtrace */ |
316 |
|
char *av[]; |
317 |
|
{ |
318 |
< |
int p0[2], p1[2]; |
318 |
> |
int rval; |
319 |
|
|
320 |
< |
if (pipe(p0) < 0 || pipe(p1) < 0) { |
320 |
> |
rval = open_process(rt_pd, av); |
321 |
> |
if (rval < 0) { |
322 |
|
perror(progname); |
323 |
|
exit(1); |
324 |
|
} |
325 |
< |
if ((rt_pid = vfork()) == 0) { /* if child */ |
326 |
< |
close(p0[1]); |
336 |
< |
close(p1[0]); |
337 |
< |
if (p0[0] != 0) { /* connect p0 to stdin */ |
338 |
< |
dup2(p0[0], 0); |
339 |
< |
close(p0[0]); |
340 |
< |
} |
341 |
< |
if (p1[1] != 0) { /* connect p1 to stdout */ |
342 |
< |
dup2(p1[1], 1); |
343 |
< |
close(p1[1]); |
344 |
< |
} |
345 |
< |
execvp(av[0], av); |
346 |
< |
perror(av[0]); |
347 |
< |
_exit(127); |
348 |
< |
} |
349 |
< |
if (rt_pid == -1) { |
350 |
< |
perror(progname); |
325 |
> |
if (rval == 0) { |
326 |
> |
fprintf(stderr, "%s: command not found\n", av[0]); |
327 |
|
exit(1); |
328 |
|
} |
329 |
< |
close(p0[0]); |
330 |
< |
close(p1[1]); |
331 |
< |
fd_tort = p0[1]; |
332 |
< |
fd_fromrt = p1[0]; |
329 |
> |
maxpix = rval/(6*sizeof(float)); |
330 |
> |
if (maxpix > MAXPIX) |
331 |
> |
maxpix = MAXPIX; |
332 |
> |
maxpix--; |
333 |
|
} |
334 |
|
|
335 |
|
|
336 |
|
done_rtrace() /* wait for rtrace to finish */ |
337 |
|
{ |
338 |
< |
int pid, status; |
338 |
> |
int status; |
339 |
|
|
340 |
< |
if (rt_pid == -1) |
341 |
< |
return; |
366 |
< |
close(fd_tort); |
367 |
< |
close(fd_fromrt); |
368 |
< |
while ((pid = wait(&status)) != -1 && pid != rt_pid) |
369 |
< |
; |
370 |
< |
if (pid == rt_pid && status != 0) { |
340 |
> |
status = close_process(rt_pd); |
341 |
> |
if (status > 0) { |
342 |
|
fprintf(stderr, "%s: bad status (%d) from rtrace\n", |
343 |
|
progname, status); |
344 |
|
exit(1); |
345 |
|
} |
346 |
< |
rt_pid = -1; |
346 |
> |
rt_pd[0] = -1; |
347 |
|
} |
348 |
|
|
349 |
|
|
379 |
– |
int |
380 |
– |
readbuf(fd, bpos, siz) |
381 |
– |
int fd; |
382 |
– |
char *bpos; |
383 |
– |
int siz; |
384 |
– |
{ |
385 |
– |
register int cc, nrem = siz; |
386 |
– |
|
387 |
– |
while (nrem > 0 && (cc = read(fd, bpos, nrem)) > 0) { |
388 |
– |
bpos += cc; |
389 |
– |
nrem -= cc; |
390 |
– |
} |
391 |
– |
if (cc < 0) |
392 |
– |
return(cc); |
393 |
– |
return(siz-nrem); |
394 |
– |
} |
395 |
– |
|
396 |
– |
|
397 |
– |
int |
398 |
– |
writebuf(fd, bpos, siz) |
399 |
– |
char *bpos; |
400 |
– |
int siz; |
401 |
– |
{ |
402 |
– |
register int cc, nrem = siz; |
403 |
– |
|
404 |
– |
while (nrem > 0 && (cc = write(fd, bpos, nrem)) > 0) { |
405 |
– |
bpos += cc; |
406 |
– |
nrem -= cc; |
407 |
– |
} |
408 |
– |
if (cc < 0) |
409 |
– |
return(cc); |
410 |
– |
return(siz-nrem); |
411 |
– |
} |
412 |
– |
|
413 |
– |
|
350 |
|
SCAN * |
351 |
|
scanretire() /* retire old scanlines to free list */ |
352 |
|
{ |
409 |
|
/* allocate scanline buffers */ |
410 |
|
scansize = sizeof(SCAN) + pxsiz*sizeof(COLR); |
411 |
|
#ifdef ALIGN |
412 |
< |
scansize = scansize+(sizeof(ALIGN)-1)) & ~(sizeof(ALIGN)-1); |
412 |
> |
scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1); |
413 |
|
#endif |
414 |
|
i = MAXSBUF / scansize; /* compute number to allocate */ |
415 |
|
if (i > HSIZE) |