9 |
|
#include <stdio.h> |
10 |
|
#include <signal.h> |
11 |
|
#include <sys/types.h> |
12 |
– |
#include <sys/wait.h> |
12 |
|
|
13 |
|
#include "platform.h" |
14 |
< |
#include "rtio.h" |
15 |
< |
#include "rtmisc.h" |
14 |
> |
#ifndef NON_POSIX /* XXX need abstraction for process management */ |
15 |
> |
#include <sys/wait.h> |
16 |
> |
#endif |
17 |
> |
|
18 |
> |
#include "standard.h" |
19 |
|
#include "color.h" |
20 |
|
#include "view.h" |
21 |
|
#include "rtprocess.h" |
37 |
|
#ifndef NFS |
38 |
|
#define NFS 1 |
39 |
|
#endif |
40 |
< |
/* set the following to 0 to forgo forking */ |
40 |
> |
|
41 |
> |
#ifndef RHAS_FORK_EXEC |
42 |
> |
#undef MAXFORK |
43 |
> |
#define MAXFORK 0 |
44 |
> |
#endif |
45 |
|
#ifndef MAXFORK |
46 |
|
#if NFS |
47 |
|
#define MAXFORK 3 /* allotment of duped processes */ |
82 |
|
|
83 |
|
char *progname; |
84 |
|
int verbose = 0; |
85 |
+ |
int nowarn = 0; |
86 |
|
unsigned timelim = 0; |
87 |
|
int rvrlim = -1; |
88 |
|
|
105 |
|
char *argv[] |
106 |
|
) |
107 |
|
{ |
108 |
< |
register int i, rval; |
108 |
> |
int i, rval; |
109 |
|
|
110 |
|
progname = argv[0]; |
111 |
|
for (i = 1; i < argc; i++) { |
113 |
|
while ((rval = expandarg(&argc, &argv, i)) > 0) |
114 |
|
; |
115 |
|
if (rval < 0) { |
116 |
< |
fprintf(stderr, "%s: cannot expand '%s'", |
116 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
117 |
|
argv[0], argv[i]); |
118 |
|
exit(1); |
119 |
|
} |
120 |
|
if (argv[i][0] == '-') |
121 |
|
switch (argv[i][1]) { |
122 |
+ |
case 'w': |
123 |
+ |
if (!argv[i][2]) |
124 |
+ |
nowarn = !nowarn; |
125 |
+ |
else if (argv[i][2] == '+') |
126 |
+ |
nowarn = 0; |
127 |
+ |
else if (argv[i][2] == '-') |
128 |
+ |
nowarn = 1; |
129 |
+ |
break; |
130 |
|
case 'v': |
131 |
|
switch (argv[i][2]) { |
132 |
|
case '\0': /* verbose option */ |
149 |
|
} |
150 |
|
break; |
151 |
|
case 'p': /* pixel aspect ratio? */ |
152 |
+ |
if (argv[i][2] == 'm') { |
153 |
+ |
fprintf(stderr, "%s: -pm unsupported\n", |
154 |
+ |
argv[0]); |
155 |
+ |
++i; |
156 |
+ |
continue; |
157 |
+ |
} |
158 |
|
if (argv[i][2] != 'a' || argv[i][3]) |
159 |
|
break; |
160 |
|
pixaspect = atof(argv[++i]); |
163 |
|
if (argv[i][2]) |
164 |
|
break; |
165 |
|
timelim = atof(argv[++i])*3600. + .5; |
166 |
< |
break; |
166 |
> |
continue; |
167 |
|
case 'x': /* overall x resolution */ |
168 |
|
if (argv[i][2]) |
169 |
|
break; |
208 |
|
break; |
209 |
|
outfile = argv[++i]; |
210 |
|
continue; |
211 |
< |
} else if (i >= argc-1) |
212 |
< |
break; |
211 |
> |
} |
212 |
> |
else if (i >= argc-1) |
213 |
> |
break; |
214 |
|
rpargv[rpargc++] = argv[i]; |
215 |
|
} |
216 |
|
if (i >= argc) { |
239 |
|
if (fcntl(fd, F_SETLKW, &fls) < 0) { |
240 |
|
fprintf(stderr, "%s: cannot lock/unlock file: %s\n", |
241 |
|
progname, strerror(errno)); |
242 |
< |
exit(1); |
242 |
> |
_exit(1); |
243 |
|
} |
244 |
|
} |
245 |
|
|
267 |
|
sflock(F_UNLCK); |
268 |
|
} |
269 |
|
/* compute piece size */ |
270 |
+ |
hr = hres; vr = vres; |
271 |
+ |
if (pixaspect > FTINY) |
272 |
+ |
normaspect(viewaspect(&ourview), &pixaspect, &hr, &vr); |
273 |
|
hres /= hmult; |
274 |
|
vres /= vmult; |
275 |
+ |
if (hres <= 0 || vres <= 0) { |
276 |
+ |
fprintf(stderr, "%s: illegal resolution/subdivision\n", progname); |
277 |
+ |
exit(1); |
278 |
+ |
} |
279 |
|
normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); |
280 |
+ |
if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult)) |
281 |
+ |
fprintf(stderr, |
282 |
+ |
"%s: warning - changed resolution from %dx%d to %dx%d\n", |
283 |
+ |
progname, hr, vr, hres*hmult, vres*vmult); |
284 |
|
sprintf(hrbuf, "%d", hres); |
285 |
|
rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf; |
286 |
|
sprintf(vrbuf, "%d", vres); |
299 |
|
fputs(VIEWSTR, fp); |
300 |
|
fprintview(&ourview, fp); |
301 |
|
putc('\n', fp); |
302 |
+ |
fputnow(fp); |
303 |
|
if (pixaspect < .99 || pixaspect > 1.01) |
304 |
|
fputaspect(pixaspect, fp); |
305 |
|
fputformat(COLRFMT, fp); |
396 |
|
|
397 |
|
static int |
398 |
|
rvrpiece( /* check for recoverable pieces */ |
399 |
< |
register int *xp, |
400 |
< |
register int *yp |
399 |
> |
int *xp, |
400 |
> |
int *yp |
401 |
|
) |
402 |
|
{ |
403 |
|
static char *pdone = NULL; /* which pieces are done */ |
404 |
|
static long readpos = -1; /* how far we've read */ |
405 |
< |
register int i; |
405 |
> |
int px, py, i; |
406 |
|
/* |
407 |
|
* This routine is called by nextpiece() with an |
408 |
|
* exclusive lock on syncfp and the file pointer at the |
411 |
|
if (rvrlim < 0) |
412 |
|
return(0); /* only check if asked */ |
413 |
|
if (pdone == NULL) /* first call */ |
414 |
< |
pdone = calloc(hmult*vmult, sizeof(char)); |
414 |
> |
pdone = (char *)calloc(hmult*vmult, sizeof(char)); |
415 |
|
if (pdone == NULL) { |
416 |
|
fprintf(stderr, "%s: out of memory\n", progname); |
417 |
|
exit(1); |
418 |
|
} |
419 |
|
if (readpos != -1) /* mark what's been done */ |
420 |
|
fseek(syncfp, readpos, 0); |
421 |
< |
while (fscanf(syncfp, "%d %d", xp, yp) == 2) |
422 |
< |
pdone[*xp*vmult+*yp] = 1; |
421 |
> |
while (fscanf(syncfp, "%d %d", &px, &py) == 2) |
422 |
> |
pdone[px*vmult+py] = 1; |
423 |
|
if (!feof(syncfp)) { |
424 |
|
fprintf(stderr, "%s: format error in sync file\n", progname); |
425 |
|
exit(1); |
466 |
|
pview = ourview; |
467 |
|
switch (ourview.type) { |
468 |
|
case VT_PER: |
469 |
< |
pview.horiz = 2.*180./PI*atan( |
470 |
< |
tan(PI/180./2.*ourview.horiz)/hmult ); |
471 |
< |
pview.vert = 2.*180./PI*atan( |
472 |
< |
tan(PI/180./2.*ourview.vert)/vmult ); |
469 |
> |
pview.horiz = (2.*180./PI)*atan( |
470 |
> |
tan((PI/180./2.)*ourview.horiz)/hmult ); |
471 |
> |
pview.vert = (2.*180./PI)*atan( |
472 |
> |
tan((PI/180./2.)*ourview.vert)/vmult ); |
473 |
|
break; |
474 |
|
case VT_PAR: |
475 |
|
case VT_ANG: |
478 |
|
break; |
479 |
|
case VT_CYL: |
480 |
|
pview.horiz = ourview.horiz / hmult; |
481 |
< |
pview.vert = 2.*180./PI*atan( |
482 |
< |
tan(PI/180./2.*ourview.vert)/vmult ); |
481 |
> |
pview.vert = (2.*180./PI)*atan( |
482 |
> |
tan((PI/180./2.)*ourview.vert)/vmult ); |
483 |
|
break; |
484 |
|
case VT_HEM: |
485 |
< |
pview.horiz = 2.*180./PI*asin( |
486 |
< |
sin(PI/180./2.*ourview.horiz)/hmult ); |
487 |
< |
pview.vert = 2.*180./PI*asin( |
488 |
< |
sin(PI/180./2.*ourview.vert)/vmult ); |
485 |
> |
pview.horiz = (2.*180./PI)*asin( |
486 |
> |
sin((PI/180./2.)*ourview.horiz)/hmult ); |
487 |
> |
pview.vert = (2.*180./PI)*asin( |
488 |
> |
sin((PI/180./2.)*ourview.vert)/vmult ); |
489 |
|
break; |
490 |
+ |
case VT_PLS: |
491 |
+ |
pview.horiz = sin((PI/180./2.)*ourview.horiz) / |
492 |
+ |
(1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult; |
493 |
+ |
pview.horiz *= pview.horiz; |
494 |
+ |
pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) / |
495 |
+ |
(1. + pview.horiz)); |
496 |
+ |
pview.vert = sin((PI/180./2.)*ourview.vert) / |
497 |
+ |
(1.0 + cos((PI/180./2.)*ourview.vert)) / vmult; |
498 |
+ |
pview.vert *= pview.vert; |
499 |
+ |
pview.vert = (2.*180./PI)*acos((1. - pview.vert) / |
500 |
+ |
(1. + pview.vert)); |
501 |
+ |
break; |
502 |
|
default: |
503 |
|
fprintf(stderr, "%s: unknown view type '-vt%c'\n", |
504 |
|
progname, ourview.type); |
526 |
|
struct flock fls; |
527 |
|
int pid, status; |
528 |
|
int hr, vr; |
529 |
< |
register int y; |
529 |
> |
int y; |
530 |
|
/* check bounds */ |
531 |
|
if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) { |
532 |
|
fprintf(stderr, "%s: requested piece (%d,%d) out of range\n", |
577 |
|
/* lock file section so NFS doesn't mess up */ |
578 |
|
fls.l_whence = 0; |
579 |
|
fls.l_type = F_WRLCK; |
580 |
+ |
#if 0 |
581 |
|
if (fcntl(outfd, F_SETLKW, &fls) < 0) |
582 |
|
filerr("lock"); |
583 |
+ |
#else |
584 |
+ |
dolock(outfd, F_WRLCK); |
585 |
|
#endif |
586 |
+ |
#endif |
587 |
|
/* write new piece to file */ |
588 |
|
if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0) |
589 |
|
filerr("seek"); |
603 |
|
} |
604 |
|
#if NFS |
605 |
|
fls.l_type = F_UNLCK; /* release lock */ |
606 |
+ |
#if 0 |
607 |
|
if (fcntl(outfd, F_SETLKW, &fls) < 0) |
608 |
|
filerr("lock"); |
609 |
+ |
#else |
610 |
+ |
dolock(outfd, F_UNLCK); |
611 |
+ |
#endif |
612 |
|
#endif |
613 |
|
if (verbose) { /* notify caller */ |
614 |
|
printf("%d %d done\n", xpos, ypos); |