[ViewVC] Diff of: radiance/ray/src/util/ranimate.c

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs.
Revision 2.23 by gregl, Fri Oct 31 15:02:43 1997 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1995 Regents of the University of California */
1	>	/* Copyright (c) 1996 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 15 \| Line 15 \| static char SCCSid[] = "$SunId$ LBL";
15		#include "view.h"
16		#include "vars.h"
17		#include "netproc.h"
18	+	/* default remote shell */
19	+	#ifdef _AUX_SOURCE
20	+	#define REMSH "remsh"
21	+	#else
22	+	#define REMSH "rsh"
23	+	#endif
24		/* input variables */
25		#define HOST 0 /* rendering host machine */
26		#define RENDER 1 /* rendering options */
#	Line 38 \| Line 44 \| static char SCCSid[] = "$SunId$ LBL";
44		#define DISKSPACE 19 /* how much disk space to use */
45		#define RESOLUTION 20 /* desired final resolution */
46		#define EXPOSURE 21 /* how to compute exposure */
47	+	#define RSH 22 /* remote shell script or program */
48
49	<	int NVARS = 22; /* total number of variables */
49	>	int NVARS = 23; /* total number of variables */
50
51		VARIABLE vv[] = { /* variable-value pairs */
52		{"host", 4, 0, NULL, NULL},
#	Line 64 \| Line 71 \| *VARIABLE vv[] = { / variable-value pairs /*
71		{"DISKSPACE", 3, 0, NULL, fltvalue},
72		{"RESOLUTION", 3, 0, NULL, onevalue},
73		{"EXPOSURE", 3, 0, NULL, onevalue},
74	+	{"RSH", 3, 0, NULL, onevalue},
75		};
76
77		#define SFNAME "STATUS" /* status file name */
#	Line 84 \| Line 92 \| *int nowarn = 0; / turn warnings off? /*
92		int silent = 0; /* silent mode? */
93		int noaction = 0; /* take no action? */
94
95	<	char rendopt[2048] = ""; /* rendering options */
95	>	char remsh; / remote shell program/script */
96	>	char rendopt[2048]; /* rendering options */
97		char rresopt[32]; /* rendering resolution options */
98		char fresopt[32]; /* filter resolution options */
99		int pfiltalways; /* always use pfilt? */
100
101	+	char arcargs[10240]; /* files to archive */
102	+	char arcfirst, arcnext; /* pointers to first and next argument */
103	+
104		struct pslot {
105		int pid; /* process ID (0 if empty) */
106		int fout; /* output frame number */
#	Line 96 \| Line 108 \| struct pslot {
108		} pslot; / process slots */
109		int npslots; /* number of process slots */
110
99	–	int lastpid; /* ID of last completed background process */
100	–	PSERVER lastpserver; / last process server used */
101	–
111		#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host)
112
113		struct pslot *findpslot();
114
115	+	PSERVER lastpserver; / last process server with error */
116	+
117		VIEW *getview();
118		char *getexp();
119
120	+	extern time_t fdate(), time();
121
122	+
123		main(argc, argv)
124		int argc;
125		char *argv[];
#	Line 137 \| Line 150 \| *char argv[];**
150		cfname = argv[i];
151		/* load variables */
152		loadvars(cfname);
153	+	/* check variables */
154	+	checkvalues();
155		/* did we get DIRECTORY? */
156		checkdir();
157		/* check status */
#	Line 163 \| Line 178 \| *char argv[];**
178		argv[i] = vval(NEXTANIM); /* just change input file */
179		if (!silent)
180		printargs(argc, argv, stdout);
181	<	execvp(progname, argv); /* pass to next */
182	<	quit(1); /* shouldn't return */
181	>	if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
182	>	fprintf(stderr, "%s: command not found\n", progname);
183	>	else
184	>	execv(progname, argv);
185	>	quit(1);
186		}
187		quit(0);
188		userr:
#	Line 175 \| Line 193 \| userr:
193
194		getastat() /* check/set animation status */
195		{
196	<	char buf[256];
196	>	char sfname[256];
197		FILE *fp;
198
199	<	sprintf(buf, "%s/%s", vval(DIRECTORY), SFNAME);
200	<	if ((fp = fopen(buf, "r")) == NULL) {
199	>	sprintf(sfname, "%s/%s", vval(DIRECTORY), SFNAME);
200	>	if ((fp = fopen(sfname, "r")) == NULL) {
201		if (errno != ENOENT) {
202	<	perror(buf);
202	>	perror(sfname);
203		return(-1);
204		}
205		astat.rnext = astat.fnext = astat.tnext = 0;
#	Line 201 \| Line 219 \| *getastat() / check/set animation status /*
219		goto fmterr;
220		fclose(fp);
221		if (astat.pid != 0) { /* thinks it's still running */
222	<	gethostname(buf, sizeof(buf));
205	<	if (strcmp(buf, astat.host)) {
222	>	if (strcmp(myhostname(), astat.host)) {
223		fprintf(stderr,
224		"%s: process %d may still be running on host %s\n",
225		progname, astat.pid, astat.host);
#	Line 215 \| Line 232 \| *getastat() / check/set animation status /*
232		}
233		/* assume it is dead */
234		}
235	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
235	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */
236		fprintf(stderr, "%s: unfinished job \"%s\"\n",
237		progname, astat.cfname);
238		return(-1);
239		}
240	+	/* check control file mods. */
241	+	if (!nowarn && fdate(cfname) > fdate(sfname))
242	+	fprintf(stderr,
243	+	"%s: warning - control file modified since last run\n",
244	+	progname);
245		setours: /* set our values */
246	<	gethostname(astat.host, sizeof(astat.host));
246	>	strcpy(astat.host, myhostname());
247		astat.pid = getpid();
248		strcpy(astat.cfname, cfname);
249		return(0);
250		fmterr:
251		fprintf(stderr, "%s: format error in status file \"%s\"\n",
252	<	progname, buf);
252	>	progname, sfname);
253		fclose(fp);
254		return(-1);
255		}
#	Line 279 \| Line 301 \| *checkdir() / make sure we have our directory /*
301
302		setdefaults() /* set default values */
303		{
304	+	extern char *atos();
305	+	int decades;
306		char buf[256];
307
308		if (vdef(ANIMATE)) {
#	Line 312 \| Line 336 \| *setdefaults() / set default values /*
336		quit(1);
337		}
338		if (!vdef(BASENAME)) {
339	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
339	>	decades = (int)log10((double)vint(END)) + 1;
340	>	if (decades < 3) decades = 3;
341	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
342		vval(BASENAME) = savqstr(buf);
343		vdef(BASENAME)++;
344		}
#	Line 344 \| Line 370 \| *setdefaults() / set default values /*
370		vval(DISKSPACE) = "100";
371		vdef(DISKSPACE)++;
372		}
373	+	if (!vdef(RSH)) {
374	+	vval(RSH) = REMSH;
375	+	vdef(RSH)++;
376	+	}
377	+	/* locate remote shell program */
378	+	atos(buf, sizeof(buf), vval(RSH));
379	+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
380	+	remsh = savqstr(remsh);
381	+	else
382	+	remsh = vval(RSH); /* will generate error if used */
383	+
384		/* append rendering options */
385		if (vdef(RENDER))
386		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));
#	Line 406 \| Line 443 \| *sethosts() / set up process servers /*
443		}
444
445
446	<	getradfile(rfname) /* run rad and get needed variables */
447	<	char *rfname;
446	>	getradfile(rfargs) /* run rad and get needed variables */
447	>	char *rfargs;
448		{
449		static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
450		char combuf[256];
451		register int i;
452		register char *cp;
453	+	char *pippt;
454		/* create rad command */
455		sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
456		sprintf(combuf,
457		"rad -v 0 -s -e -w %s OPTFILE=%s \| egrep '^[ \t]*(NOMATCH",
458	<	rfname, rendopt+2);
458	>	rfargs, rendopt+2);
459		cp = combuf;
460	<	while (cp) cp++; / match unset variables */
460	>	while (*cp) {
461	>	if (*cp == '\|') pippt = cp;
462	>	cp++;
463	>	} /* match unset variables */
464		for (i = 0; mvar[i] >= 0; i++)
465		if (!vdef(mvar[i])) {
466		*cp++ = '\|';
467		strcpy(cp, vnam(mvar[i]));
468		while (*cp) cp++;
469	+	pippt = NULL;
470		}
471	<	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
472	<	cp += 11; /* point to file name */
471	>	if (pippt != NULL)
472	>	strcpy(pippt, "> /dev/null"); /* nothing to match */
473	>	else {
474	>	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
475	>	cp += 11; /* point to file name */
476	>	}
477		if (system(combuf)) {
478	<	fprintf(stderr, "%s: bad rad input file \"%s\"\n",
479	<	progname, rfname);
478	>	fprintf(stderr, "%s: error executing rad command:\n\t%s\n",
479	>	progname, combuf);
480		quit(1);
481		}
482	<	loadvars(cp); /* load variables and remove file */
483	<	unlink(cp);
482	>	if (pippt == NULL) { /* load variables and remove file */
483	>	loadvars(cp);
484	>	unlink(cp);
485	>	}
486		}
487
488
#	Line 449 \| Line 497 \| *animate() / run animation /*
497		i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa);
498		mult = vflt(OVERSAMP);
499		if (i == 3) {
500	<	sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres),
500	>	sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres),
501		(int)(mult*yres), pa);
502	<	sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa);
502	>	sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa);
503		} else if (i) {
504		if (i == 1) yres = xres;
505		sprintf(rresopt, "-x %d -y %d", (int)(mult*xres),
#	Line 479 \| Line 527 \| *animate() / run animation /*
527		/* figure # frames per batch */
528		d1 = multxresmultyres4; /* space for orig. picture */
529		if ((i=vint(INTERP)) \|\| atoi(vval(MBLUR)))
530	<	d1 += multxresmultyres4; /* space for z-buffer */
530	>	d1 += multxresmultyressizeof(float); /* Z-buffer */
531		d2 = xresyres4; /* space for final picture */
532		frames_batch = (i+1)(vflt(DISKSPACE)1048576.-d1)/(d1+i*d2);
533		if (frames_batch < i+2) {
#	Line 487 \| Line 535 \| *animate() / run animation /*
535		progname);
536		quit(1);
537		}
538	+	/* initialize archive argument list */
539	+	i = 16;
540	+	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > i)
541	+	i = strlen(vval(ARCHIVE));
542	+	arcnext = arcfirst = arcargs + i;
543		/* initialize status file */
544		if (astat.rnext == 0)
545		astat.rnext = astat.fnext = astat.tnext = vint(START);
#	Line 581 \| Line 634 \| *filterframes() / catch up with filtering /*
634		dofilt(i, vp, getexp(i), 0); /* filter frame */
635		}
636		bwait(0); /* wait for filter processes */
637	<	archive(astat.fnext, i-1); /* archive originals */
637	>	archive(); /* archive originals */
638		astat.fnext = i; /* update status */
639		putastat();
640		}
#	Line 662 \| Line 715 \| *char vfn;**
715		inspoint = combuf + strlen(combuf);
716		sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
717		/* run in parallel */
718	<	if (pruncom(combuf, inspoint, (last-first+1)/(vint(INTERP)+1))) {
718	>	i = (last-first+1)/(vint(INTERP)+1);
719	>	if (i < 1) i = 1;
720	>	if (pruncom(combuf, inspoint, i)) {
721		fprintf(stderr, "%s: error rendering frames %d through %d\n",
722		progname, first, last);
723		quit(1);
#	Line 740 \| Line 795 \| int frame;
795		}
796
797
798	<	archive(first, last) /* archive and remove renderings */
744	<	int first, last;
798	>	archive() /* archive and remove renderings */
799		{
800		#define RMCOML (sizeof(rmcom)-1)
801		static char rmcom[] = "rm -f";
748	–	int offset = RMCOML;
749	–	char combuf[10240];
750	–	struct stat stb;
751	–	register char *cp;
802		register int i;
803
804	<	if (noaction)
805	<	return;
756	<	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > offset)
757	<	offset = strlen(vval(ARCHIVE));
758	<	cp = combuf + offset;
759	<	cp++ = ' '; / make argument list */
760	<	for (i = first; i <= last; i++) {
761	<	sprintf(cp, vval(BASENAME), i);
762	<	strcat(cp, ".unf");
763	<	if (stat(cp, &stb) == 0 && stb.st_size > 0) { /* non-zero? */
764	<	while (*cp) cp++;
765	<	*cp++ = ' ';
766	<	sprintf(cp, vval(BASENAME), i);
767	<	strcat(cp, ".zbf");
768	<	if (access(cp, F_OK) == 0) { /* exists? */
769	<	while (*cp) cp++;
770	<	*cp++ = ' ';
771	<	}
772	<	}
773	<	}
774	<	*--cp = '\0';
775	<	if (cp <= combuf + offset) /* no files? */
776	<	return;
804	>	if (arcnext == arcfirst)
805	>	return; /* nothing to do */
806		if (vdef(ARCHIVE)) { /* run archive command */
807		i = strlen(vval(ARCHIVE));
808	<	strncpy(combuf+offset-i, vval(ARCHIVE), i);
809	<	if (runcom(combuf+offset-i)) {
810	<	fprintf(stderr,
811	<	"%s: error running archive command on frames %d through %d\n",
783	<	progname, first, last);
808	>	strncpy(arcfirst-i, vval(ARCHIVE), i);
809	>	if (runcom(arcfirst-i)) {
810	>	fprintf(stderr, "%s: error running archive command\n",
811	>	progname);
812		quit(1);
813		}
814		}
815		/* run remove command */
816	<	strncpy(combuf+offset-RMCOML, rmcom, RMCOML);
817	<	runcom(combuf+offset-RMCOML);
816	>	strncpy(arcfirst-RMCOML, rmcom, RMCOML);
817	>	runcom(arcfirst-RMCOML);
818	>	arcnext = arcfirst; /* reset argument list */
819		#undef RMCOML
820		}
821
#	Line 799 \| Line 828 \| *char ep;**
828		int rvr;
829		{
830		extern int frecover();
831	+	static int iter = 0;
832		char fnbefore[128], fnafter[128];
833	<	char combuf[1024], fname[128];
834	<	int usepinterp, usepfilt;
833	>	char combuf[1024], fname0[128], fname1[128];
834	>	int usepinterp, usepfilt, nora_rgbe;
835		int frseq[2];
836		/* check what is needed */
837		usepinterp = atoi(vval(MBLUR));
838		usepfilt = pfiltalways \| ep==NULL;
839	+	if (ep != NULL && !strcmp(ep, "1"))
840	+	ep = "+0";
841	+	nora_rgbe = strcmp(vval(OVERSAMP),"1") \|\| ep==NULL \|\|
842	+	ep != '+' \|\| ep != '-' \|\| !isint(ep);
843		/* compute rendered views */
844		frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
845		frseq[1] = frseq[0] + vint(INTERP) + 1;
#	Line 814 \| Line 848 \| int rvr;
848		if (frseq[1] == frame) { /* pfilt only */
849		frseq[0] = frseq[1];
850		usepinterp = 0; /* update what's needed */
851	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
852	<	} else if (frseq[0] == frame) { /* no interpolation */
853	<	/* update what's needed */
854	<	if (!usepinterp)
855	<	usepfilt \|= vflt(OVERSAMP)>1.01 \|\| strcmp(ep,"1");
851	>	usepfilt \|= nora_rgbe;
852	>	} else if (frseq[0] == frame) { /* no interpolation needed */
853	>	if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */
854	>	*arcnext++ = ' ';
855	>	sprintf(arcnext, vval(BASENAME), frame-vint(INTERP)-1);
856	>	while (*arcnext) arcnext++;
857	>	strcpy(arcnext, ".unf");
858	>	arcnext += 4;
859	>	if (usepinterp \|\| vint(INTERP)) { /* and Z-buf */
860	>	*arcnext++ = ' ';
861	>	sprintf(arcnext, vval(BASENAME),
862	>	frame-vint(INTERP)-1);
863	>	while (*arcnext) arcnext++;
864	>	strcpy(arcnext, ".zbf");
865	>	arcnext += 4;
866	>	}
867	>	}
868	>	if (!usepinterp) /* update what's needed */
869	>	usepfilt \|= nora_rgbe;
870		} else /* interpolation needed */
871		usepinterp++;
872		if (frseq[1] >= astat.rnext) /* next batch unavailable */
#	Line 833 \| Line 881 \| int rvr;
881		return(1);
882		if (atoi(vval(MBLUR))) {
883		FILE fp; / motion blurring */
884	<	sprintf(fname, "%s/vw0", vval(DIRECTORY));
885	<	if (access(fname, F_OK) == 0)
886	<	sleep(10);
887	<	if ((fp = fopen(fname, "w")) == NULL) {
840	<	perror(fname); quit(1);
884	>	sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
885	>	'a'+(iter%26));
886	>	if ((fp = fopen(fname0, "w")) == NULL) {
887	>	perror(fname0); quit(1);
888		}
889		fputs(VIEWSTR, fp);
890		fprintview(vp, fp);
#	Line 848 \| Line 895 \| int rvr;
895		progname, frame+1);
896		quit(1);
897		}
898	<	sprintf(fname, "%s/vw1", vval(DIRECTORY));
899	<	if ((fp = fopen(fname, "w")) == NULL) {
900	<	perror(fname); quit(1);
898	>	sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
899	>	'a'+(iter%26));
900	>	if ((fp = fopen(fname1, "w")) == NULL) {
901	>	perror(fname1); quit(1);
902		}
903		fputs(VIEWSTR, fp);
904		fprintview(vp, fp);
905		putc('\n', fp); fclose(fp);
906		sprintf(combuf,
907	<	"(pmblur %s %d %s/vw0 %s/vw1; rm -f %s/vw0 %s/vw1) \| pinterp -B",
907	>	"(pmblur %s %d %s %s; rm -f %s %s) \| pinterp -B",
908		*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
909	<	atoi(vval(MBLUR)), vval(DIRECTORY),
910	<	vval(DIRECTORY), vval(DIRECTORY),
911	<	vval(DIRECTORY), vval(DIRECTORY));
909	>	atoi(vval(MBLUR)),
910	>	fname0, fname1, fname0, fname1);
911	>	iter++;
912		} else /* no blurring */
913		strcpy(combuf, "pinterp");
914		strcat(combuf, viewopt(vp));
915		if (vbool(RTRACE))
916		sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'",
917	<	rendopt, vval(OCTREE));
917	>	rendopt+1, vval(OCTREE));
918		if (vdef(PINTERP))
919		sprintf(combuf+strlen(combuf), " %s", vval(PINTERP));
920		if (usepfilt)
#	Line 907 \| Line 955 \| int rvr;
955		} else { /* else just check it */
956		if (rvr == 2)
957		return(1);
958	<	sprintf(combuf, "ra_rgbe -r %s.unf", fnbefore);
958	>	sprintf(combuf, "ra_rgbe -e %s -r %s.unf", ep, fnbefore);
959		}
960		/* output file name */
961	<	sprintf(fname, vval(BASENAME), frame);
962	<	sprintf(combuf+strlen(combuf), " > %s.pic", fname);
961	>	sprintf(fname0, vval(BASENAME), frame);
962	>	sprintf(combuf+strlen(combuf), " > %s.pic", fname0);
963		if (rvr) /* in recovery */
964		return(runcom(combuf));
965		bruncom(combuf, frame, frecover); /* else run in background */
#	Line 943 \| Line 991 \| int n;
991		quit(1);
992		}
993		} else if (n < viewnum) { /* rewind file */
994	+	if (viewnum == 1 && feof(viewfp))
995	+	return(&curview); /* just one view */
996		if (fseek(viewfp, 0L, 0) == EOF) {
997		perror(vval(VIEWFILE));
998		quit(1);
#	Line 952 \| Line 1002 \| int n;
1002		}
1003		while (n > viewnum) { /* scan to desired view */
1004		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
1005	<	return(NULL);
1005	>	return(viewnum==1 ? &curview : (VIEW *)NULL);
1006		if (isview(linebuf) && sscanview(&curview, linebuf) > 0)
1007		viewnum++;
1008		}
#	Line 985 \| Line 1035 \| int n;
1035		if (n == 0) { /* signal to close file */
1036		if (expfp != NULL) {
1037		fclose(expfp);
1038	+	free((char *)exppos);
1039		expfp = NULL;
1040		}
1041		return(NULL);
1042	<	}
1042	>	} else if (n > vint(END)) /* request past end (error?) */
1043	>	return(NULL);
1044		if (!vdef(EXPOSURE)) /* no setting (auto) */
1045		return(NULL);
1046		if (isflt(vval(EXPOSURE))) /* always the same */
#	Line 1026 \| Line 1078 \| int n;
1078		}
1079		curfrm++;
1080		cp = fskip(expval); /* check format */
1081	<	if (cp == NULL \|\| *cp != '\n') {
1081	>	if (cp != NULL)
1082	>	while (isspace(*cp))
1083	>	*cp++ = '\0';
1084	>	if (cp == NULL \|\| *cp) {
1085		fprintf(stderr,
1086		"%s: exposure format error on line %d\n",
1087		vval(EXPOSURE), curfrm);
1088		quit(1);
1089		}
1035	–	*cp = '\0';
1090		}
1091		return(expval); /* return value */
1092		}
#	Line 1062 \| Line 1116 \| int pn;
1116		int status;
1117		{
1118		register PROC *pp;
1119	+	register struct pslot *psl;
1120
1121		pp = ps->proc + pn;
1122		if (pp->elen) { /* pass errors */
#	Line 1073 \| Line 1128 \| int status;
1128		if (ps->hostname[0])
1129		status = 1; /* because rsh doesn't return status */
1130		}
1131	+	lastpserver = NULL;
1132	+	psl = findpslot(pp->pid); /* check for bruncom() slot */
1133	+	if (psl->pid) {
1134	+	if (status) {
1135	+	if (psl->rcvf != NULL) /* attempt recovery */
1136	+	status = (*psl->rcvf)(psl->fout);
1137	+	if (status) {
1138	+	fprintf(stderr,
1139	+	"%s: error rendering frame %d\n",
1140	+	progname, psl->fout);
1141	+	quit(1);
1142	+	}
1143	+	lastpserver = ps;
1144	+	}
1145	+	psl->pid = 0; /* free process slot */
1146	+	} else if (status)
1147	+	lastpserver = ps;
1148		freestr(pp->com); /* free command string */
1077	–	lastpid = pp->pid; /* record PID for bwait() */
1078	–	lastpserver = ps; /* record server for serverdown() */
1149		return(status);
1150		}
1151
#	Line 1083 \| Line 1153 \| int status;
1153		int
1154		serverdown() /* check status of last process server */
1155		{
1156	+	if (lastpserver == NULL \|\| !lastpserver->hostname[0])
1157	+	return(0);
1158		if (pserverOK(lastpserver)) /* server still up? */
1159		return(0);
1160		delpserver(lastpserver); /* else delete it */
#	Line 1109 \| Line 1181 \| *int (rf)();**
1181		printf("\t%s\n", com); /* echo command */
1182		return(0);
1183		}
1184	<	/* else start it when we can */
1185	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1184	>	com = savestr(com); /* else start it when we can */
1185	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1186		bwait(1);
1187		if (!silent) { /* echo command */
1188		PSERVER *ps;
#	Line 1132 \| Line 1204 \| *bwait(ncoms) / wait for batch job(s) to finish /*
1204		int ncoms;
1205		{
1206		int status;
1135	–	register struct pslot *psl;
1207
1208		if (noaction)
1209		return;
1210		while ((status = wait4job(NULL, -1)) != -1) {
1211	<	psl = findpslot(lastpid);
1212	<	if (status) { /* attempt recovery */
1213	<	serverdown(); /* check server */
1143	<	if (psl->rcvf == NULL \|\| (*psl->rcvf)(psl->fout)) {
1144	<	fprintf(stderr,
1145	<	"%s: error rendering frame %d\n",
1146	<	progname, psl->fout);
1147	<	quit(1);
1148	<	}
1149	<	}
1150	<	psl->pid = 0; /* free process slot */
1151	<	if (!--ncoms)
1152	<	return; /* done enough */
1211	>	serverdown(); /* update server status */
1212	>	if (--ncoms == 0)
1213	>	break; /* done enough */
1214		}
1215		}
1216
#	Line 1161 \| Line 1222 \| int maxcopies;
1222		{
1223		int retstatus = 0;
1224		int hostcopies;
1225	<	char com1buf[10240], com1, endcom1;
1225	>	char buf[10240], com1, s;
1226		int status;
1227	+	int pfd;
1228	+	register int n;
1229		register PSERVER *ps;
1230
1231		if (!silent)
1232	<	printf("\t%s &\n", com); /* echo command */
1232	>	printf("\t%s\n", com); /* echo command */
1233		if (noaction)
1234		return(0);
1235		fflush(stdout);
#	Line 1174 \| Line 1237 \| int maxcopies;
1237		for (ps = pslist; ps != NULL; ps = ps->next) {
1238		hostcopies = 0;
1239		if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) {
1240	<	strcpy(com1=com1buf, com); /* build -PP command */
1240	>	strcpy(com1=buf, com); /* build -PP command */
1241		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1242		vval(DIRECTORY), phostname(ps));
1243		strcat(com1, ppins);
1244	<	endcom1 = com1 + strlen(com1);
1182	<	sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`",
1183	<	vval(DIRECTORY), phostname(ps));
1184	<	} else {
1244	>	} else
1245		com1 = com;
1246	<	endcom1 = NULL;
1246	>	while (maxcopies > 0) {
1247	>	s = savestr(com1);
1248	>	if (startjob(ps, s, donecom) != -1) {
1249	>	sleep(20);
1250	>	hostcopies++;
1251	>	maxcopies--;
1252	>	} else {
1253	>	freestr(s);
1254	>	break;
1255	>	}
1256		}
1188	–	while (maxcopies > 0 &&
1189	–	startjob(ps, savestr(com1), donecom) != -1) {
1190	–	sleep(10);
1191	–	hostcopies++;
1192	–	maxcopies--;
1193	–	if (endcom1 != NULL)
1194	–	*endcom1 = '\0';
1195	–	}
1257		if (!silent && hostcopies) {
1258		if (hostcopies > 1)
1259		printf("\t%d duplicate processes", hostcopies);
#	Line 1204 \| Line 1265 \| int maxcopies;
1265		}
1266		/* wait for jobs to finish */
1267		while ((status = wait4job(NULL, -1)) != -1)
1268	<	if (status)
1269	<	retstatus += !serverdown(); /* check server */
1268	>	retstatus += status && !serverdown();
1269	>	/* terminate parallel rpict's */
1270	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1271	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1272	>	if ((pfd = open(buf, O_RDONLY)) >= 0) {
1273	>	n = read(pfd, buf, sizeof(buf)-1); /* get PID */
1274	>	buf[n] = '\0';
1275	>	close(pfd);
1276	>	for (n = 0; buf[n] && !isspace(buf[n]); n++)
1277	>	;
1278	>	/* terminate */
1279	>	sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1280	>	wait4job(ps, startjob(ps, buf, NULL));
1281	>	}
1282	>	}
1283		return(retstatus);
1284		}
1285

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/util/ranimate.c (file contents): Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs. Revision 2.23 by gregl, Fri Oct 31 15:02:43 1997 UTC

Diff Legend

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.5 by greg, Tue Jan 23 16:14:28 1996 UTC vs.
Revision 2.23 by gregl, Fri Oct 31 15:02:43 1997 UTC