ViewVC Help

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

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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.16 by greg, Thu Jun 27 06:49:50 1996 UTC vs.
Revision 2.20 by greg, Wed Jul 17 17:45:11 1996 UTC

#	Line 108 | Line 108 | struct pslot {
108		}       *pslot;                 /* process slots */
109		int     npslots;                /* number of process slots */
110
111	–	int     lastpid;                /* ID of last completed background process */
112	–	PSERVER *lastpserver;           /* last process server used */
113	–
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
#	Line 231 | Line 230 | getastat()                     /* check/set animation status */
230		}
231		/* assume it is dead */
232		}
233	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
233	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) {   /* other's */
234		fprintf(stderr, "%s: unfinished job \"%s\"\n",
235		progname, astat.cfname);
236		return(-1);
#	Line 301 | Line 300 | checkdir()                     /* make sure we have our directory */
300		setdefaults()                   /* set default values */
301		{
302		extern char     *atos();
303	+	int     decades;
304		char    buf[256];
305
306		if (vdef(ANIMATE)) {
#	Line 334 | Line 334 | setdefaults()                  /* set default values */
334		quit(1);
335		}
336		if (!vdef(BASENAME)) {
337	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
337	>	decades = (int)log10((double)vint(END)) + 1;
338	>	if (decades < 3) decades = 3;
339	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
340		vval(BASENAME) = savqstr(buf);
341		vdef(BASENAME)++;
342		}
#	Line 1101 | Line 1103 | int    pn;
1103		int     status;
1104		{
1105		register PROC   *pp;
1106	+	register struct pslot   *psl;
1107
1108		pp = ps->proc + pn;
1109		if (pp->elen) {                 /* pass errors */
#	Line 1112 | Line 1115 | int    status;
1115		if (ps->hostname[0])
1116		status = 1;     /* because rsh doesn't return status */
1117		}
1118	+	lastpserver = NULL;
1119	+	psl = findpslot(pp->pid);       /* check for bruncom() slot */
1120	+	if (psl->pid) {
1121	+	if (status) {
1122	+	if (psl->rcvf != NULL)  /* attempt recovery */
1123	+	status = (*psl->rcvf)(psl->fout);
1124	+	if (status) {
1125	+	fprintf(stderr,
1126	+	"%s: error rendering frame %d\n",
1127	+	progname, psl->fout);
1128	+	quit(1);
1129	+	}
1130	+	lastpserver = ps;
1131	+	}
1132	+	psl->pid = 0;                   /* free process slot */
1133	+	} else if (status)
1134	+	lastpserver = ps;
1135		freestr(pp->com);               /* free command string */
1116	–	lastpid = pp->pid;              /* record PID for bwait() */
1117	–	lastpserver = ps;               /* record server for serverdown() */
1136		return(status);
1137		}
1138
#	Line 1122 | Line 1140 | int    status;
1140		int
1141		serverdown()                    /* check status of last process server */
1142		{
1143	+	if (lastpserver == NULL || !lastpserver->hostname[0])
1144	+	return(0);
1145		if (pserverOK(lastpserver))     /* server still up? */
1146		return(0);
1147		delpserver(lastpserver);        /* else delete it */
#	Line 1148 | Line 1168 | int    (*rf)();
1168		printf("\t%s\n", com);  /* echo command */
1169		return(0);
1170		}
1171	<	/* else start it when we can */
1172	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1171	>	com = savestr(com);             /* else start it when we can */
1172	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1173		bwait(1);
1174		if (!silent) {                          /* echo command */
1175		PSERVER *ps;
#	Line 1171 | Line 1191 | bwait(ncoms)                           /* wait for batch job(s) to finish */
1191		int     ncoms;
1192		{
1193		int     status;
1174	–	register struct pslot   *psl;
1194
1195		if (noaction)
1196		return;
1197		while ((status = wait4job(NULL, -1)) != -1) {
1198	<	psl = findpslot(lastpid);
1199	<	if (status) {           /* attempt recovery */
1200	<	serverdown();   /* check server */
1182	<	if (psl->rcvf == NULL || (*psl->rcvf)(psl->fout)) {
1183	<	fprintf(stderr,
1184	<	"%s: error rendering frame %d\n",
1185	<	progname, psl->fout);
1186	<	quit(1);
1187	<	}
1188	<	}
1189	<	psl->pid = 0;           /* free process slot */
1190	<	if (!--ncoms)
1191	<	return;         /* done enough */
1198	>	serverdown();           /* update server status */
1199	>	if (--ncoms == 0)
1200	>	break;          /* done enough */
1201		}
1202		}
1203
#	Line 1200 | Line 1209 | int    maxcopies;
1209		{
1210		int     retstatus = 0;
1211		int     hostcopies;
1212	<	char    com1buf[10240], *com1, *endcom1;
1212	>	char    buf[10240], *com1, *s;
1213		int     status;
1214	+	int     pfd;
1215	+	register int    n;
1216		register PSERVER        *ps;
1217
1218		if (!silent)
#	Line 1213 | Line 1224 | int    maxcopies;
1224		for (ps = pslist; ps != NULL; ps = ps->next) {
1225		hostcopies = 0;
1226		if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) {
1227	<	strcpy(com1=com1buf, com);      /* build -PP command */
1227	>	strcpy(com1=buf, com);  /* build -PP command */
1228		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1229		vval(DIRECTORY), phostname(ps));
1230		strcat(com1, ppins);
1231	<	endcom1 = com1 + strlen(com1);
1221	<	sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`",
1222	<	vval(DIRECTORY), phostname(ps));
1223	<	} else {
1231	>	} else
1232		com1 = com;
1233	<	endcom1 = NULL;
1233	>	while (maxcopies > 0) {
1234	>	s = savestr(com1);
1235	>	if (startjob(ps, s, donecom) != -1) {
1236	>	sleep(20);
1237	>	hostcopies++;
1238	>	maxcopies--;
1239	>	} else {
1240	>	freestr(s);
1241	>	break;
1242	>	}
1243		}
1227	–	while (maxcopies > 0 &&
1228	–	startjob(ps, savestr(com1), donecom) != -1) {
1229	–	sleep(10);
1230	–	hostcopies++;
1231	–	maxcopies--;
1232	–	if (endcom1 != NULL)
1233	–	*endcom1 = '\0';
1234	–	}
1244		if (!silent && hostcopies) {
1245		if (hostcopies > 1)
1246		printf("\t%d duplicate processes", hostcopies);
#	Line 1243 | Line 1252 | int    maxcopies;
1252		}
1253		/* wait for jobs to finish */
1254		while ((status = wait4job(NULL, -1)) != -1)
1255	<	if (status)
1256	<	retstatus += !serverdown();     /* check server */
1255	>	retstatus += status && !serverdown();
1256	>	/* terminate parallel rpict's */
1257	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1258	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1259	>	if ((pfd = open(buf, O_RDONLY)) >= 0) {
1260	>	n = read(pfd, buf, sizeof(buf)-1);      /* get PID */
1261	>	buf[n] = '\0';
1262	>	close(pfd);
1263	>	for (n = 0; buf[n] && !isspace(buf[n]); n++)
1264	>	;
1265	>	/* terminate */
1266	>	sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1267	>	wait4job(ps, startjob(ps, buf, NULL));
1268	>	}
1269	>	}
1270		return(retstatus);
1271		}
1272

Diff Legend

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