173 |
|
char *binval = NULL; |
174 |
|
char fmt[8]; |
175 |
|
int i, j; |
176 |
+ |
/* need at least one argument */ |
177 |
+ |
if (argc < 2) { |
178 |
+ |
fprintf(stderr, |
179 |
+ |
"Usage: %s [-n nprocs][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n", |
180 |
+ |
argv[0]); |
181 |
+ |
exit(1); |
182 |
+ |
} |
183 |
|
/* global program name */ |
184 |
|
gargv = argv; |
185 |
|
/* initialize calcomp routines */ |
203 |
|
recover++; |
204 |
|
continue; |
205 |
|
case 'n': /* number of processes */ |
206 |
< |
if (argv[i][2] || i >= argc-1) break; |
206 |
> |
if (argv[i][2] || i >= argc-2) break; |
207 |
|
nprocs = atoi(argv[++i]); |
208 |
|
if (nprocs <= 0) |
209 |
|
error(USER, "illegal number of processes"); |
228 |
|
case 'f': /* file or i/o format */ |
229 |
|
if (!argv[i][2]) { |
230 |
|
char *fpath; |
231 |
< |
if (i >= argc-1) break; |
231 |
> |
if (i >= argc-2) break; |
232 |
|
fpath = getpath(argv[++i], |
233 |
|
getrlibpath(), R_OK); |
234 |
|
if (fpath == NULL) { |
243 |
|
setformat(argv[i]+2); |
244 |
|
continue; |
245 |
|
case 'e': /* expression */ |
246 |
< |
if (argv[i][2] || i >= argc-1) break; |
246 |
> |
if (argv[i][2] || i >= argc-2) break; |
247 |
|
scompile(argv[++i], NULL, 0); |
248 |
|
continue; |
249 |
|
case 'o': /* output file spec. */ |
250 |
< |
if (argv[i][2] || i >= argc-1) break; |
250 |
> |
if (argv[i][2] || i >= argc-2) break; |
251 |
|
curout = argv[++i]; |
252 |
|
continue; |
253 |
|
case 'x': /* horiz. output resolution */ |
254 |
< |
if (argv[i][2] || i >= argc-1) break; |
254 |
> |
if (argv[i][2] || i >= argc-2) break; |
255 |
|
xres = atoi(argv[++i]); |
256 |
|
continue; |
257 |
|
case 'y': /* vert. output resolution */ |
258 |
< |
if (argv[i][2] || i >= argc-1) break; |
258 |
> |
if (argv[i][2] || i >= argc-2) break; |
259 |
|
yres = atoi(argv[++i]); |
260 |
|
continue; |
261 |
|
case 'b': /* bin expression */ |
262 |
< |
if (argv[i][2] || i >= argc-1) break; |
262 |
> |
if (argv[i][2] || i >= argc-2) break; |
263 |
|
binval = argv[++i]; |
264 |
|
continue; |
265 |
|
case 'm': /* modifier name */ |
266 |
< |
if (argv[i][2] || i >= argc-1) break; |
266 |
> |
if (argv[i][2] || i >= argc-2) break; |
267 |
|
rtargv[rtargc++] = "-ti"; |
268 |
|
rtargv[rtargc++] = argv[++i]; |
269 |
|
addmodifier(argv[i], curout, binval); |
270 |
|
continue; |
271 |
|
case 'M': /* modifier file */ |
272 |
< |
if (argv[i][2] || i >= argc-1) break; |
272 |
> |
if (argv[i][2] || i >= argc-2) break; |
273 |
|
rtargv[rtargc++] = "-tI"; |
274 |
|
rtargv[rtargc++] = argv[++i]; |
275 |
|
addmodfile(argv[i], curout, binval); |
322 |
|
error(USER, "missing octree argument"); |
323 |
|
rtargv[rtargc++] = octree = argv[i]; |
324 |
|
rtargv[rtargc] = NULL; |
325 |
< |
/* start rtrace & compute contributions */ |
325 |
> |
/* start rtrace */ |
326 |
|
init(nprocs); |
327 |
|
if (recover) /* perform recovery if requested */ |
328 |
|
recover_output(stdin); |
329 |
< |
trace_contribs(stdin); |
329 |
> |
trace_contribs(stdin); /* compute contributions */ |
330 |
|
quit(0); |
331 |
|
} |
332 |
|
|
333 |
+ |
#ifndef SIGALRM |
334 |
+ |
#define SIGALRM SIGTERM |
335 |
+ |
#endif |
336 |
|
/* kill persistent rtrace process */ |
337 |
|
static void |
338 |
|
killpersist(void) |
339 |
|
{ |
340 |
|
FILE *fp = fopen(persistfn, "r"); |
341 |
< |
int pid; |
341 |
> |
RT_PID pid; |
342 |
|
|
343 |
|
if (fp == NULL) |
344 |
|
return; |
633 |
|
if (header) { |
634 |
|
char info[512]; |
635 |
|
char *cp = info; |
636 |
< |
if (ofl & OF_MODIFIER) { |
637 |
< |
sprintf(cp, "MODIFIER=%s\n", mname); |
628 |
< |
while (*cp) ++cp; |
629 |
< |
} |
636 |
> |
sprintf(cp, "MODIFIER=%s\n", mname); |
637 |
> |
while (*cp) ++cp; |
638 |
|
if (ofl & OF_BIN) { |
639 |
|
sprintf(cp, "BIN=%d\n", bn); |
640 |
|
while (*cp) ++cp; |
716 |
|
bn = (int)(evalue(mp->binv) + .5); |
717 |
|
if (bn <= 0) |
718 |
|
bn = 0; |
719 |
< |
else if (bn > mp->nbins) { /* new bin */ |
719 |
> |
else if (bn >= mp->nbins) { /* new bin */ |
720 |
|
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + |
721 |
|
bn*sizeof(DCOLOR)); |
722 |
|
if (mp == NULL) |
1040 |
|
error(USER, "cannot recover from command"); |
1041 |
|
/* open output */ |
1042 |
|
fp = fopen(oname, "rb+"); |
1043 |
< |
if (fp == NULL) |
1044 |
< |
break; /* must be end of modifier */ |
1043 |
> |
if (fp == NULL) { |
1044 |
> |
if (j) |
1045 |
> |
break; /* assume end of modifier */ |
1046 |
> |
sprintf(errmsg, "missing recover file '%s'", |
1047 |
> |
oname); |
1048 |
> |
error(USER, errmsg); |
1049 |
> |
} |
1050 |
|
nvals = lseek(fileno(fp), 0, SEEK_END); |
1051 |
|
if (nvals <= 0) { |
1052 |
|
lastout = 0; /* empty output, quit here */ |
1100 |
|
if (lastout < 0) { |
1101 |
|
error(WARNING, "no output files to recover"); |
1102 |
|
return; |
1103 |
+ |
} |
1104 |
+ |
if (raysleft && lastout >= raysleft) { |
1105 |
+ |
error(WARNING, "output appears to be complete"); |
1106 |
+ |
/* XXX should read & discard input? */ |
1107 |
+ |
quit(0); |
1108 |
|
} |
1109 |
|
/* seek on all files */ |
1110 |
|
nvals = lastout * outvsiz; |