ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/rholo.c
(Generate patch)

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.70 by greg, Thu Dec 15 16:47:16 2005 UTC vs.
Revision 3.74 by greg, Fri Dec 5 00:22:33 2008 UTC

# Line 21 | Line 21 | static const char      RCSid[] = "$Id$";
21   #define FRAGWARN        20              /* fragmentation for warning (%) */
22   #endif
23   #ifndef MAXQTIME
24 < #define MAXQTIME        5               /* target maximum seconds in queue */
24 > #define MAXQTIME        3               /* target maximum seconds in queue */
25   #endif
26                                          /* manual cache flushing frequency */
27   #ifndef RTFLUSH
# Line 164 | Line 164 | main(
164          quit(0);
165   userr:
166          fprintf(stderr,
167 < "Usage: %s [-n nprocs][-o disp][-w][-r|-f] output.hdk [control.hif|+|- [VAR=val ..]]\n",
167 > "Usage: %s [-n nprocs][-o disp][-i][-w][-r|-f] output.hdk [control.hif|+|- [VAR=val ..]]\n",
168                          progname);
169          quit(1);
170          return 1; /* pro forma return */
# Line 319 | Line 319 | memerr:
319   static int
320   rholo(void)                             /* holodeck main loop */
321   {
322 <        static long     nextfragwarn = 100L<<20;
322 >        static off_t    nextfragwarn = 100L<<20;
323          static int      idle = 0;
324          PACKET  *pl = NULL, *plend;
325          off_t   fsiz;
# Line 534 | Line 534 | loadholo(void)                 /* start loading a holodeck from fnam
534                          error(SYSTEM, errmsg);
535                  }
536                  if (ncprocs > 0) {
537 <                        sprintf(errmsg,
538 <                        "\"%s\" opened read-only; new rays will be discarded",
539 <                                        hdkfile);
537 >                        sprintf(errmsg, "\"%s\" is read-only", hdkfile);
538 >                        if (outdev == NULL)
539 >                                error(USER, errmsg);
540 >                        strcat(errmsg, "; new rays will be discarded");
541                          error(WARNING, errmsg);
542                          force = -1;
543                  }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines