16 |
|
#include "lookup.h" |
17 |
|
#include "calcomp.h" |
18 |
|
|
19 |
+ |
#ifndef MAXMODLIST |
20 |
|
#define MAXMODLIST 1024 /* maximum modifiers we'll track */ |
21 |
+ |
#endif |
22 |
|
|
23 |
|
int treebufsiz = BUFSIZ; /* current tree buffer size */ |
24 |
|
|
74 |
|
}; /* rtrace process buffer */ |
75 |
|
|
76 |
|
/* rtrace command and defaults */ |
77 |
< |
char *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3", |
77 |
> |
char *rtargv[256+2*MAXMODLIST] = { "rtrace", |
78 |
> |
"-dj", ".5", "-dr", "3", |
79 |
|
"-ab", "1", "-ad", "128", }; |
80 |
|
int rtargc = 9; |
81 |
|
/* overriding rtrace options */ |
113 |
|
int nmods = 0; /* number of modifiers */ |
114 |
|
|
115 |
|
MODCONT *addmodifier(char *modn, char *outf, char *binv); |
116 |
+ |
void addmodfile(char *fname, char *outf, char *binv); |
117 |
|
|
118 |
|
void init(int np); |
119 |
|
int done_rprocs(struct rtproc *rtp); |
196 |
|
recover++; |
197 |
|
continue; |
198 |
|
case 'n': /* number of processes */ |
199 |
< |
if (argv[i][2] || i >= argc-1) break; |
199 |
> |
if (argv[i][2] || i >= argc-2) break; |
200 |
|
nprocs = atoi(argv[++i]); |
201 |
|
if (nprocs <= 0) |
202 |
|
error(USER, "illegal number of processes"); |
221 |
|
case 'f': /* file or i/o format */ |
222 |
|
if (!argv[i][2]) { |
223 |
|
char *fpath; |
224 |
< |
if (i >= argc-1) break; |
224 |
> |
if (i >= argc-2) break; |
225 |
|
fpath = getpath(argv[++i], |
226 |
|
getrlibpath(), R_OK); |
227 |
|
if (fpath == NULL) { |
236 |
|
setformat(argv[i]+2); |
237 |
|
continue; |
238 |
|
case 'e': /* expression */ |
239 |
< |
if (argv[i][2] || i >= argc-1) break; |
239 |
> |
if (argv[i][2] || i >= argc-2) break; |
240 |
|
scompile(argv[++i], NULL, 0); |
241 |
|
continue; |
242 |
|
case 'o': /* output file spec. */ |
243 |
< |
if (argv[i][2] || i >= argc-1) break; |
243 |
> |
if (argv[i][2] || i >= argc-2) break; |
244 |
|
curout = argv[++i]; |
245 |
|
continue; |
246 |
|
case 'x': /* horiz. output resolution */ |
247 |
< |
if (argv[i][2] || i >= argc-1) break; |
247 |
> |
if (argv[i][2] || i >= argc-2) break; |
248 |
|
xres = atoi(argv[++i]); |
249 |
|
continue; |
250 |
|
case 'y': /* vert. output resolution */ |
251 |
< |
if (argv[i][2] || i >= argc-1) break; |
251 |
> |
if (argv[i][2] || i >= argc-2) break; |
252 |
|
yres = atoi(argv[++i]); |
253 |
|
continue; |
254 |
|
case 'b': /* bin expression */ |
255 |
< |
if (argv[i][2] || i >= argc-1) break; |
255 |
> |
if (argv[i][2] || i >= argc-2) break; |
256 |
|
binval = argv[++i]; |
257 |
|
continue; |
258 |
|
case 'm': /* modifier name */ |
259 |
< |
if (argv[i][2] || i >= argc-1) break; |
259 |
> |
if (argv[i][2] || i >= argc-2) break; |
260 |
|
rtargv[rtargc++] = "-ti"; |
261 |
|
rtargv[rtargc++] = argv[++i]; |
262 |
|
addmodifier(argv[i], curout, binval); |
263 |
|
continue; |
264 |
+ |
case 'M': /* modifier file */ |
265 |
+ |
if (argv[i][2] || i >= argc-2) break; |
266 |
+ |
rtargv[rtargc++] = "-tI"; |
267 |
+ |
rtargv[rtargc++] = argv[++i]; |
268 |
+ |
addmodfile(argv[i], curout, binval); |
269 |
+ |
continue; |
270 |
|
} |
271 |
|
rtargv[rtargc++] = argv[i]; /* assume rtrace option */ |
272 |
|
} |
462 |
|
return mp; |
463 |
|
} |
464 |
|
|
465 |
+ |
/* add modifiers from a file list */ |
466 |
+ |
void |
467 |
+ |
addmodfile(char *fname, char *outf, char *binv) |
468 |
+ |
{ |
469 |
+ |
char *mname[MAXMODLIST]; |
470 |
+ |
int i; |
471 |
+ |
/* find the file & store strings */ |
472 |
+ |
if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) { |
473 |
+ |
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
474 |
+ |
error(SYSTEM, errmsg); |
475 |
+ |
} |
476 |
+ |
for (i = 0; mname[i]; i++) /* add each one */ |
477 |
+ |
addmodifier(mname[i], outf, binv); |
478 |
+ |
} |
479 |
+ |
|
480 |
|
/* put string to stderr */ |
481 |
|
void |
482 |
|
eputs(char *s) |
623 |
|
if (header) { |
624 |
|
char info[512]; |
625 |
|
char *cp = info; |
626 |
< |
if (ofl & OF_MODIFIER) { |
627 |
< |
sprintf(cp, "MODIFIER=%s\n", mname); |
603 |
< |
while (*cp) ++cp; |
604 |
< |
} |
626 |
> |
sprintf(cp, "MODIFIER=%s\n", mname); |
627 |
> |
while (*cp) ++cp; |
628 |
|
if (ofl & OF_BIN) { |
629 |
|
sprintf(cp, "BIN=%d\n", bn); |
630 |
|
while (*cp) ++cp; |
1068 |
|
break; /* no bin separation */ |
1069 |
|
} |
1070 |
|
if (!lastout) { /* empty output */ |
1071 |
< |
error(WARNING, "no data to recover"); |
1071 |
> |
error(WARNING, "no previous data to recover"); |
1072 |
|
lu_done(&ofiletab); /* reclose all outputs */ |
1073 |
|
return; |
1074 |
|
} |
1081 |
|
mp->nbins = j; |
1082 |
|
ment->data = (char *)mp; |
1083 |
|
} |
1084 |
+ |
} |
1085 |
+ |
if (lastout < 0) { |
1086 |
+ |
error(WARNING, "no output files to recover"); |
1087 |
+ |
return; |
1088 |
|
} |
1089 |
|
/* seek on all files */ |
1090 |
|
nvals = lastout * outvsiz; |