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.19 by greg, Thu Sep 18 00:12:42 2014 UTC vs.
Revision 2.22 by greg, Fri Mar 4 00:21:21 2016 UTC

# Line 20 | Line 20 | static const char RCSid[] = "$Id$";
20   #include <sys/mman.h>
21   #endif
22  
23 – #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
24 – #undef getc
25 – #undef putc
26 – #define getc    getc_unlocked
27 – #define putc    putc_unlocked
28 – #endif
29 –
23   typedef struct {
24          void    *base;          /* pointer to base memory */
25          size_t  len;            /* allocated memory length */
# Line 57 | Line 50 | free_load(MEMLOAD *mp)
50          mp->len = 0;
51   }
52  
53 + /* load memory from an input stream, starting from current position */
54 + static int
55 + load_stream(MEMLOAD *mp, FILE *fp)
56 + {
57 +        size_t  alloced = 0;
58 +        char    buf[8192];
59 +        size_t  nr;
60 +
61 +        if (mp == NULL)
62 +                return(-1);
63 +        mp->base = NULL;
64 +        mp->len = 0;
65 +        mp->mapped = 0;
66 +        if (fp == NULL)
67 +                return(-1);
68 +        while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
69 +                if (!alloced)
70 +                        mp->base = malloc(alloced = nr);
71 +                else if (mp->len+nr > alloced)
72 +                        mp->base = realloc(mp->base,
73 +                                alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);
74 +                if (mp->base == NULL)
75 +                        return(-1);
76 +                memcpy((char *)mp->base + mp->len, buf, nr);
77 +                mp->len += nr;
78 +        }
79 +        if (ferror(fp)) {
80 +                free_load(mp);
81 +                return(-1);
82 +        }
83 +        if (alloced > mp->len*5/4)      /* don't waste too much space */
84 +                mp->base = realloc(mp->base, mp->len);
85 +        return(mp->len > 0);
86 + }
87 +
88   /* load a file into memory */
89   static int
90   load_file(MEMLOAD *mp, FILE *fp)
# Line 64 | Line 92 | load_file(MEMLOAD *mp, FILE *fp)
92          int     fd;
93          off_t   skip, flen;
94  
95 + #ifdef _WIN32                           /* too difficult to fix this */
96 +        return load_stream(mp, fp);
97 + #endif
98          if (mp == NULL)
99                  return(-1);
100          mp->base = NULL;
# Line 97 | Line 128 | load_file(MEMLOAD *mp, FILE *fp)
128                  return(-1);
129          }
130          return(1);
100 – }
101 –
102 – /* load memory from an input stream, starting from current position */
103 – static int
104 – load_stream(MEMLOAD *mp, FILE *fp)
105 – {
106 –        size_t  alloced = 0;
107 –        char    buf[8192];
108 –        size_t  nr;
109 –
110 –        if (mp == NULL)
111 –                return(-1);
112 –        mp->base = NULL;
113 –        mp->len = 0;
114 –        mp->mapped = 0;
115 –        if (fp == NULL)
116 –                return(-1);
117 –        while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
118 –                if (!alloced)
119 –                        mp->base = malloc(nr);
120 –                else if (mp->len+nr > alloced)
121 –                        mp->base = realloc(mp->base,
122 –                                alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);
123 –                if (mp->base == NULL)
124 –                        return(-1);
125 –                memcpy((char *)mp->base + mp->len, buf, nr);
126 –                mp->len += nr;
127 –        }
128 –        if (ferror(fp)) {
129 –                free_load(mp);
130 –                return(-1);
131 –        }
132 –        if (alloced > mp->len*5/4)      /* don't waste too much space */
133 –                mp->base = realloc(mp->base, mp->len);
134 –        return(mp->len > 0);
131   }
132  
133   /* free a record index */

Diff Legend

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