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

Comparing ray/src/common/malloc.c (file contents):
Revision 1.8 by greg, Wed Oct 3 16:20:38 1990 UTC vs.
Revision 1.13 by greg, Wed Jul 17 11:35:47 1991 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1990 Regents of the University of California */
1 > /* Copyright (c) 1991 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21  
22   #include  <errno.h>
23  
24 + #ifdef MSTATS
25 + #include  <stdio.h>
26 + static unsigned b_nalloced = 0;
27 + static unsigned b_nfreed = 0;
28 + static unsigned b_nscrounged = 0;
29 + static unsigned m_nalloced = 0;
30 + static unsigned m_nfreed = 0;
31 + static unsigned m_nwasted = 0;
32 + #else
33   #define  NULL           0
34 + #endif
35  
36   #ifndef ALIGN
37   #define  ALIGN          int                     /* align type */
38   #endif
39   #define  BYTES_WORD     sizeof(ALIGN)
40  
41 < #define  MAXINCR        (1<<18)                 /* largest sbrk(2) increment */
41 > #define  MAXINCR        (1<<16)                 /* largest sbrk(2) increment */
42  
43   #ifdef  NOVMEM
44 < #define  getpagesize()  BYTES_WORD
44 > #define  getpagesize()  1024
45   #endif
46                                          /* malloc free lists */
47   typedef union m_head {
48          union m_head    *next;
49 <        int             bucket;
49 >        struct {
50 >                short           magic;
51 >                short           bucket;
52 >        }       a;
53          ALIGN           dummy;
54   } M_HEAD;
55  
56 + #define MAGIC           0x1a2           /* magic number for allocated memory */
57 +
58   #define FIRSTBUCKET     3
59   #define NBUCKETS        30
60  
61   static M_HEAD   *free_list[NBUCKETS];
62  
63 + static ALIGN    dummy_mem;
64  
65 + #define DUMMYLOC        ((char *)&dummy_mem)
66 +
67 +
68   char *
69   mscrounge(np)           /* search free lists to satisfy request */
70   register unsigned       *np;
# Line 60 | Line 79 | register unsigned      *np;
79                          *np = bsiz+sizeof(M_HEAD);
80                          p = (char *)free_list[bucket];
81                          free_list[bucket] = free_list[bucket]->next;
82 + #ifdef MSTATS
83 +                        b_nscrounged += *np;
84 + #endif
85                          return(p);
86                  }
87          *np = 0;
# Line 114 | Line 136 | register unsigned  n;
136          p = bpos;
137          bpos += n;                                      /* advance */
138          nrem -= n;
139 + #ifdef MSTATS
140 +        b_nalloced += n;
141 + #endif
142          return(p);
143   }
144  
# Line 124 | Line 149 | register unsigned  n;
149   {
150          register int    bucket;
151          register unsigned       bsiz;
152 +
153 + #ifdef MSTATS
154 +        b_nfreed += n;
155 + #endif
156                                          /* align pointer */
157          bsiz = BYTES_WORD - ((unsigned)p&(BYTES_WORD-1));
158          if (bsiz < BYTES_WORD) {
# Line 150 | Line 179 | unsigned       n;
179          register M_HEAD *mp;
180          register int    bucket;
181          register unsigned       bsiz;
182 +                                        /* don't return NULL on 0 request */
183 +        if (n == 0)
184 +                return(DUMMYLOC);
185                                          /* find first bucket that fits */
186          for (bucket = FIRSTBUCKET, bsiz = 1<<FIRSTBUCKET;
187                          bucket < NBUCKETS; bucket++, bsiz <<= 1)
# Line 167 | Line 199 | unsigned       n;
199                  mp = free_list[bucket];
200                  free_list[bucket] = mp->next;
201          }
202 <        mp->bucket = bucket;                    /* tag block */
202 > #ifdef MSTATS
203 >        m_nalloced += bsiz + sizeof(M_HEAD);
204 >        m_nwasted += bsiz + sizeof(M_HEAD) - n;
205 > #endif
206 >        mp->a.magic = MAGIC;                    /* tag block */
207 >        mp->a.bucket = bucket;
208          return((char *)(mp+1));
209   }
210  
# Line 180 | Line 217 | unsigned       n;
217          char    *p;
218          register unsigned       on;
219                                          /* get old size */
220 <        if (op != NULL)
221 <                on = 1 << ((M_HEAD *)op-1)->bucket;
220 >        if (op != NULL && op != DUMMYLOC && ((M_HEAD *)op-1)->a.magic == MAGIC)
221 >                on = 1 << ((M_HEAD *)op-1)->a.bucket;
222          else
223                  on = 0;
224          if (n <= on && (n > on>>1 || on == 1<<FIRSTBUCKET))
225                  return(op);             /* same bucket */
226 <        p = malloc(n);
227 <        if (p != NULL)
226 >        if ((p = malloc(n)) == NULL)
227 >                return(NULL);
228 >        if (on) {
229   #ifdef  BSD
230                  bcopy(op, p, n>on ? on : n);
231   #else
232                  (void)memcpy(p, op, n>on ? on : n);
233   #endif
234 <        free(op);
234 >                free(op);
235 >        }
236          return(p);
237   }
238  
# Line 204 | Line 243 | char   *p;
243          register M_HEAD *mp;
244          register int    bucket;
245  
246 <        if (p == NULL)
247 <                return;
246 >        if (p == NULL || p == DUMMYLOC)
247 >                return(1);
248          mp = (M_HEAD *)p - 1;
249 <        bucket = mp->bucket;
249 >        if (mp->a.magic != MAGIC)               /* sanity check */
250 >                return(0);
251 >        bucket = mp->a.bucket;
252          mp->next = free_list[bucket];
253          free_list[bucket] = mp;
254 + #ifdef MSTATS
255 +        m_nfreed += (1 << bucket) + sizeof(M_HEAD);
256 + #endif
257 +        return(1);
258   }
259  
260  
# Line 225 | Line 270 | getpagesize()                  /* use SYSV var structure to get page
270          return(1 << v.v_pageshift);
271   }
272   #endif
273 + #endif
274 +
275 +
276 + #ifdef MSTATS
277 + printmemstats(fp)               /* print memory statistics to stream */
278 + FILE    *fp;
279 + {
280 +        register int    i;
281 +        int     n;
282 +        register M_HEAD *mp;
283 +        unsigned int    total = 0;
284 +
285 +        fprintf(fp, "Memory statistics:\n");
286 +        fprintf(fp, "\tbmalloc: %d bytes allocated\n", b_nalloced);
287 +        fprintf(fp, "\tbmalloc: %d bytes freed\n", b_nfreed);
288 +        fprintf(fp, "\tbmalloc: %d bytes scrounged\n", b_nscrounged);
289 +        fprintf(fp, "\tmalloc: %d bytes allocated\n", m_nalloced);
290 +        fprintf(fp, "\tmalloc: %d bytes wasted (%.1f%%)\n", m_nwasted,
291 +                        100.0*m_nwasted/m_nalloced);
292 +        fprintf(fp, "\tmalloc: %d bytes freed\n", m_nfreed);
293 +        for (i = NBUCKETS-1; i >= FIRSTBUCKET; i--) {
294 +                n = 0;
295 +                for (mp = free_list[i]; mp != NULL; mp = mp->next)
296 +                        n++;
297 +                if (n) {
298 +                        fprintf(fp, "\t%d * %u\n", n, 1<<i);
299 +                        total += n * ((1<<i) + sizeof(M_HEAD));
300 +                }
301 +        }
302 +        fprintf(fp, "\t %u total bytes in free list\n", total);
303 + }
304   #endif

Diff Legend

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