7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
– |
#include <sys/types.h> |
10 |
|
#include <signal.h> |
11 |
|
|
12 |
|
#include "platform.h" |
13 |
|
#include "rtprocess.h" /* getpid() */ |
14 |
+ |
#include "resolu.h" |
15 |
|
#include "ray.h" |
16 |
|
#include "source.h" |
17 |
|
#include "ambient.h" |
18 |
|
#include "random.h" |
19 |
|
#include "paths.h" |
20 |
|
|
21 |
+ |
extern char *progname; /* global argv[0] */ |
22 |
+ |
|
23 |
+ |
extern char *shm_boundary; /* boundary of shared memory */ |
24 |
+ |
|
25 |
|
/* persistent processes define */ |
26 |
|
#ifdef F_SETLKW |
27 |
|
#define PERSIST 1 /* normal persist */ |
29 |
|
#define PCHILD 3 /* child of normal persist */ |
30 |
|
#endif |
31 |
|
|
32 |
< |
char *progname; /* argv[0] */ |
32 |
> |
char *sigerr[NSIG]; /* signal error messages */ |
33 |
> |
char *errfile = NULL; /* error output file */ |
34 |
|
|
35 |
< |
char *octname; /* octree name */ |
35 |
> |
int nproc = 1; /* number of processes */ |
36 |
|
|
37 |
< |
char *sigerr[NSIG]; /* signal error messages */ |
37 |
> |
extern char *formstr(); /* string from format */ |
38 |
> |
int inform = 'a'; /* input format */ |
39 |
> |
int outform = 'a'; /* output format */ |
40 |
> |
char *outvals = "v"; /* output specification */ |
41 |
|
|
42 |
< |
char *shm_boundary = NULL; /* boundary of shared memory */ |
42 |
> |
int hresolu = 0; /* horizontal (scan) size */ |
43 |
> |
int vresolu = 0; /* vertical resolution */ |
44 |
|
|
45 |
< |
char *errfile = NULL; /* error output file */ |
45 |
> |
int imm_irrad = 0; /* compute immediate irradiance? */ |
46 |
> |
int lim_dist = 0; /* limit distance? */ |
47 |
|
|
48 |
< |
extern char *formstr(); /* string from format */ |
49 |
< |
extern int inform; /* input format */ |
50 |
< |
extern int outform; /* output format */ |
41 |
< |
extern char *outvals; /* output values */ |
48 |
> |
#ifndef MAXMODLIST |
49 |
> |
#define MAXMODLIST 1024 /* maximum modifiers we'll track */ |
50 |
> |
#endif |
51 |
|
|
52 |
< |
extern int hresolu; /* horizontal resolution */ |
53 |
< |
extern int vresolu; /* vertical resolution */ |
52 |
> |
extern void (*addobjnotify[])(); /* object notification calls */ |
53 |
> |
extern void tranotify(OBJECT obj); |
54 |
|
|
55 |
< |
extern int imm_irrad; /* compute immediate irradiance? */ |
56 |
< |
extern int lim_dist; /* limit distance? */ |
55 |
> |
char *tralist[MAXMODLIST]; /* list of modifers to trace (or no) */ |
56 |
> |
int traincl = -1; /* include == 1, exclude == 0 */ |
57 |
|
|
58 |
< |
extern char *tralist[]; /* list of modifers to trace (or no) */ |
50 |
< |
extern int traincl; /* include == 1, exclude == 0 */ |
58 |
> |
static int loadflags = ~IO_FILES; /* what to load from octree */ |
59 |
|
|
60 |
< |
void onsig(int); |
61 |
< |
void sigdie(int, char*); |
62 |
< |
void printdefaults(void); |
60 |
> |
static void onsig(int signo); |
61 |
> |
static void sigdie(int signo, char *msg); |
62 |
> |
static void printdefaults(void); |
63 |
|
|
64 |
|
|
65 |
|
int |
66 |
< |
main(argc, argv) |
59 |
< |
int argc; |
60 |
< |
char *argv[]; |
66 |
> |
main(int argc, char *argv[]) |
67 |
|
{ |
68 |
|
#define check(ol,al) if (argv[i][ol] || \ |
69 |
|
badarg(argc-i-1,argv+i+1,al)) \ |
75 |
|
case 'n': case 'N': case 'f': case 'F': \ |
76 |
|
case '-': case '0': var = 0; break; \ |
77 |
|
default: goto badopt; } |
72 |
– |
int loadflags = ~IO_FILES; |
78 |
|
int persist = 0; |
79 |
+ |
char *octnm = NULL; |
80 |
|
char **tralp; |
81 |
|
int duped1; |
82 |
|
int rval; |
83 |
|
int i; |
84 |
|
/* global program name */ |
85 |
|
progname = argv[0] = fixargv0(argv[0]); |
86 |
+ |
/* add trace notify function */ |
87 |
+ |
for (i = 0; addobjnotify[i] != NULL; i++) |
88 |
+ |
; |
89 |
+ |
addobjnotify[i] = tranotify; |
90 |
+ |
/* set our defaults */ |
91 |
+ |
rand_samp = 1; |
92 |
+ |
maxdepth = -10; |
93 |
+ |
minweight = 2e-3; |
94 |
|
/* option city */ |
95 |
|
for (i = 1; i < argc; i++) { |
96 |
|
/* expand arguments */ |
117 |
|
continue; |
118 |
|
} |
119 |
|
switch (argv[i][1]) { |
120 |
+ |
case 'n': /* number of cores */ |
121 |
+ |
check(2,"i"); |
122 |
+ |
nproc = atoi(argv[++i]); |
123 |
+ |
if (nproc <= 0) |
124 |
+ |
error(USER, "bad number of processes"); |
125 |
+ |
break; |
126 |
|
case 'x': /* x resolution */ |
127 |
|
check(2,"i"); |
128 |
|
hresolu = atoi(argv[++i]); |
249 |
|
goto badopt; |
250 |
|
} |
251 |
|
} |
252 |
+ |
if (nproc > 1) { |
253 |
+ |
if (persist) |
254 |
+ |
error(USER, "multiprocessing incompatible with persist file"); |
255 |
+ |
if (hresolu > 0 && hresolu < nproc) |
256 |
+ |
error(WARNING, "number of cores should not exceed horizontal resolution"); |
257 |
+ |
if (trace != NULL) |
258 |
+ |
error(WARNING, "multiprocessing does not work properly with trace mode"); |
259 |
+ |
} |
260 |
|
/* initialize object types */ |
261 |
|
initotypes(); |
262 |
|
/* initialize urand */ |
263 |
< |
initurand(2048); |
263 |
> |
if (rand_samp) { |
264 |
> |
srandom((long)time(0)); |
265 |
> |
initurand(0); |
266 |
> |
} else { |
267 |
> |
srandom(0L); |
268 |
> |
initurand(2048); |
269 |
> |
} |
270 |
|
/* set up signal handling */ |
271 |
|
sigdie(SIGINT, "Interrupt"); |
272 |
|
#ifdef SIGHUP |
298 |
|
#endif |
299 |
|
/* get octree */ |
300 |
|
if (i == argc) |
301 |
< |
octname = NULL; |
301 |
> |
octnm = NULL; |
302 |
|
else if (i == argc-1) |
303 |
< |
octname = argv[i]; |
303 |
> |
octnm = argv[i]; |
304 |
|
else |
305 |
|
goto badopt; |
306 |
< |
if (octname == NULL) |
306 |
> |
if (octnm == NULL) |
307 |
|
error(USER, "missing octree argument"); |
308 |
|
/* set up output */ |
309 |
|
#ifdef PERSIST |
312 |
|
openheader(); |
313 |
|
} |
314 |
|
#endif |
281 |
– |
#ifdef _WIN32 |
315 |
|
if (outform != 'a') |
316 |
|
SET_FILE_BINARY(stdout); |
317 |
< |
if (octname == NULL) |
285 |
< |
SET_FILE_BINARY(stdin); |
286 |
< |
#endif |
287 |
< |
readoct(octname, loadflags, &thescene, NULL); |
317 |
> |
readoct(octnm, loadflags, &thescene, NULL); |
318 |
|
nsceneobjs = nobjects; |
319 |
|
|
320 |
|
if (loadflags & IO_INFO) { /* print header */ |
342 |
|
while ((rval=fork()) == 0) { /* keep on forkin' */ |
343 |
|
pflock(1); |
344 |
|
pfhold(); |
345 |
+ |
ambsync(); /* load new values */ |
346 |
|
} |
347 |
|
if (rval < 0) |
348 |
|
error(SYSTEM, "cannot fork child for persist function"); |
349 |
< |
pfdetach(); /* parent exits */ |
349 |
> |
pfdetach(); /* parent will run then exit */ |
350 |
|
} |
351 |
|
} |
352 |
|
runagain: |
354 |
|
dupheader(); /* send header to stdout */ |
355 |
|
#endif |
356 |
|
/* trace rays */ |
357 |
< |
rtrace(NULL); |
357 |
> |
rtrace(NULL, nproc); |
358 |
|
/* flush ambient file */ |
359 |
|
ambsync(); |
360 |
|
#ifdef PERSIST |
369 |
|
} |
370 |
|
} |
371 |
|
if (persist == PCHILD) { /* wait for a signal then go again */ |
341 |
– |
close(duped1); /* release output handle */ |
372 |
|
pfhold(); |
373 |
|
raynum = nrays = 0; /* reinitialize */ |
374 |
|
goto runagain; |
379 |
|
badopt: |
380 |
|
sprintf(errmsg, "command line error at '%s'", argv[i]); |
381 |
|
error(USER, errmsg); |
382 |
+ |
return 1; /* pro forma return */ |
383 |
|
|
384 |
|
#undef check |
385 |
|
#undef bool |
387 |
|
|
388 |
|
|
389 |
|
void |
390 |
< |
wputs(s) /* warning output function */ |
391 |
< |
char *s; |
390 |
> |
wputs( /* warning output function */ |
391 |
> |
char *s |
392 |
> |
) |
393 |
|
{ |
394 |
|
int lasterrno = errno; |
395 |
|
eputs(s); |
398 |
|
|
399 |
|
|
400 |
|
void |
401 |
< |
eputs(s) /* put string to stderr */ |
402 |
< |
register char *s; |
401 |
> |
eputs( /* put string to stderr */ |
402 |
> |
register char *s |
403 |
> |
) |
404 |
|
{ |
405 |
|
static int midline = 0; |
406 |
|
|
418 |
|
} |
419 |
|
|
420 |
|
|
421 |
< |
void |
422 |
< |
onsig(signo) /* fatal signal */ |
423 |
< |
int signo; |
421 |
> |
static void |
422 |
> |
onsig( /* fatal signal */ |
423 |
> |
int signo |
424 |
> |
) |
425 |
|
{ |
426 |
|
static int gotsig = 0; |
427 |
|
|
439 |
|
} |
440 |
|
|
441 |
|
|
442 |
< |
void |
443 |
< |
sigdie(signo, msg) /* set fatal signal */ |
444 |
< |
int signo; |
445 |
< |
char *msg; |
442 |
> |
static void |
443 |
> |
sigdie( /* set fatal signal */ |
444 |
> |
int signo, |
445 |
> |
char *msg |
446 |
> |
) |
447 |
|
{ |
448 |
|
if (signal(signo, onsig) == SIG_IGN) |
449 |
|
signal(signo, SIG_IGN); |
451 |
|
} |
452 |
|
|
453 |
|
|
454 |
< |
void |
454 |
> |
static void |
455 |
|
printdefaults(void) /* print default values to stdout */ |
456 |
|
{ |
457 |
|
register char *cp; |
458 |
|
|
459 |
|
if (imm_irrad) |
460 |
|
printf("-I+\t\t\t\t# immediate irradiance on\n"); |
461 |
< |
printf("-x %-9d\t\t\t# x resolution\n", hresolu); |
462 |
< |
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
461 |
> |
printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); |
462 |
> |
printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); |
463 |
> |
printf("-y %-9d\t\t\t# y resolution\n", vresolu); |
464 |
|
printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : |
465 |
|
"-ld-\t\t\t\t# limit distance off\n"); |
466 |
+ |
printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-', |
467 |
+ |
loadflags & IO_INFO ? "output" : "no"); |
468 |
|
printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n", |
469 |
|
inform, outform, formstr(inform), formstr(outform)); |
470 |
< |
printf("-o%s\t\t\t\t# output", outvals); |
470 |
> |
printf("-o%-9s\t\t\t# output", outvals); |
471 |
|
for (cp = outvals; *cp; cp++) |
472 |
|
switch (*cp) { |
473 |
< |
case 't': printf(" trace"); break; |
473 |
> |
case 't': case 'T': printf(" trace"); break; |
474 |
|
case 'o': printf(" origin"); break; |
475 |
|
case 'd': printf(" direction"); break; |
476 |
|
case 'v': printf(" value"); break; |
477 |
+ |
case 'V': printf(" contribution"); break; |
478 |
|
case 'l': printf(" length"); break; |
479 |
|
case 'L': printf(" first_length"); break; |
480 |
|
case 'p': printf(" point"); break; |
482 |
|
case 'N': printf(" unperturbed_normal"); break; |
483 |
|
case 's': printf(" surface"); break; |
484 |
|
case 'w': printf(" weight"); break; |
485 |
+ |
case 'W': printf(" coefficient"); break; |
486 |
|
case 'm': printf(" modifier"); break; |
487 |
+ |
case 'M': printf(" material"); break; |
488 |
+ |
case '-': printf(" stroke"); break; |
489 |
|
} |
490 |
|
putchar('\n'); |
491 |
|
printf(erract[WARNING].pf != NULL ? |