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

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.28 by greg, Fri Oct 19 16:53:37 2018 UTC vs.
Revision 2.29 by greg, Sat Oct 20 15:02:51 2018 UTC

# Line 21 | Line 21 | static const char RCSid[] = "$Id$";
21   #endif
22  
23   typedef struct {
24 +        void    *mapped;        /* memory-mapped pointer */
25          void    *base;          /* pointer to base memory */
26          size_t  len;            /* allocated memory length */
26 –        int     mapped;         /* memory-mapped file? */
27   } MEMLOAD;              /* file loaded/mapped into memory */
28  
29   typedef struct {
# Line 42 | Line 42 | free_load(MEMLOAD *mp)
42                  return;
43   #ifdef MAP_FILE
44          if (mp->mapped)
45 <                munmap(mp->base, mp->len);
45 >                munmap(mp->mapped, mp->len);
46          else
47   #endif
48                  free(mp->base);
49 +        mp->mapped = NULL;
50          mp->base = NULL;
51          mp->len = 0;
52   }
# Line 60 | Line 61 | load_stream(MEMLOAD *mp, FILE *fp)
61  
62          if (mp == NULL)
63                  return(-1);
64 +        mp->mapped = NULL;
65          mp->base = NULL;
66          mp->len = 0;
65 –        mp->mapped = 0;
67          if (fp == NULL)
68                  return(-1);
69          while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
# Line 98 | Line 99 | load_file(MEMLOAD *mp, FILE *fp)
99   #endif
100          if (mp == NULL)
101                  return(-1);
102 +        mp->mapped = NULL;
103          mp->base = NULL;
104          mp->len = 0;
103 –        mp->mapped = 0;
105          if (fp == NULL)
106                  return(-1);
107          fd = fileno(fp);
# Line 111 | Line 112 | load_file(MEMLOAD *mp, FILE *fp)
112          mp->len = (size_t)(flen - skip);
113   #ifdef MAP_FILE
114          if (mp->len > 1L<<20) {         /* map file if > 1 MByte */
115 <                mp->base = mmap(NULL, flen, PROT_READ, MAP_PRIVATE, fd, 0);
116 <                if (mp->base != MAP_FAILED) {
117 <                        mp->base = (char *)mp->base + skip;
117 <                        mp->mapped = 1;
115 >                mp->mapped = mmap(NULL, flen, PROT_READ, MAP_PRIVATE, fd, 0);
116 >                if (mp->mapped != MAP_FAILED) {
117 >                        mp->base = (char *)mp->mapped + skip;
118                          return(1);      /* mmap() success */
119                  }
120 <                mp->base = NULL;        /* else fall back to reading it in... */
120 >                mp->mapped = NULL;      /* else fall back to reading it in... */
121          }
122   #endif
123          if (lseek(fd, skip, SEEK_SET) != skip ||

Diff Legend

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