5 |
|
* Gather rtrace output to compute contributions from particular sources |
6 |
|
*/ |
7 |
|
|
8 |
+ |
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX |
9 |
+ |
Need to refactor code by forking a subprocess for each |
10 |
+ |
rtrace call to take output and accumulate it into bins |
11 |
+ |
for the parent process. This will avoid our current |
12 |
+ |
bottleneck around processing output queues, computing |
13 |
+ |
bins and the associated buffer growth, which can be crazy |
14 |
+ |
(gigabytes/subprocess). Each child process will return |
15 |
+ |
a ray number and a fully computed and ready-to-output |
16 |
+ |
record of modifiers and their summed bins. These will |
17 |
+ |
be queued and sorted by the parent for ordered output. |
18 |
+ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ |
19 |
+ |
|
20 |
|
#include "standard.h" |
21 |
|
#include <ctype.h> |
22 |
|
#include <signal.h> |
28 |
|
#include "lookup.h" |
29 |
|
#include "calcomp.h" |
30 |
|
|
31 |
+ |
#ifdef _WIN32 |
32 |
+ |
typedef int ssize_t; |
33 |
+ |
#endif |
34 |
+ |
|
35 |
|
#ifndef MAXMODLIST |
36 |
|
#define MAXMODLIST 1024 /* maximum modifiers we'll track */ |
37 |
|
#endif |
38 |
|
|
39 |
< |
int treebufsiz = BUFSIZ; /* current tree buffer size */ |
39 |
> |
ssize_t treebufsiz = BUFSIZ; /* current tree buffer size */ |
40 |
|
|
41 |
|
typedef double DCOLOR[3]; /* double-precision color */ |
42 |
|
|
108 |
|
struct rtproc *next; /* next in list of processes */ |
109 |
|
SUBPROC pd; /* rtrace pipe descriptors */ |
110 |
|
unsigned long raynum; /* ray number for this tree */ |
111 |
< |
int bsiz; /* ray tree buffer length */ |
111 |
> |
size_t bsiz; /* ray tree buffer length */ |
112 |
|
char *buf; /* ray tree buffer */ |
113 |
< |
int nbr; /* number of bytes from rtrace */ |
113 |
> |
size_t nbr; /* number of bytes from rtrace */ |
114 |
|
}; /* rtrace process buffer */ |
115 |
|
|
116 |
|
/* rtrace command and defaults */ |
123 |
|
char *myrtopts[] = { "-h-", "-x", "1", "-y", "0", |
124 |
|
"-dt", "0", "-as", "0", "-aa", "0", NULL }; |
125 |
|
|
126 |
< |
#define RTCOEFF "-o~~TmWdp" /* compute coefficients only */ |
127 |
< |
#define RTCONTRIB "-o~~TmVdp" /* compute ray contributions */ |
126 |
> |
#define RTCOEFF "-o~~~TmWdp" /* compute coefficients only */ |
127 |
> |
#define RTCONTRIB "-o~~~TmVdp" /* compute ray contributions */ |
128 |
|
|
129 |
|
struct rtproc rt0; /* head of rtrace process list */ |
130 |
|
|
185 |
|
void add_contrib(const char *modn); |
186 |
|
void done_contrib(int navg); |
187 |
|
|
188 |
+ |
#ifdef getc_unlocked /* avoid nasty overheads */ |
189 |
+ |
#undef getc |
190 |
+ |
#define getc getc_unlocked |
191 |
+ |
#undef putc |
192 |
+ |
#define putc putc_unlocked |
193 |
+ |
#undef ferror |
194 |
+ |
#define ferror ferror_unlocked |
195 |
+ |
static int |
196 |
+ |
fread_unl(void *ptr, int size, int nitems, FILE *fp) |
197 |
+ |
{ |
198 |
+ |
char *p = (char *)ptr; |
199 |
+ |
int len = size*nitems; |
200 |
+ |
while (len-- > 0) { |
201 |
+ |
int c = getc_unlocked(fp); |
202 |
+ |
if (c == EOF) |
203 |
+ |
return((p - (char *)ptr)/size); |
204 |
+ |
*p++ = c; |
205 |
+ |
} |
206 |
+ |
return(nitems); |
207 |
+ |
} |
208 |
+ |
#undef fread |
209 |
+ |
#define fread fread_unl |
210 |
+ |
static int |
211 |
+ |
fwrite_unl(const void *ptr, int size, int nitems, FILE *fp) |
212 |
+ |
{ |
213 |
+ |
const char *p = (const char *)ptr; |
214 |
+ |
int len = size*nitems; |
215 |
+ |
while (len-- > 0) |
216 |
+ |
putc_unlocked(*p++, fp); |
217 |
+ |
if (ferror_unlocked(fp)) |
218 |
+ |
return(0); |
219 |
+ |
return(nitems); |
220 |
+ |
} |
221 |
+ |
#undef fwrite |
222 |
+ |
#define fwrite fwrite_unl |
223 |
+ |
#endif |
224 |
+ |
|
225 |
|
/* return number of open rtrace processes */ |
226 |
|
static int |
227 |
|
nrtprocs(void) |
431 |
|
rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF; |
432 |
|
/* just asking for defaults? */ |
433 |
|
if (!strcmp(argv[i], "-defaults")) { |
434 |
< |
char sxres[16], syres[16]; |
434 |
> |
char nps[8], sxres[16], syres[16]; |
435 |
|
char *rtpath; |
383 |
– |
printf("-n %-2d\t\t\t\t# number of processes\n", nprocs); |
436 |
|
printf("-c %-5d\t\t\t# accumulated rays per record\n", |
437 |
|
accumulate); |
438 |
|
printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-', |
439 |
|
contrib ? "contributions" : "coefficients"); |
440 |
|
fflush(stdout); /* report OUR options */ |
441 |
+ |
rtargv[rtargc++] = "-n"; |
442 |
+ |
sprintf(nps, "%d", nprocs); |
443 |
+ |
rtargv[rtargc++] = nps; |
444 |
|
rtargv[rtargc++] = header ? "-h+" : "-h-"; |
445 |
|
sprintf(fmt, "-f%c%c", inpfmt, outfmt); |
446 |
|
rtargv[rtargc++] = fmt; |
598 |
|
raysleft = 0; |
599 |
|
if ((account = accumulate) > 0) |
600 |
|
raysleft *= accumulate; |
601 |
< |
waitflush = xres; |
601 |
> |
waitflush = (yres > 0) & (xres > 1) ? 0 : xres; |
602 |
|
if (!recover) |
603 |
|
return; |
604 |
|
/* recover previous values */ |
755 |
|
printheader(FILE *fout, const char *info) |
756 |
|
{ |
757 |
|
extern char VersionID[]; |
758 |
< |
FILE *fin = fopen(octree, "r"); |
759 |
< |
|
760 |
< |
if (fin == NULL) |
761 |
< |
quit(1); |
762 |
< |
checkheader(fin, "ignore", fout); /* copy octree header */ |
763 |
< |
fclose(fin); |
758 |
> |
/* copy octree header */ |
759 |
> |
if (octree[0] == '!') { |
760 |
> |
newheader("RADIANCE", fout); |
761 |
> |
fputs(octree+1, fout); |
762 |
> |
if (octree[strlen(octree)-1] != '\n') |
763 |
> |
fputc('\n', fout); |
764 |
> |
} else { |
765 |
> |
FILE *fin = fopen(octree, "r"); |
766 |
> |
if (fin == NULL) |
767 |
> |
quit(1); |
768 |
> |
checkheader(fin, "ignore", fout); |
769 |
> |
fclose(fin); |
770 |
> |
} |
771 |
|
printargs(gargc-1, gargv, fout); /* add our command */ |
772 |
|
fprintf(fout, "SOFTWARE= %s\n", VersionID); |
773 |
|
fputnow(fout); |
796 |
|
{ |
797 |
|
if ((xr > 0) & (yr > 0)) /* resolution string */ |
798 |
|
fprtresolu(xr, yr, fout); |
737 |
– |
if (xres > 0) /* global flush flag */ |
738 |
– |
fflush(fout); |
799 |
|
} |
800 |
|
|
801 |
|
/* Get output stream pointer (open and write header if new and noopen==0) */ |
816 |
|
if (header) |
817 |
|
printheader(stdout, NULL); |
818 |
|
printresolu(stdout, xres, yres); |
819 |
+ |
if (waitflush > 0) |
820 |
+ |
fflush(stdout); |
821 |
|
stdos.xr = xres; stdos.yr = yres; |
822 |
|
using_stdout = 1; |
823 |
|
} |
859 |
|
goto openerr; |
860 |
|
if (outfmt != 'a') |
861 |
|
SET_FILE_BINARY(sop->ofp); |
862 |
+ |
#ifdef getc_unlocked /* avoid lock/unlock overhead */ |
863 |
+ |
flockfile(sop->ofp); |
864 |
+ |
#endif |
865 |
|
if (header) { |
866 |
|
char info[512]; |
867 |
|
char *cp = info; |
889 |
|
if (outfmt == 'a') |
890 |
|
putc('\n', sop->ofp); |
891 |
|
} |
892 |
< |
if (xres > 0) |
892 |
> |
if (waitflush > 0) |
893 |
|
fflush(sop->ofp); |
894 |
|
} |
895 |
|
sop->reclen += noopen; /* add to length if noopen */ |
927 |
|
return 0; /* dummy ray */ |
928 |
|
return strlen(buf); |
929 |
|
case 'f': |
930 |
< |
if (fread(buf, sizeof(float), 6, fp) < 6) |
930 |
> |
if (fread(buf, sizeof(float), 6, fp) != 6) |
931 |
|
return -1; |
932 |
|
fvp = (float *)buf + 3; |
933 |
|
if (DOT(fvp,fvp) <= FTINY*FTINY) |
934 |
|
return 0; /* dummy ray */ |
935 |
|
return sizeof(float)*6; |
936 |
|
case 'd': |
937 |
< |
if (fread(buf, sizeof(double), 6, fp) < 6) |
937 |
> |
if (fread(buf, sizeof(double), 6, fp) != 6) |
938 |
|
return -1; |
939 |
|
dvp = (double *)buf + 3; |
940 |
|
if (DOT(dvp,dvp) <= FTINY*FTINY) |
1056 |
|
if (using_stdout & (outfmt == 'a')) |
1057 |
|
putc('\n', stdout); |
1058 |
|
if (!waitflush) { |
1059 |
< |
waitflush = xres; |
1059 |
> |
waitflush = (yres > 0) & (xres > 1) ? 0 : xres; |
1060 |
|
if (using_stdout) |
1061 |
|
fflush(stdout); |
1062 |
|
} |
1138 |
|
{ |
1139 |
|
struct rtproc *rtfree = NULL; |
1140 |
|
fd_set readset, errset; |
1141 |
< |
int nr; |
1141 |
> |
ssize_t nr; |
1142 |
|
struct rtproc *rt; |
1143 |
|
int n; |
1144 |
|
|
1169 |
|
continue; |
1170 |
|
if (rt->buf == NULL) { |
1171 |
|
rt->bsiz = treebufsiz; |
1172 |
< |
rt->buf = (char *)malloc(treebufsiz); |
1172 |
> |
rt->buf = (char *)malloc(rt->bsiz); |
1173 |
|
} else if (rt->nbr + BUFSIZ > rt->bsiz) { |
1174 |
|
if (rt->bsiz + BUFSIZ <= treebufsiz) |
1175 |
|
rt->bsiz = treebufsiz; |
1176 |
< |
else |
1177 |
< |
treebufsiz = rt->bsiz += BUFSIZ; |
1176 |
> |
else if ((treebufsiz = rt->bsiz += BUFSIZ) < 0) |
1177 |
> |
error(INTERNAL, |
1178 |
> |
"ray buffer does not fit memory"); |
1179 |
|
rt->buf = (char *)realloc(rt->buf, rt->bsiz); |
1180 |
|
} |
1181 |
|
if (rt->buf == NULL) |
1182 |
|
error(SYSTEM, "out of memory in wait_rproc"); |
1183 |
< |
nr = read(rt->pd.r, rt->buf+rt->nbr, rt->bsiz-rt->nbr); |
1184 |
< |
if (nr <= 0) |
1183 |
> |
nr = rt->bsiz - rt->nbr; |
1184 |
> |
if (nr & ~0x7fffffff) /* avoid 32-bit OS issues */ |
1185 |
> |
nr = 0x7fffffff; |
1186 |
> |
nr = read(rt->pd.r, rt->buf+rt->nbr, nr); |
1187 |
> |
if (nr < 0) |
1188 |
> |
error(SYSTEM, "read error from rtrace"); |
1189 |
> |
if (!nr) |
1190 |
|
error(USER, "rtrace process died"); |
1191 |
|
rt->nbr += nr; /* advance & check */ |
1192 |
< |
if (rt->nbr >= 4 && !memcmp(rt->buf+rt->nbr-4, |
1193 |
< |
"~\t~\t", 4)) { |
1194 |
< |
rt->nbr -= 4; /* elide terminator */ |
1192 |
> |
if (rt->nbr >= 6 && !memcmp(rt->buf+rt->nbr-6, |
1193 |
> |
"~\t~\t~\t", 6)) { |
1194 |
> |
rt->nbr -= 6; /* elide terminator */ |
1195 |
|
queue_raytree(rt); |
1196 |
|
rtfree = rt; /* ready for next ray */ |
1197 |
|
} |
1233 |
|
lastray+1 < lastray) { |
1234 |
|
while (wait_rproc() != NULL) |
1235 |
|
process_queue(); |
1236 |
< |
if (lastray+1 < lastray) |
1166 |
< |
lastdone = lastray = 0; |
1236 |
> |
lastdone = lastray = 0; |
1237 |
|
} |
1238 |
|
rtp = get_rproc(); /* get avail. rtrace process */ |
1239 |
|
rtp->raynum = ++lastray; /* assign ray */ |
1367 |
|
error(WARNING, errmsg); |
1368 |
|
break; |
1369 |
|
} |
1370 |
+ |
#ifdef getc_unlocked /* avoid lock/unlock overhead */ |
1371 |
+ |
flockfile(sout.ofp); |
1372 |
+ |
#endif |
1373 |
|
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
1374 |
|
sprintf(errmsg, "format mismatch for '%s'", |
1375 |
|
oname); |