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

Comparing ray/src/common/bmalloc.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:55:20 1991 UTC vs.
Revision 2.7 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Bmalloc provides basic memory allocation without overhead (no free lists).
6   * Use only to take the load off of malloc for all those
7   * piddling little requests that you never expect to free.
8   * Bmalloc defers to malloc for big requests.
9   * Bfree should hand memory to bmalloc, but it usually fails here.
10 + *
11 + *  External symbols declared in standard.h
12   */
13  
14 < #define  NULL           0
14 > #include "copyright.h"
15  
16 + #include <stdlib.h>
17 +
18 + #include "rtmisc.h"
19 +
20   #ifndef  MBLKSIZ
21   #define  MBLKSIZ        16376           /* size of memory allocation block */
22   #endif
23   #define  WASTEFRAC      12              /* don't waste more than a fraction */
24 < #ifndef  ALIGN
25 < #define  ALIGN          int             /* type for alignment */
24 > #ifndef  ALIGNT
25 > #define  ALIGNT         double          /* type for alignment */
26   #endif
27 < #define  BYTES_WORD     sizeof(ALIGN)
27 > #define  BYTES_WORD     sizeof(ALIGNT)
28  
29 < extern char  *malloc();
29 > static void  *bposition = NULL;
30 > static size_t  nremain = 0;
31  
28 static char  *bposition = NULL;
29 static unsigned  nremain = 0;
32  
33 <
34 < char *
35 < bmalloc(n)              /* allocate a block of n bytes, no refunds */
36 < register unsigned  n;
33 > void *
34 > bmalloc(                /* allocate a block of n bytes */
35 > register size_t  n
36 > )
37   {
38          if (n > nremain && (n > MBLKSIZ || nremain > MBLKSIZ/WASTEFRAC))
39                  return(malloc(n));                      /* too big */
40  
41          n = (n+(BYTES_WORD-1))&~(BYTES_WORD-1);         /* word align */
42  
43 <        if (n > nremain) {
44 <                if ((bposition = malloc((unsigned)MBLKSIZ)) == NULL) {
45 <                        nremain = 0;
44 <                        return(NULL);
45 <                }
46 <                nremain = MBLKSIZ;
43 >        if (n > nremain && (bposition = malloc(nremain = MBLKSIZ)) == NULL) {
44 >                nremain = 0;
45 >                return(NULL);
46          }
47          bposition += n;
48          nremain -= n;
# Line 51 | Line 50 | register unsigned  n;
50   }
51  
52  
53 < bfree(p, n)                     /* free random memory */
54 < register char   *p;
55 < register unsigned       n;
53 > void
54 > bfree(                  /* free random memory */
55 > register void   *p,
56 > register size_t n
57 > )
58   {
59 <        register unsigned       bsiz;
59 >        register size_t bsiz;
60                                          /* check alignment */
61 <        bsiz = BYTES_WORD - ((unsigned)p&(BYTES_WORD-1));
61 >        bsiz = BYTES_WORD - ((size_t)p&(BYTES_WORD-1));
62          if (bsiz < BYTES_WORD) {
63                  p += bsiz;
64                  n -= bsiz;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines