--- ray/src/util/glareval.c 1991/04/19 17:41:06 1.14 +++ ray/src/util/glareval.c 1991/06/26 13:35:16 1.18 @@ -20,7 +20,7 @@ static char SCCSid[] = "$SunId$ LBL"; #define vfork fork #endif -#define MAXSBUF 524268 /* maximum total size of scanline buffer */ +#define MAXSBUF 786432 /* maximum total size of scanline buffer */ #define HSIZE 317 /* size of scanline hash table */ #define NRETIRE 16 /* number of scanlines to retire at once */ @@ -49,6 +49,7 @@ static SCAN *hashtab[HSIZE]; /* scanline hash table */ static long ncall = 0L; /* number of calls to getpictscan */ static long nread = 0L; /* number of scanlines read */ +static long nrecl = 0L; /* number of scanlines reclaimed */ static int wrongformat = 0; @@ -77,12 +78,7 @@ int y; if (sl->y == y) { /* reclaim */ sl->next = hashtab[hi]; hashtab[hi] = sl; -#ifdef DEBUG - if (verbose) - fprintf(stderr, - "%s: scanline %d reclaimed\n", - progname, y); -#endif + nrecl++; } return(sl); } @@ -146,13 +142,15 @@ pict_stats() /* print out picture read statistics */ { static long lastcall = 0L; /* ncall at last report */ static long lastread = 0L; /* nread at last report */ + static long lastrecl = 0L; /* nrecl at last report */ if (ncall == lastcall) return; - fprintf(stderr, "%s: %ld scanlines read in %ld calls\n", - progname, nread-lastread, ncall-lastcall); + fprintf(stderr, "%s: %ld scanlines read (%ld reclaimed) in %ld calls\n", + progname, nread-lastread, nrecl-lastrecl, ncall-lastcall); lastcall = ncall; lastread = nread; + lastrecl = nrecl; } #endif @@ -344,7 +342,7 @@ char *av[]; dup2(p0[0], 0); close(p0[0]); } - if (p1[1] != 0) { /* connect p1 to stdout */ + if (p1[1] != 1) { /* connect p1 to stdout */ dup2(p1[1], 1); close(p1[1]); } @@ -479,7 +477,7 @@ initscans() /* initialize scanline buffers */ /* allocate scanline buffers */ scansize = sizeof(SCAN) + pxsiz*sizeof(COLR); #ifdef ALIGN - scansize = scansize+(sizeof(ALIGN)-1)) & ~(sizeof(ALIGN)-1); + scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1); #endif i = MAXSBUF / scansize; /* compute number to allocate */ if (i > HSIZE)