ViewVC Help

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

root/Development/ray/src/hd/rholo.c

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.20 by gregl, Fri Dec 12 11:13:16 1997 UTC vs.
Revision 3.21 by gregl, Fri Dec 12 18:12:40 1997 UTC

#	Line 281 | Line 281 | rholo()                                /* holodeck main loop */
281		return(0);
282		/* display only? */
283		if (nprocs <= 0)
284	<	return(1);
284	>	return(outdev != NULL);
285		/* check file size */
286		if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
287		error(WARNING, "file limit exceeded");
288	<	return(0);
288	>	done_rtrace();
289	>	idle = 1;
290	>	return(1);      /* comes back */
291		}
292		/* check time */
293		if (endtime > 0 || reporttime > 0)
294		t = time(NULL);
295		if (endtime > 0 && t >= endtime) {
296		error(WARNING, "time limit exceeded");
297	<	return(0);
297	>	done_rtrace();
298	>	idle = 1;
299	>	return(1);      /* comes back */
300		}
301		if (reporttime > 0 && t >= reporttime)
302		report(t);
#	Line 301 | Line 305 | rholo()                                /* holodeck main loop */
305		p = freepacks; freepacks = p->next; p->next = NULL;
306		if (!next_packet(p)) {
307		p->next = freepacks; freepacks = p;
308	+	idle = 1;
309		break;
310		}
311		if (pl == NULL) pl = p;
312		else plend->next = p;
313		plend = p;
314		}
315	<	idle = pl == NULL && freepacks != NULL;
311	<	/* are we out of stuff to do? */
312	<	if (idle && outdev == NULL)
313	<	return(0);
314	<	/* else process packets */
315	>	/* process packets */
316		done_packets(do_packets(pl));
317		return(1);                      /* and continue */
318		}
#	Line 320 | Line 321 | rholo()                                /* holodeck main loop */
321		report(t)                       /* report progress so far */
322		time_t  t;
323		{
324	<	if (t == 0)
324	>	static time_t   seconds2go = 1000000;
325	>
326	>	if (t == 0L)
327		t = time(NULL);
328	<	fprintf(stderr, "%s: %ld packets (%ld rays) done after %.2f hours\n",
329	<	progname, npacksdone, nraysdone, (t-starttime)/3600.);
330	<	fflush(stderr);
331	<	if (vdef(REPORT))
332	<	reporttime = t + (time_t)(vflt(REPORT)*60.+.5);
328	>	sprintf(errmsg, "%ld packets (%ld rays) done after %.2f hours\n",
329	>	npacksdone, nraysdone, (t-starttime)/3600.);
330	>	eputs(errmsg);
331	>	if (seconds2go == 1000000)
332	>	seconds2go = vdef(REPORT) ? (long)(vflt(REPORT)*60. + .5) : 0L;
333	>	if (seconds2go)
334	>	reporttime = t + seconds2go;
335		}
336
337
#	Line 508 | Line 513 | PACKET *pl;
513		}
514
515
516	<	checkrad()                      /* check to make sure octree is up to date */
516	>	int
517	>	done_rtrace()                   /* clean up and close rtrace calculation */
518		{
519	+	int     status;
520	+	/* already closed? */
521	+	if (!nprocs)
522	+	return;
523	+	/* report activity */
524	+	wputs("closing rtrace process...\n");
525	+	/* flush beam queue */
526	+	done_packets(flush_queue());
527	+	/* close rtrace */
528	+	if ((status = end_rtrace()))
529	+	error(WARNING, "bad exit status from rtrace");
530	+	if (vdef(REPORT))               /* report time */
531	+	report(0);
532	+	return(status);                 /* return status */
533	+	}
534	+
535	+
536	+	new_rtrace()                    /* restart rtrace calculation */
537	+	{
538		char    combuf[128];
539
540	<	if (!vdef(RIF))
540	>	if (nprocs > 0)                 /* already running? */
541		return;
542	<	sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
543	<	if (system(combuf))
544	<	error(WARNING, "error running rad");
542	>	wputs("restarting rtrace process...\n");
543	>	if (vdef(RIF)) {                /* rerun rad to update octree */
544	>	sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
545	>	if (system(combuf))
546	>	error(WARNING, "error running rad");
547	>	}
548	>	if (start_rtrace() < 1)         /* start rtrace */
549	>	error(WARNING, "cannot restart rtrace");
550	>	else if (vdef(REPORT))
551	>	report(0);
552		}
553
554
#	Line 622 | Line 654 | int    ec;
654		int     status = 0;
655
656		if (hdlist[0] != NULL) {        /* flush holodeck */
657	<	if (nprocs > 0) {
658	<	done_packets(flush_queue());
627	<	status = end_rtrace();  /* close rtrace */
628	<	}
657	>	if (nprocs > 0)
658	>	status = done_rtrace();
659		hdflush(NULL);
660		if (ncprocs > 0 && vdef(REPORT)) {
661		long    fsiz, fuse;
632	–	report(0);
662		fsiz = hdfilen(hdlist[0]->fd);
663		fuse = hdfiluse(hdlist[0]->fd, 1);
664		fprintf(stderr,

Diff Legend

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