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

Comparing ray/src/hd/holofile.c (file contents):
Revision 3.5 by gregl, Wed Nov 5 17:28:49 1997 UTC vs.
Revision 3.6 by gregl, Thu Nov 6 09:37:04 1997 UTC

# Line 22 | Line 22 | static char SCCSid[] = "$SunId$ SGI";
22   #define PCTFREE         20      /* maximum fraction to free (%) */
23   #endif
24  
25 + #ifndef BSD
26 + #define write   writebuf        /* safe i/o routines */
27 + #define read    readbuf
28 + #endif
29 +
30   #define MAXFRAG         (128*FRAGBLK)   /* maximum fragments per file */
31  
32   #define FRAGBLK         64      /* number of fragments to allocate at a time */
# Line 78 | Line 83 | register int   fd;
83   }
84  
85  
86 + markdirty(hp)                   /* mark holodeck section directory dirty */
87 + register HOLO   *hp;
88 + {
89 +        static BEAMI    smudge = {0, -1};
90 +
91 +        if (hp->dirty)          /* already marked? */
92 +                return;
93 +        hp->dirty = 1;
94 +        if (lseek(hp->fd, biglob(hp)->fo+(nbeams(hp)-1)*sizeof(BEAMI), 0) < 0
95 +                        || write(hp->fd, (char *)&smudge,
96 +                                        sizeof(BEAMI)) != sizeof(BEAMI))
97 +                error(SYSTEM, "seek/write error in markdirty");
98 + }
99 +
100 +
101   HOLO *
102   hdinit(fd, hproto)      /* initialize a holodeck section in a file */
103   int     fd;                     /* corresponding file descriptor */
# Line 102 | Line 122 | HDGRID *hproto;                /* holodeck section grid */
122                  n = nbeams(hp)*sizeof(BEAMI);
123                  if (read(fd, (char *)(hp->bi+1), n) != n)
124                          error(SYSTEM, "failure loading holodeck directory");
125 +                                                /* check that it's clean */
126 +                if (hp->bi[nbeams(hp)].fo < 0)
127 +                        error(USER, "dirty holodeck section");
128          } else {                        /* assume we're creating it */
129                  if ((hp = hdalloc(hproto)) == NULL)
130                          goto memerr;
# Line 375 | Line 398 | register int   i;
398          }
399          biglob(hp)->nrd += nrays - hp->bi[i].nrd;
400          hp->bi[i].nrd = nrays;
401 <        hp->dirty++;            /* section directory now out of date */
401 >        markdirty(hp);          /* section directory now out of date */
402          return(1);
403   }
404  

Diff Legend

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