ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/rtmain.c

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.2 by greg, Tue Feb 25 02:47:23 2003 UTC vs.
Revision 2.12 by greg, Wed Jun 15 15:36:52 2005 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	<	#include  "ray.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"
13	–
17		#include  "ambient.h"
15	–
18		#include  "random.h"
17	–
19		#include  "paths.h"
20
20	–	#include  <sys/types.h>
21	–
22	–	#include  <signal.h>
21		/* persistent processes define */
22		#ifdef  F_SETLKW
23		#define  PERSIST        1               /* normal persist */
#	Line 28 | Line 26 | static const char      RCSid[] = "$Id$";
26		#endif
27
28		char  *progname;                        /* argv[0] */
31	–
29		char  *octname;                         /* octree name */
33	–
30		char  *sigerr[NSIG];                    /* signal error messages */
35	–
31		char  *shm_boundary = NULL;             /* boundary of shared memory */
37	–
32		char  *errfile = NULL;                  /* error output file */
33
34		extern char  *formstr();                /* string from format */
#	Line 51 | Line 45 | extern int  lim_dist;                  /* limit distance? */
45		extern char  *tralist[];                /* list of modifers to trace (or no) */
46		extern int  traincl;                    /* include == 1, exclude == 0 */
47
48	<	void    onsig();
55	<	void    sigdie();
56	<	void    printdefaults();
48	>	static int  loadflags = ~IO_FILES;      /* what to load from octree */
49
50	+	static void onsig(int  signo);
51	+	static void sigdie(int  signo, char  *msg);
52	+	static void printdefaults(void);
53
54	+
55		int
56	<	main(argc, argv)
61	<	int  argc;
62	<	char  *argv[];
56	>	main(int  argc, char  *argv[])
57		{
58		#define  check(ol,al)           if (argv[i][ol] || \
59		badarg(argc-i-1,argv+i+1,al)) \
#	Line 71 | Line 65 | char  *argv[];
65		case 'n': case 'N': case 'f': case 'F': \
66		case '-': case '0': var = 0; break; \
67		default: goto badopt; }
74	–	int  loadflags = ~IO_FILES;
68		int  persist = 0;
69		char  **tralp;
70		int  duped1;
#	Line 176 | Line 169 | char  *argv[];
169		}
170		if (argv[i][2] == 'I') {        /* file */
171		rval = wordfile(tralp,
172	<	getpath(argv[++i],getlibpath(),R_OK));
172	>	getpath(argv[++i],getrlibpath(),R_OK));
173		if (rval < 0) {
174		sprintf(errmsg,
175		"cannot open trace include file \"%s\"",
#	Line 198 | Line 191 | char  *argv[];
191		}
192		if (argv[i][2] == 'E') {        /* file */
193		rval = wordfile(tralp,
194	<	getpath(argv[++i],getlibpath(),R_OK));
194	>	getpath(argv[++i],getrlibpath(),R_OK));
195		if (rval < 0) {
196		sprintf(errmsg,
197		"cannot open trace exclude file \"%s\"",
#	Line 235 | Line 228 | char  *argv[];
228		initotypes();
229		/* initialize urand */
230		initurand(2048);
231	+	srandom(rand_samp ? (long)time(0) : 0L);
232		/* set up signal handling */
233		sigdie(SIGINT, "Interrupt");
234	+	#ifdef SIGHUP
235		sigdie(SIGHUP, "Hangup");
236	+	#endif
237		sigdie(SIGTERM, "Terminate");
238	+	#ifdef SIGPIPE
239		sigdie(SIGPIPE, "Broken pipe");
240	+	#endif
241	+	#ifdef SIGALRM
242		sigdie(SIGALRM, "Alarm clock");
243	+	#endif
244		#ifdef  SIGXCPU
245		sigdie(SIGXCPU, "CPU limit exceeded");
246		sigdie(SIGXFSZ, "File size exceeded");
#	Line 274 | Line 274 | char  *argv[];
274		openheader();
275		}
276		#endif
277	–	#ifdef  MSDOS
277		if (outform != 'a')
278	<	setmode(fileno(stdout), O_BINARY);
280	<	if (octname == NULL)
281	<	setmode(fileno(stdin), O_BINARY);
282	<	#endif
278	>	SET_FILE_BINARY(stdout);
279		readoct(octname, loadflags, &thescene, NULL);
280		nsceneobjs = nobjects;
281
#	Line 345 | Line 341 | runagain:
341		badopt:
342		sprintf(errmsg, "command line error at '%s'", argv[i]);
343		error(USER, errmsg);
344	+	return 1; /* pro forma return */
345
346		#undef  check
347		#undef  bool
#	Line 352 | Line 349 | badopt:
349
350
351		void
352	<	wputs(s)                                /* warning output function */
353	<	char    *s;
352	>	wputs(                          /* warning output function */
353	>	char    *s
354	>	)
355		{
356		int  lasterrno = errno;
357		eputs(s);
#	Line 362 | Line 360 | char   *s;
360
361
362		void
363	<	eputs(s)                                /* put string to stderr */
364	<	register char  *s;
363	>	eputs(                          /* put string to stderr */
364	>	register char  *s
365	>	)
366		{
367		static int  midline = 0;
368
#	Line 381 | Line 380 | register char  *s;
380		}
381
382
383	<	void
384	<	onsig(signo)                            /* fatal signal */
385	<	int  signo;
383	>	static void
384	>	onsig(                          /* fatal signal */
385	>	int  signo
386	>	)
387		{
388		static int  gotsig = 0;
389
390		if (gotsig++)                   /* two signals and we're gone! */
391		_exit(signo);
392
393	+	#ifdef SIGALRM
394		alarm(15);                      /* allow 15 seconds to clean up */
395		signal(SIGALRM, SIG_DFL);       /* make certain we do die */
396	+	#endif
397		eputs("signal - ");
398		eputs(sigerr[signo]);
399		eputs("\n");
#	Line 399 | Line 401 | int  signo;
401		}
402
403
404	<	void
405	<	sigdie(signo, msg)                      /* set fatal signal */
406	<	int  signo;
407	<	char  *msg;
404	>	static void
405	>	sigdie(                 /* set fatal signal */
406	>	int  signo,
407	>	char  *msg
408	>	)
409		{
410		if (signal(signo, onsig) == SIG_IGN)
411		signal(signo, SIG_IGN);
#	Line 410 | Line 413 | char  *msg;
413		}
414
415
416	<	void
417	<	printdefaults()                 /* print default values to stdout */
416	>	static void
417	>	printdefaults(void)                     /* print default values to stdout */
418		{
419		register char  *cp;
420
421		if (imm_irrad)
422		printf("-I+\t\t\t\t# immediate irradiance on\n");
423	<	printf("-x  %-9d\t\t\t# x resolution\n", hresolu);
423	>	printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
424		printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
425		printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
426		"-ld-\t\t\t\t# limit distance off\n");
427	+	printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
428	+	loadflags & IO_INFO ? "output" : "no");
429		printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
430		inform, outform, formstr(inform), formstr(outform));
431	<	printf("-o%s\t\t\t\t# output", outvals);
431	>	printf("-o%-9s\t\t\t# output", outvals);
432		for (cp = outvals; *cp; cp++)
433		switch (*cp) {
434	<	case 't': printf(" trace"); break;
434	>	case 't': case 'T': printf(" trace"); break;
435		case 'o': printf(" origin"); break;
436		case 'd': printf(" direction"); break;
437		case 'v': printf(" value"); break;
#	Line 438 | Line 443 | printdefaults()                        /* print default values to stdout */
443		case 's': printf(" surface"); break;
444		case 'w': printf(" weight"); break;
445		case 'm': printf(" modifier"); break;
446	+	case 'M': printf(" material"); break;
447	+	case 'W': printf(" contribution"); break;
448	+	case '-': printf(" stroke"); break;
449		}
450		putchar('\n');
451		printf(erract[WARNING].pf != NULL ?

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)