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.11 by greg, Sun Aug 9 23:05:17 1992 UTC vs.
Revision 2.20 by greg, Tue May 4 09:30:27 1993 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1992 Regents of the University of California */
1	>	/* Copyright (c) 1993 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10
11		#include "standard.h"
12		#include <fcntl.h>
13	+
14	+	#ifndef F_SETLKW
15	+
16	+	main(argc, argv)
17	+	int argc;
18	+	char *argv[];
19	+	{
20	+	fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]);
21	+	exit(1);
22	+	}
23	+
24	+	#else
25	+
26		#include <signal.h>
27		#include "color.h"
28		#include "view.h"
29		#include "resolu.h"
30
31	+	#ifndef NFS
32	+	#define  NFS                    1
33	+	#endif
34		/* set the following to 0 to forgo forking */
35		#ifndef MAXFORK
36	+	#if NFS
37		#define  MAXFORK                3       /* allotment of duped processes */
38	+	#else
39	+	#define  MAXFORK                0
40		#endif
41	<
41	>	#endif
42	>	/* protection from SYSV signals(!) */
43	>	#if defined(sgi) || defined(hpux)
44	>	#define guard_io()      sighold(SIGALRM)
45	>	#define unguard()       sigrelse(SIGALRM)
46	>	#endif
47	>	#ifndef guard_io
48	>	#define guard_io()      0
49	>	#define unguard()       0
50	>	#endif
51		/* rpict command */
52		char  *rpargv[128] = {"rpict", "-S", "1", "-x", "512", "-y", "512", "-pa", "1"};
53		int  rpargc = 9;
#	Line 102 | Line 130 | char  *argv[];
130		case 'F':               /* syncronization file */
131		if (argv[i][2])
132		break;
133	<	if ((syncfd = open(argv[++i], O_RDWR)) < 0) {
133	>	if ((syncfd = open(argv[++i],
134	>	O_RDWR|O_CREAT, 0666)) < 0) {
135		fprintf(stderr, "%s: cannot open\n",
136		argv[i]);
137		exit(1);
138		}
139		continue;
140	+	case 'z':               /* z-file ist verbotten */
141	+	fprintf(stderr, "%s: -z option not allowed\n",
142	+	argv[0]);
143	+	exit(1);
144		case 'o':               /* output file */
145		if (argv[i][2])
146		break;
#	Line 123 | Line 156 | char  *argv[];
156		}
157		init(argc, argv);
158		rpiece();
159	<	rval = cleanup(0);
127	<	exit(rval);
159	>	exit(cleanup(0));
160		}
161
162
#	Line 164 | Line 196 | char  **av;
196		} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
197		if ((fp = fdopen(dup(outfd), "r+")) == NULL)
198		goto filerr;
199	<	getheader(fp, NULL);            /* skip header */
200	<	if (fscnresolu(&hr, &vr, fp) < 0 ||     /* check resolution */
199	>	getheader(fp, NULL, NULL);      /* skip header */
200	>	if (!fscnresolu(&hr, &vr, fp) ||        /* check resolution */
201		hr != hres*hmult || vr != vres*vmult) {
202		fprintf(stderr, "%s: resolution mismatch on file \"%s\"\n",
203		progname, outfile);
#	Line 179 | Line 211 | char  **av;
211		scanorig = ftell(fp);           /* record position of first scanline */
212		if (fclose(fp) == -1)           /* done with stream i/o */
213		goto filerr;
214	+	#if NFS
215		sync();                         /* flush NFS buffers */
216	+	#endif
217		/* start rpict process */
218		if (open_process(rpd, rpargv) <= 0) {
219		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
#	Line 232 | Line 266 | int  *xp, *yp;
266		return(0);
267		}
268		}
269	<	sprintf(buf, "%d %d\n%d %d\n", hmult, vmult, *xp, *yp);
269	>	sprintf(buf, "%4d %4d\n%4d %4d\n", hmult, vmult, *xp, *yp);
270		lseek(syncfd, 0L, 0);           /* write new position */
271		write(syncfd, buf, strlen(buf));
272		fls.l_type = F_UNLCK;           /* release sync file */
#	Line 302 | Line 336 | rpiece()                       /* render picture piece by piece */
336		putc('\n', torp);
337		fflush(torp);                   /* assigns piece to rpict */
338		putpiece(xorg, yorg);           /* place piece in output */
305	–	if (verbose) {                  /* notify caller */
306	–	printf("%d %d done\n", xorg, yorg);
307	–	fflush(stdout);
308	–	}
339		}
340		}
341
#	Line 325 | Line 355 | int  xpos, ypos;
355		exit(cleanup(1));
356		}
357		/* check header from rpict */
358	<	getheader(fromrp, NULL);
359	<	if (fscnresolu(&hr, &vr, fromrp) < 0 || hr != hres | vr != vres) {
358	>	guard_io();
359	>	getheader(fromrp, NULL, NULL);
360	>	if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
361		fprintf(stderr, "%s: resolution mismatch from %s\n",
362		progname, rpargv[0]);
363		exit(cleanup(1));
364		}
365	+	unguard();
366		/* load new piece into buffer */
367	<	for (y = 0; y < vr; y++)
367	>	for (y = 0; y < vr; y++) {
368	>	guard_io();
369		if (freadcolrs(pbuf+y*hr, hr, fromrp) < 0) {
370		fprintf(stderr, "%s: read error from %s\n",
371		progname, rpargv[0]);
372		exit(cleanup(1));
373		}
374	+	unguard();
375	+	}
376		#if MAXFORK
377		/* fork so we don't slow rpict down */
378		if ((pid = fork()) > 0) {
#	Line 352 | Line 387 | int  xpos, ypos;
387		#else
388		pid = -1;               /* no forking */
389		#endif
390	+	fls.l_start = scanorig +
391	+	((long)(vmult-1-ypos)*vres*hmult+xpos)*hres*sizeof(COLR);
392	+	#if NFS
393	+	fls.l_len = ((long)(vres-1)*hmult+1)*hres*sizeof(COLR);
394		/* lock file section so NFS doesn't mess up */
395		fls.l_whence = 0;
357	–	fls.l_len = (long)vres*hmult*hres*sizeof(COLR);
358	–	fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len;
396		fls.l_type = F_WRLCK;
397		fcntl(outfd, F_SETLKW, &fls);
398	+	#endif
399		/* write new piece to file */
400	<	if (lseek(outfd, fls.l_start+(long)xpos*hres*sizeof(COLR), 0) == -1)
400	>	if (lseek(outfd, fls.l_start, 0) == -1)
401		goto seekerr;
402		if (hmult == 1) {
403		if (writebuf(outfd, (char *)pbuf,
#	Line 375 | Line 413 | int  xpos, ypos;
413		1) == -1)
414		goto seekerr;
415		}
416	<	if (pid == -1) {        /* fork failed */
416	>	if (verbose) {                          /* notify caller */
417	>	printf("%d %d done\n", xpos, ypos);
418	>	fflush(stdout);
419	>	}
420	>	if (pid == -1) {        /* didn't fork or fork failed */
421	>	#if NFS
422		fls.l_type = F_UNLCK;           /* release lock */
423		fcntl(outfd, F_SETLKW, &fls);
424	+	#endif
425		return(0);
426		}
427		_exit(0);               /* else exit child process (releasing lock) */
#	Line 388 | Line 432 | writerr:
432		fprintf(stderr, "%s: write error on file \"%s\"\n", progname, outfile);
433		_exit(1);
434		}
435	+
436	+	#endif

Diff Legend

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