19 |
|
* Greg Ward Lawrence Berkeley Laboratory |
20 |
|
*/ |
21 |
|
|
22 |
+ |
#include <errno.h> |
23 |
+ |
|
24 |
|
#define NULL 0 |
25 |
|
|
26 |
|
#ifndef ALIGN |
125 |
|
register int bucket; |
126 |
|
register unsigned bsiz; |
127 |
|
/* align pointer */ |
128 |
< |
bsiz = BYTES_WORD - ((unsigned)p&~(BYTES_WORD-1)); |
128 |
> |
bsiz = BYTES_WORD - ((unsigned)p&(BYTES_WORD-1)); |
129 |
|
if (bsiz < BYTES_WORD) { |
130 |
|
p += bsiz; |
131 |
|
n -= bsiz; |
146 |
|
malloc(n) /* allocate n bytes of memory */ |
147 |
|
unsigned n; |
148 |
|
{ |
149 |
+ |
extern int errno; |
150 |
|
register M_HEAD *mp; |
151 |
|
register int bucket; |
152 |
|
register unsigned bsiz; |
150 |
– |
|
151 |
– |
if (n == 0) |
152 |
– |
return(NULL); |
153 |
|
/* find first bucket that fits */ |
154 |
< |
bucket = FIRSTBUCKET; |
155 |
< |
for (bsiz = 1<<FIRSTBUCKET; bsiz < n; bsiz <<= 1) |
156 |
< |
bucket++; |
154 |
> |
for (bucket = FIRSTBUCKET, bsiz = 1<<FIRSTBUCKET; |
155 |
> |
bucket < NBUCKETS; bucket++, bsiz <<= 1) |
156 |
> |
if (bsiz >= n) |
157 |
> |
break; |
158 |
> |
if (bucket >= NBUCKETS) { |
159 |
> |
errno = EINVAL; |
160 |
> |
return(NULL); |
161 |
> |
} |
162 |
|
if (free_list[bucket] == NULL) { /* need more core */ |
163 |
|
mp = (M_HEAD *)bmalloc(bsiz+sizeof(M_HEAD)); |
164 |
|
if (mp == NULL) |
174 |
|
|
175 |
|
char * |
176 |
|
realloc(op, n) /* reallocate memory using malloc() */ |
177 |
< |
char *op; |
177 |
> |
register char *op; |
178 |
|
unsigned n; |
179 |
|
{ |
180 |
< |
extern char *memcpy(); |
176 |
< |
register char *p; |
180 |
> |
char *p; |
181 |
|
register unsigned on; |
182 |
< |
|
183 |
< |
free(op); /* free it first */ |
184 |
< |
p = malloc(n); /* p==op if same bucket */ |
185 |
< |
if (p == NULL) |
186 |
< |
return(NULL); |
187 |
< |
if (p != op) /* different bucket, do copy */ |
182 |
> |
/* get old size */ |
183 |
> |
if (op != NULL) |
184 |
> |
on = 1 << ((M_HEAD *)op-1)->bucket; |
185 |
> |
else |
186 |
> |
on = 0; |
187 |
> |
if (n <= on && (n > on>>1 || on == 1<<FIRSTBUCKET)) |
188 |
> |
return(op); /* same bucket */ |
189 |
> |
p = malloc(n); |
190 |
> |
if (p != NULL) |
191 |
|
#ifdef BSD |
192 |
|
bcopy(op, p, n>on ? on : n); |
193 |
|
#else |
194 |
|
(void)memcpy(p, op, n>on ? on : n); |
195 |
|
#endif |
196 |
+ |
free(op); |
197 |
|
return(p); |
198 |
|
} |
199 |
|
|