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

Comparing ray/src/hd/holofile.c (file contents):
Revision 3.54 by greg, Wed Oct 22 02:06:34 2003 UTC vs.
Revision 3.56 by greg, Thu Sep 9 01:06:19 2004 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12   #include <string.h>
13  
14   #include "platform.h"
15 + #include "rtprocess.h"
16  
17   #include "holo.h"
18  
# Line 63 | Line 64 | static struct fraglist {
64  
65   static int      nhdfragls;      /* size of hdfragl array */
66  
67 + static HOLO *hdalloc(HDGRID *hproto);
68 + static char *hdrealloc(char *ptr, unsigned siz, char *rout);
69 + static void hdattach(int fd, int wr);
70 + static void hdrelease(int fd);
71 + static void hdmarkdirty(HOLO *hp, int i);
72 + static unsigned int hdmemuse(int all);
73 + static int hdfilord(const void *hb1, const void *hb2);
74 + static off_t hdallocfrag(int fd, uint32 nrays);
75 + static int hdsyncbeam(HOLO *hp, int i);
76 + static int hdlrulist(HDBEAMI *hb, int nents, int n, HOLO *hp);
77 + static int hdfreecache(int pct, HOLO *honly);
78  
79 +
80 +
81   HOLO *
82 < hdalloc(hproto)         /* allocate and set holodeck section based on grid */
83 < HDGRID  *hproto;
82 > hdalloc(                /* allocate and set holodeck section based on grid */
83 >        HDGRID  *hproto
84 > )
85   {
86          HOLO    hdhead;
87          register HOLO   *hp;
# Line 99 | Line 114 | HDGRID *hproto;
114  
115  
116   char *
117 < hdrealloc(ptr, siz, rout)       /* (re)allocate memory, retry then error */
118 < char    *ptr;
119 < unsigned        siz;
120 < char    *rout;
117 > hdrealloc(      /* (re)allocate memory, retry then error */
118 >        char    *ptr,
119 >        unsigned        siz,
120 >        char    *rout
121 > )
122   {
123          register char   *newp;
124                                          /* call malloc/realloc */
# Line 122 | Line 138 | char   *rout;
138   }
139  
140  
141 < hdattach(fd, wr)        /* start tracking file fragments for some section */
142 < register int    fd;
143 < int     wr;
141 > void
142 > hdattach(       /* start tracking file fragments for some section */
143 >        register int    fd,
144 >        int     wr
145 > )
146   {
147          if (fd >= nhdfragls) {
148                  hdfragl = (struct fraglist *)hdrealloc((char *)hdfragl,
# Line 143 | Line 161 | int    wr;
161   /* Do we need a routine to locate file fragments given known occupants? */
162  
163  
164 < hdrelease(fd)           /* stop tracking file fragments for some section */
165 < register int    fd;
164 > void
165 > hdrelease(              /* stop tracking file fragments for some section */
166 >        register int    fd
167 > )
168   {
169          if ((fd < 0) | (fd >= nhdfragls) || !hdfragl[fd].nlinks)
170                  return;
# Line 156 | Line 176 | register int   fd;
176   }
177  
178  
179 < HOLO *
180 < hdinit(fd, hproto)      /* initialize a holodeck section in a file */
181 < int     fd;                     /* corresponding file descriptor */
182 < HDGRID  *hproto;                /* holodeck section grid */
179 > extern HOLO *
180 > hdinit( /* initialize a holodeck section in a file */
181 >        int     fd,                     /* corresponding file descriptor */
182 >        HDGRID  *hproto         /* holodeck section grid */
183 > )
184   {
185          off_t   rtrunc;
186          off_t   fpos;
# Line 238 | Line 259 | HDGRID *hproto;                /* holodeck section grid */
259          return(hp);
260   memerr:
261          error(SYSTEM, "cannot allocate holodeck grid");
262 +        return NULL; /* pro forma return */
263   }
264  
265  
266 < hdmarkdirty(hp, i)              /* mark holodeck directory position dirty */
267 < register HOLO   *hp;
268 < int     i;
266 > void
267 > hdmarkdirty(            /* mark holodeck directory position dirty */
268 >        register HOLO   *hp,
269 >        int     i
270 > )
271   {
272          static BEAMI    smudge = {0, -1};
273          int     mindist, minpos;
# Line 293 | Line 317 | int    i;
317   }
318  
319  
320 < int
321 < hdsync(hp, all)                 /* update beams and directory on disk */
322 < register HOLO   *hp;
323 < int     all;
320 > extern int
321 > hdsync(                 /* update beams and directory on disk */
322 >        register HOLO   *hp,
323 >        int     all
324 > )
325   {
326          register int    j, n;
327  
# Line 326 | Line 351 | int    all;
351   }
352  
353  
354 < unsigned
355 < hdmemuse(all)           /* return memory usage (in bytes) */
356 < int     all;                    /* include overhead (painful) */
354 > unsigned int
355 > hdmemuse(               /* return memory usage (in bytes) */
356 >        int     all                     /* include overhead (painful) */
357 > )
358   {
359          long    total = 0;
360          register int    i, j;
# Line 355 | Line 381 | int    all;                    /* include overhead (painful) */
381   }
382  
383  
384 < off_t
385 < hdfilen(fd)             /* return file length for fd */
386 < int     fd;
384 > extern off_t
385 > hdfilen(                /* return file length for fd */
386 >        int     fd
387 > )
388   {
389          off_t   fpos, flen;
390  
# Line 374 | Line 401 | int    fd;
401   }
402  
403  
404 < off_t
405 < hdfiluse(fd, all)       /* compute file usage (in bytes) */
406 < int     fd;                     /* open file descriptor to check */
407 < int     all;                    /* include overhead and unflushed data */
404 > extern off_t
405 > hdfiluse(       /* compute file usage (in bytes) */
406 >        int     fd                      /* open file descriptor to check */
407 > )
408   {
409          off_t   total = 0;
410          register int    i, j;
# Line 386 | Line 413 | int    all;                    /* include overhead and unflushed data */
413                  if (hdlist[j]->fd != fd)
414                          continue;
415                  total += biglob(hdlist[j])->nrd * sizeof(RAYVAL);
416 <                if (all) {
417 <                        for (i = nbeams(hdlist[j]); i > 0; i--)
418 <                                if (hdlist[j]->bl[i] != NULL)
419 <                                        total += sizeof(RAYVAL) *
416 >                i = nbeams(hdlist[j]);
417 >                total += i*sizeof(BEAMI) + sizeof(HDGRID);
418 >                for ( ; i > 0; i--)
419 >                        if (hdlist[j]->bl[i] != NULL)
420 >                                total += sizeof(RAYVAL) *
421                                                  (hdlist[j]->bl[i]->nrm -
422                                                  hdlist[j]->bi[i].nrd);
395 –                        total += sizeof(HDGRID) +
396 –                                        nbeams(hdlist[j])*sizeof(BEAMI);
397 –                }
423          }
424          return(total);          /* does not include fragments */
425   }
426  
427  
428 < RAYVAL *
429 < hdnewrays(hp, i, nr)    /* allocate space for add'l rays and return pointer */
430 < register HOLO   *hp;
431 < register int    i;
432 < int     nr;                     /* number of new rays desired */
428 > extern RAYVAL *
429 > hdnewrays(      /* allocate space for add'l rays and return pointer */
430 >        register HOLO   *hp,
431 >        register int    i,
432 >        int     nr                      /* number of new rays desired */
433 > )
434   {
435          RAYVAL  *p;
436          int     n;
# Line 444 | Line 470 | int    nr;                     /* number of new rays desired */
470   }
471  
472  
473 < BEAM *
474 < hdgetbeam(hp, i)        /* get beam (from file if necessary) */
475 < register HOLO   *hp;
476 < register int    i;
473 > extern BEAM *
474 > hdgetbeam(      /* get beam (from file if necessary) */
475 >        register HOLO   *hp,
476 >        register int    i
477 > )
478   {
479          register int    n;
480  
# Line 475 | Line 502 | register int   i;
502  
503  
504   int
505 < hdfilord(hb1, hb2)      /* order beams for quick loading */
506 < register HDBEAMI        *hb1, *hb2;
505 > hdfilord(       /* order beams for quick loading */
506 >        register const void     *hb1,
507 >        register const void     *hb2
508 > )
509   {
510          register off_t  c;
511                                  /* residents go first */
512 <        if (hb2->h->bl[hb2->b] != NULL)
513 <                return(hb1->h->bl[hb1->b] == NULL);
514 <        if (hb1->h->bl[hb1->b] != NULL)
512 >        if (((HDBEAMI*)hb2)->h->bl[((HDBEAMI*)hb2)->b] != NULL)
513 >                return(((HDBEAMI*)hb1)->h->bl[((HDBEAMI*)hb1)->b] == NULL);
514 >        if (((HDBEAMI*)hb1)->h->bl[((HDBEAMI*)hb1)->b] != NULL)
515                  return(-1);
516                                  /* otherwise sort by file descriptor */
517 <        if (hb1->h->fd != hb2->h->fd)
518 <                return(hb1->h->fd - hb2->h->fd);
517 >        if (((HDBEAMI*)hb1)->h->fd != ((HDBEAMI*)hb2)->h->fd)
518 >                return(((HDBEAMI*)hb1)->h->fd - ((HDBEAMI*)hb2)->h->fd);
519                                  /* then by position in file */
520 <        c = hb1->h->bi[hb1->b].fo - hb2->h->bi[hb2->b].fo;
520 >        c = ((HDBEAMI*)hb1)->h->bi[((HDBEAMI*)hb1)->b].fo
521 >                - ((HDBEAMI*)hb2)->h->bi[((HDBEAMI*)hb2)->b].fo;
522          return(c > 0 ? 1 : c < 0 ? -1 : 0);
523   }
524  
525  
526 < hdloadbeams(hb, n, bf)  /* load a list of beams in optimal order */
527 < register HDBEAMI        *hb;    /* list gets sorted by hdfilord() */
528 < int     n;                      /* list length */
529 < void    (*bf)();                /* callback function (optional) */
526 > extern void
527 > hdloadbeams(    /* load a list of beams in optimal order */
528 >        register HDBEAMI        *hb,    /* list gets sorted by hdfilord() */
529 >        int     n,                      /* list length */
530 >        void    (*bf)(BEAM *bp, HDBEAMI *hb)    /* callback function (optional) */
531 > )
532   {
533          unsigned        origcachesize, memuse;
534          int     bytesloaded, needbytes, bytes2free;
# Line 538 | Line 570 | void   (*bf)();                /* callback function (optional) */
570   }
571  
572  
573 < int
574 < hdfreefrag(hp, i)                       /* free a file fragment */
575 < HOLO    *hp;
576 < int     i;
573 > extern int
574 > hdfreefrag(                     /* free a file fragment */
575 >        HOLO    *hp,
576 >        int     i
577 > )
578   {
579          register BEAMI  *bi = &hp->bi[i];
580          register struct fraglist        *f;
# Line 617 | Line 650 | int    i;
650   }
651  
652  
653 < int
654 < hdfragOK(fd, listlen, listsiz)  /* get fragment list status for file */
655 < int     fd;
656 < int     *listlen;
657 < register int32  *listsiz;
653 > extern int
654 > hdfragOK(       /* get fragment list status for file */
655 >        int     fd,
656 >        int     *listlen,
657 >        register int32  *listsiz
658 > )
659   {
660          register struct fraglist        *f;
661          register int    i;
# Line 642 | Line 676 | register int32 *listsiz;
676  
677  
678   off_t
679 < hdallocfrag(fd, nrays)          /* allocate a file fragment */
680 < int     fd;
681 < uint32  nrays;
679 > hdallocfrag(            /* allocate a file fragment */
680 >        int     fd,
681 >        uint32  nrays
682 > )
683   {
684          register struct fraglist        *f;
685          register int    j;
# Line 671 | Line 706 | uint32 nrays;
706  
707  
708   int
709 < hdsyncbeam(hp, i)               /* sync beam in memory with beam on disk */
710 < register HOLO   *hp;
711 < register int    i;
709 > hdsyncbeam(             /* sync beam in memory with beam on disk */
710 >        register HOLO   *hp,
711 >        register int    i
712 > )
713   {
714          int     fragfreed;
715          uint32  nrays;
# Line 711 | Line 747 | register int   i;
747   }
748  
749  
750 < int
751 < hdfreebeam(hp, i)               /* free beam, writing if dirty */
752 < register HOLO   *hp;
753 < register int    i;
750 > extern int
751 > hdfreebeam(             /* free beam, writing if dirty */
752 >        register HOLO   *hp,
753 >        register int    i
754 > )
755   {
756          int     nchanged;
757  
# Line 752 | Line 789 | register int   i;
789   }
790  
791  
792 < int
793 < hdkillbeam(hp, i)               /* delete beam from holodeck */
794 < register HOLO   *hp;
795 < register int    i;
792 > extern int
793 > hdkillbeam(             /* delete beam from holodeck */
794 >        register HOLO   *hp,
795 >        register int    i
796 > )
797   {
798          int     nchanged;
799  
# Line 798 | Line 836 | register int   i;
836  
837  
838   int
839 < hdlrulist(hb, nents, n, hp)     /* add beams from holodeck to LRU list */
840 < register HDBEAMI        *hb;            /* beam list */
841 < int     nents;                          /* current list length */
842 < int     n;                              /* maximum list length */
843 < register HOLO   *hp;                    /* section we're adding from */
839 > hdlrulist(      /* add beams from holodeck to LRU list */
840 >        register HDBEAMI        *hb,            /* beam list */
841 >        int     nents,                          /* current list length */
842 >        int     n,                              /* maximum list length */
843 >        register HOLO   *hp                     /* section we're adding from */
844 > )
845   {
846          register int    i, j;
847                                          /* insert each beam from hp */
# Line 830 | Line 869 | register HOLO  *hp;                    /* section we're adding from */
869  
870  
871   int
872 < hdfreecache(pct, honly)         /* free up cache space, writing changes */
873 < int     pct;                            /* maximum percentage to free */
874 < register HOLO   *honly;                 /* NULL means check all */
872 > hdfreecache(            /* free up cache space, writing changes */
873 >        int     pct,                            /* maximum percentage to free */
874 >        register HOLO   *honly                  /* NULL means check all */
875 > )
876   {
877          HDBEAMI hb[FREEBEAMS];
878          int     freetarget;
# Line 873 | Line 913 | register HOLO  *honly;                 /* NULL means check all */
913   }
914  
915  
916 < hddone(hp)              /* clean up holodeck section and free */
917 < register HOLO   *hp;            /* NULL means clean up all */
916 > extern void
917 > hddone(         /* clean up holodeck section and free */
918 >        register HOLO   *hp             /* NULL means clean up all */
919 > )
920   {
921          register int    i;
922  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines