ViewVC Help

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

root/Development/ray/src/util/rpiece.c

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.26 by greg, Sat Aug 7 08:43:32 1993 UTC vs.
Revision 2.61 by greg, Fri Nov 17 20:36:50 2023 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1993 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Generate sections of a picture.
6		*/
7
8	+
9	+	#include <stdio.h>
10	+	#include <signal.h>
11	+	#include <sys/types.h>
12	+
13	+	#include "platform.h"
14	+	#ifndef NON_POSIX /* XXX need abstraction for process management */
15	+	#include <sys/wait.h>
16	+	#endif
17	+
18		#include "standard.h"
19	+	#include "color.h"
20	+	#include "view.h"
21	+	#include "rtprocess.h"
22
23		#ifndef F_SETLKW
24
25	<	main(argc, argv)
26	<	int argc;
27	<	char *argv[];
25	>	int
26	>	main(
27	>	int argc,
28	>	char *argv[]
29	>	)
30		{
31		fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]);
32		exit(1);
#	Line 22 | Line 34 | char *argv[];
34
35		#else
36
25	–	#include <signal.h>
26	–	#include "color.h"
27	–	#include "view.h"
28	–	#include "resolu.h"
29	–
37		#ifndef NFS
38		#define  NFS                    1
39		#endif
40	<	/* set the following to 0 to forgo forking */
40	>
41	>	#ifndef RHAS_FORK_EXEC
42	>	#undef MAXFORK
43	>	#define MAXFORK                 0
44	>	#endif
45		#ifndef MAXFORK
46		#if NFS
47		#define  MAXFORK                3       /* allotment of duped processes */
#	Line 39 | Line 50 | char *argv[];
50		#endif
51		#endif
52		/* protection from SYSV signals(!) */
53	<	#if defined(sgi) || defined(hpux)
53	>	#if defined(sgi)
54		#define guard_io()      sighold(SIGALRM)
55		#define unguard()       sigrelse(SIGALRM)
56		#endif
57		#ifndef guard_io
58	<	#define guard_io()      0
59	<	#define unguard()       0
58	>	#define guard_io()
59	>	#define unguard()
60		#endif
61	+
62	+	extern char  *strerror();
63	+
64		/* rpict command */
65		char  *rpargv[128] = {"rpict", "-S", "1"};
66		int  rpargc = 3;
53	–	int  rpd[3];
67		FILE  *torp, *fromrp;
68		COLR  *pbuf;
69		/* our view parameters */
#	Line 69 | Line 82 | int  nforked = 0;
82
83		char  *progname;
84		int  verbose = 0;
85	+	int  nowarn = 0;
86	+	unsigned  timelim = 0;
87		int  rvrlim = -1;
88
74	–	extern long  lseek(), ftell();
75	–
89		int  gotalrm = 0;
90	<	int  onalrm() { gotalrm++; }
90	>	void  onalrm(int i) { gotalrm++; }
91
92	+	static void dolock(int  fd, int  ltyp);
93	+	static void init(int  ac, char  **av);
94	+	static int nextpiece(int        *xp, int        *yp);
95	+	static int rvrpiece(int *xp, int        *yp);
96	+	static int cleanup(int  rstat);
97	+	static void rpiece(void);
98	+	static int putpiece(int xpos, int       ypos);
99	+	static void filerr(char  *t);
100
101	<	main(argc, argv)
102	<	int  argc;
103	<	char  *argv[];
101	>
102	>	int
103	>	main(
104	>	int  argc,
105	>	char  *argv[]
106	>	)
107		{
108	<	register int  i, rval;
108	>	int  i, rval;
109
110		progname = argv[0];
111		for (i = 1; i < argc; i++) {
112		/* expand arguments */
113	<	while (rval = expandarg(&argc, &argv, i))
114	<	if (rval < 0) {
115	<	fprintf(stderr, "%s: cannot expand '%s'",
116	<	argv[0], argv[i]);
117	<	exit(1);
118	<	}
113	>	while ((rval = expandarg(&argc, &argv, i)) > 0)
114	>	;
115	>	if (rval < 0) {
116	>	fprintf(stderr, "%s: cannot expand '%s'\n",
117	>	argv[0], argv[i]);
118	>	exit(1);
119	>	}
120		if (argv[i][0] == '-')
121		switch (argv[i][1]) {
122	+	case 'w':
123	+	if (!argv[i][2])
124	+	nowarn = !nowarn;
125	+	else if (argv[i][2] == '+')
126	+	nowarn = 0;
127	+	else if (argv[i][2] == '-')
128	+	nowarn = 1;
129	+	break;
130		case 'v':
131		switch (argv[i][2]) {
132		case '\0':      /* verbose option */
#	Line 116 | Line 149 | char  *argv[];
149		}
150		break;
151		case 'p':               /* pixel aspect ratio? */
152	+	if (argv[i][2] == 'm') {
153	+	fprintf(stderr, "%s: -pm unsupported\n",
154	+	argv[0]);
155	+	++i;
156	+	continue;
157	+	}
158	+	if (argv[i][2] == 'X') {
159	+	fprintf(stderr, "%s: -pXYZ unsupported\n",
160	+	argv[0]);
161	+	++i;
162	+	continue;
163	+	}
164	+	if (argv[i][2] == 'c') {
165	+	fprintf(stderr, "%s: -pc unsupported\n",
166	+	argv[0]);
167	+	i += 9;
168	+	continue;
169	+	}
170		if (argv[i][2] != 'a' || argv[i][3])
171		break;
172	<	pixaspect = atof(argv[i+1]);
172	>	pixaspect = atof(argv[++i]);
173		continue;
174	+	case 'T':               /* time limit (hours) */
175	+	if (argv[i][2])
176	+	break;
177	+	timelim = atof(argv[++i])*3600. + .5;
178	+	continue;
179		case 'x':               /* overall x resolution */
180		if (argv[i][2])
181		break;
#	Line 148 | Line 204 | char  *argv[];
204		case 'F':               /* syncronization file */
205		if (argv[i][2])
206		break;
207	<	if ((syncfp = fopen(argv[++i],"r+")) == NULL) {
207	>	if ((syncfp =
208	>	fdopen(open(argv[++i],O_RDWR|O_CREAT,0666),"r+")) == NULL) {
209		fprintf(stderr, "%s: cannot open\n",
210		argv[i]);
211		exit(1);
#	Line 163 | Line 220 | char  *argv[];
220		break;
221		outfile = argv[++i];
222		continue;
223	<	} else if (i >= argc-1)
224	<	break;
223	>	}
224	>	else if (i >= argc-1)
225	>	break;
226		rpargv[rpargc++] = argv[i];
227		}
228		if (i >= argc) {
#	Line 181 | Line 239 | char  *argv[];
239		}
240
241
242	<	dolock(fd, ltyp)                /* lock or unlock a file */
243	<	int  fd;
244	<	int  ltyp;
242	>	static void
243	>	dolock(         /* lock or unlock a file */
244	>	int  fd,
245	>	int  ltyp
246	>	)
247		{
248		static struct flock  fls;       /* static so initialized to zeroes */
249
250		fls.l_type = ltyp;
251		if (fcntl(fd, F_SETLKW, &fls) < 0) {
252	<	fprintf(stderr, "%s: cannot lock/unlock file\n", progname);
253	<	exit(1);
252	>	fprintf(stderr, "%s: cannot lock/unlock file: %s\n",
253	>	progname, strerror(errno));
254	>	_exit(1);
255		}
256		}
257
258
259	<	init(ac, av)                    /* set up output file and start rpict */
260	<	int  ac;
261	<	char  **av;
259	>	static void
260	>	init(                   /* set up output file and start rpict */
261	>	int  ac,
262	>	char  **av
263	>	)
264		{
265		static char  hrbuf[16], vrbuf[16];
266		extern char  VersionID[];
267		char  *err;
268		FILE  *fp;
269		int  hr, vr;
270	+	SUBPROC  rpd; /* since we don't close_process(), this can be local */
271		/* set up view */
272		if ((err = setview(&ourview)) != NULL) {
273		fprintf(stderr, "%s: %s\n", progname, err);
#	Line 215 | Line 279 | char  **av;
279		sflock(F_UNLCK);
280		}
281		/* compute piece size */
282	+	hr = hres; vr = vres;
283	+	if (pixaspect > FTINY)
284	+	normaspect(viewaspect(&ourview), &pixaspect, &hr, &vr);
285		hres /= hmult;
286		vres /= vmult;
287	+	if (hres <= 0 || vres <= 0) {
288	+	fprintf(stderr, "%s: illegal resolution/subdivision\n", progname);
289	+	exit(1);
290	+	}
291		normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres);
292	+	if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult))
293	+	fprintf(stderr,
294	+	"%s: warning - changed resolution from %dx%d to %dx%d\n",
295	+	progname, hr, vr, hres*hmult, vres*vmult);
296		sprintf(hrbuf, "%d", hres);
297		rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf;
298		sprintf(vrbuf, "%d", vres);
#	Line 230 | Line 305 | char  **av;
305		dolock(outfd, F_WRLCK);
306		if ((fp = fdopen(dup(outfd), "w")) == NULL)
307		goto filerr;
308	<	printargs(ac, av, fp);          /* write header */
308	>	newheader("RADIANCE", fp);      /* create header */
309	>	printargs(ac, av, fp);
310		fprintf(fp, "SOFTWARE= %s\n", VersionID);
311		fputs(VIEWSTR, fp);
312		fprintview(&ourview, fp);
313	<	putc('\n', fp);
313	>	fputc('\n', fp);
314	>	fputnow(fp);
315		if (pixaspect < .99 || pixaspect > 1.01)
316		fputaspect(pixaspect, fp);
317	+	fputprims(stdprims, fp);
318		fputformat(COLRFMT, fp);
319	<	putc('\n', fp);
319	>	fputc('\n', fp);
320		fprtresolu(hres*hmult, vres*vmult, fp);
321		} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
322		dolock(outfd, F_RDLCK);
#	Line 261 | Line 339 | char  **av;
339		goto filerr;
340		dolock(outfd, F_UNLCK);
341		/* start rpict process */
342	<	if (open_process(rpd, rpargv) <= 0) {
342	>	rpd = sp_inactive;
343	>	if (open_process(&rpd, rpargv) <= 0) {
344		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
345		exit(1);
346		}
347	<	if ((fromrp = fdopen(rpd[0], "r")) == NULL ||
348	<	(torp = fdopen(rpd[1], "w")) == NULL) {
347	>	if ((fromrp = fdopen(rpd.r, "r")) == NULL ||
348	>	(torp = fdopen(rpd.w, "w")) == NULL) {
349		fprintf(stderr, "%s: cannot open stream to %s\n",
350		progname, rpargv[0]);
351		exit(1);
#	Line 276 | Line 355 | char  **av;
355		exit(1);
356		}
357		signal(SIGALRM, onalrm);
358	+	if (timelim)
359	+	alarm(timelim);
360		return;
361		filerr:
362		fprintf(stderr, "%s: i/o error on file \"%s\"\n", progname, outfile);
#	Line 283 | Line 364 | filerr:
364		}
365
366
367	<	int
368	<	nextpiece(xp, yp)               /* get next piece assignment */
369	<	int  *xp, *yp;
367	>	static int
368	>	nextpiece(              /* get next piece assignment */
369	>	int     *xp,
370	>	int     *yp
371	>	)
372		{
373		if (gotalrm)                    /* someone wants us to quit */
374		return(0);
#	Line 325 | Line 408 | int  *xp, *yp;
408		}
409
410
411	<	int
412	<	rvrpiece(xp, yp)                /* check for recoverable pieces */
413	<	register int  *xp, *yp;
411	>	static int
412	>	rvrpiece(               /* check for recoverable pieces */
413	>	int     *xp,
414	>	int     *yp
415	>	)
416		{
417		static char  *pdone = NULL;     /* which pieces are done */
418		static long  readpos = -1;      /* how far we've read */
419	<	register int  i;
419	>	int  px, py, i;
420		/*
421		* This routine is called by nextpiece() with an
422		* exclusive lock on syncfp and the file pointer at the
#	Line 340 | Line 425 | register int  *xp, *yp;
425		if (rvrlim < 0)
426		return(0);              /* only check if asked */
427		if (pdone == NULL)              /* first call */
428	<	pdone = calloc(hmult*vmult, sizeof(char));
428	>	pdone = (char *)calloc(hmult*vmult, sizeof(char));
429	>	if (pdone == NULL) {
430	>	fprintf(stderr, "%s: out of memory\n", progname);
431	>	exit(1);
432	>	}
433		if (readpos != -1)              /* mark what's been done */
434		fseek(syncfp, readpos, 0);
435	<	while (fscanf(syncfp, "%d %d", xp, yp) == 2)
436	<	pdone[*xp*vmult+*yp] = 1;
435	>	while (fscanf(syncfp, "%d %d", &px, &py) == 2)
436	>	pdone[px*vmult+py] = 1;
437		if (!feof(syncfp)) {
438		fprintf(stderr, "%s: format error in sync file\n", progname);
439		exit(1);
#	Line 365 | Line 454 | register int  *xp, *yp;
454		}
455
456
457	<	int
458	<	cleanup(rstat)                  /* close rpict process and clean up */
459	<	int  rstat;
457	>	static int
458	>	cleanup(                        /* close rpict process and clean up */
459	>	int  rstat
460	>	)
461		{
462		int  status;
463
#	Line 381 | Line 471 | int  rstat;
471		}
472
473
474	<	rpiece()                        /* render picture piece by piece */
474	>	static void
475	>	rpiece(void)                    /* render picture piece by piece */
476		{
477	+	char  *err;
478		VIEW  pview;
479		int  xorg, yorg;
388	–	/* compute view parameters */
389	–	copystruct(&pview, &ourview);
390	–	switch (ourview.type) {
391	–	case VT_PER:
392	–	pview.horiz = 2.*180./PI*atan(
393	–	tan(PI/180./2.*ourview.horiz)/hmult );
394	–	pview.vert = 2.*180./PI*atan(
395	–	tan(PI/180./2.*ourview.vert)/vmult );
396	–	break;
397	–	case VT_PAR:
398	–	case VT_ANG:
399	–	pview.horiz = ourview.horiz / hmult;
400	–	pview.vert = ourview.vert / vmult;
401	–	break;
402	–	case VT_HEM:
403	–	pview.horiz = 2.*180./PI*asin(
404	–	sin(PI/180./2.*ourview.horiz)/hmult );
405	–	pview.vert = 2.*180./PI*asin(
406	–	sin(PI/180./2.*ourview.vert)/vmult );
407	–	break;
408	–	default:
409	–	fprintf(stderr, "%s: unknown view type '-vt%c'\n",
410	–	progname, ourview.type);
411	–	exit(cleanup(1));
412	–	}
480		/* render each piece */
481		while (nextpiece(&xorg, &yorg)) {
482	<	pview.hoff = ourview.hoff + xorg - 0.5*(hmult-1);
483	<	pview.voff = ourview.voff + yorg - 0.5*(vmult-1);
482	>	pview = ourview;
483	>	err = cropview(&pview, (double)xorg/hmult, (double)yorg/vmult,
484	>	(xorg+1.)/hmult, (yorg+1.)/vmult);
485	>	if (err != NULL) {
486	>	fprintf(stderr, "%s: %s\n", progname, err);
487	>	exit(cleanup(1));
488	>	}
489		fputs(VIEWSTR, torp);
490		fprintview(&pview, torp);
491	<	putc('\n', torp);
491	>	fputc('\n', torp);
492		fflush(torp);                   /* assigns piece to rpict */
493		putpiece(xorg, yorg);           /* place piece in output */
494		}
495		}
496
497
498	<	int
499	<	putpiece(xpos, ypos)            /* get next piece from rpict */
500	<	int  xpos, ypos;
498	>	static int
499	>	putpiece(               /* get next piece from rpict */
500	>	int     xpos,
501	>	int     ypos
502	>	)
503		{
504		struct flock  fls;
505		int  pid, status;
506		int  hr, vr;
507	<	register int  y;
507	>	int  y;
508		/* check bounds */
509	<	if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) {
509	>	if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
510		fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
511		progname, xpos, ypos);
512		exit(cleanup(1));
#	Line 440 | Line 514 | int  xpos, ypos;
514		/* check header from rpict */
515		guard_io();
516		getheader(fromrp, NULL, NULL);
517	<	if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
517	>	if (!fscnresolu(&hr, &vr, fromrp) || (hr != hres) | (vr != vres)) {
518		fprintf(stderr, "%s: resolution mismatch from %s\n",
519		progname, rpargv[0]);
520		exit(cleanup(1));
#	Line 481 | Line 555 | int  xpos, ypos;
555		/* lock file section so NFS doesn't mess up */
556		fls.l_whence = 0;
557		fls.l_type = F_WRLCK;
558	+	#if 0
559		if (fcntl(outfd, F_SETLKW, &fls) < 0)
560		filerr("lock");
561	+	#else
562	+	dolock(outfd, F_WRLCK);
563		#endif
564	+	#endif
565		/* write new piece to file */
566	<	if (lseek(outfd, fls.l_start, 0) == -1)
566	>	if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
567		filerr("seek");
568		if (hmult == 1) {
569		if (writebuf(outfd, (char *)pbuf,
#	Line 497 | Line 575 | int  xpos, ypos;
575		hr*sizeof(COLR)) != hr*sizeof(COLR))
576		filerr("write");
577		if (y < vr-1 && lseek(outfd,
578	<	(long)(hmult-1)*hr*sizeof(COLR),
579	<	1) == -1)
578	>	(off_t)(hmult-1)*hr*sizeof(COLR),
579	>	SEEK_CUR) < 0)
580		filerr("seek");
581		}
582		#if NFS
583		fls.l_type = F_UNLCK;           /* release lock */
584	+	#if 0
585		if (fcntl(outfd, F_SETLKW, &fls) < 0)
586		filerr("lock");
587	+	#else
588	+	dolock(outfd, F_UNLCK);
589		#endif
590	+	#endif
591	+	if (verbose) {                          /* notify caller */
592	+	printf("%d %d done\n", xpos, ypos);
593	+	fflush(stdout);
594	+	}
595		if (syncfp != NULL) {                   /* record what's been done */
596		sflock(F_WRLCK);
597		fseek(syncfp, 0L, 2);           /* append index */
#	Line 514 | Line 600 | int  xpos, ypos;
600		/*** Unlock not necessary, since
601		sflock(F_UNLCK);        _exit() or nextpiece() is next ***/
602		}
517	–	if (verbose) {                          /* notify caller */
518	–	printf("%d %d done\n", xpos, ypos);
519	–	fflush(stdout);
520	–	}
603		if (pid == -1)          /* didn't fork or fork failed */
604		return(0);
605		_exit(0);               /* else exit child process (releasing locks) */
606		}
607
608
609	<	filerr(t)                       /* report file error and exit */
610	<	char  *t;
609	>	static void
610	>	filerr(                 /* report file error and exit */
611	>	char  *t
612	>	)
613		{
530	–	extern char  *sys_errlist[];
531	–
614		fprintf(stderr, "%s: %s error on file \"%s\": %s\n",
615	<	progname, t, outfile, sys_errlist[errno]);
615	>	progname, t, outfile, strerror(errno));
616		_exit(1);
617		}
618

Diff Legend

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