-/* $RCSfile: malloc.c,v $$Revision: 4.0.1.4 $$Date: 92/06/08 14:28:38 $
+/* malloc.c
*
- * $Log: malloc.c,v $
- * Revision 4.0.1.4 92/06/08 14:28:38 lwall
- * patch20: removed implicit int declarations on functions
- * patch20: hash tables now split only if the memory is available to do so
- * patch20: realloc(0, size) now does malloc in case library routines call it
- *
- * Revision 4.0.1.3 91/11/05 17:57:40 lwall
- * patch11: safe malloc code now integrated into Perl's malloc when possible
- *
- * Revision 4.0.1.2 91/06/07 11:20:45 lwall
- * patch4: many, many itty-bitty portability fixes
- *
- * Revision 4.0.1.1 91/04/11 17:48:31 lwall
- * patch1: Configure now figures out malloc ptr type
- *
- * Revision 4.0 91/03/20 01:28:52 lwall
- * 4.0 baseline.
- *
*/
#ifndef lint
-/*SUPPRESS 592*/
-static char sccsid[] = "@(#)malloc.c 4.3 (Berkeley) 9/16/83";
-
#ifdef DEBUGGING
#define RCHECK
#endif
#include "EXTERN.h"
#include "perl.h"
-static findbucket(), morecore();
-
/* I don't much care whether these are defined in sys/types.h--LAW */
#define u_char unsigned char
*/
union overhead {
union overhead *ov_next; /* when free */
-#if ALIGNBYTES > 4
+#if MEM_ALIGNBYTES > 4
double strut; /* alignment problems */
#endif
struct {
#define ov_rmagic ovu.ovu_rmagic
};
+#ifdef debug
+static void botch _((char *s));
+#endif
+static void morecore _((int bucket));
+static int findbucket _((union overhead *freep, int srchlen));
+
#define MAGIC 0xff /* magic # on accounting info */
-#define OLDMAGIC 0x7f /* same after a free() */
#define RMAGIC 0x55555555 /* magic # on range info */
#ifdef RCHECK
#define RSLOP sizeof (u_int)
#define ASSERT(p)
#endif
-#ifdef safemalloc
-static int an = 0;
-#endif
-
-MALLOCPTRTYPE *
+Malloc_t
malloc(nbytes)
register MEM_SIZE nbytes;
{
#ifdef MSDOS
if (nbytes > 0xffff) {
fprintf(stderr, "Allocation too large: %lx\n", (long)nbytes);
- exit(1);
+ my_exit(1);
}
#endif /* MSDOS */
#ifdef DEBUGGING
if ((long)nbytes < 0)
- fatal("panic: malloc");
+ croak("panic: malloc");
#endif
#endif /* safemalloc */
#ifdef safemalloc
if (!nomemok) {
fputs("Out of memory!\n", stderr);
- exit(1);
+ my_exit(1);
}
#else
return (NULL);
}
#ifdef safemalloc
-#ifdef DEBUGGING
-# if !(defined(I286) || defined(atarist))
- if (debug & 128)
- fprintf(stderr,"0x%x: (%05d) malloc %ld bytes\n",p+1,an++,(long)size);
-# else
- if (debug & 128)
- fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",p+1,an++,(long)size);
-# endif
-#endif
+ DEBUG_m(fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",
+ (unsigned long)(p+1),an++,(long)size));
#endif /* safemalloc */
/* remove from linked list */
#ifdef RCHECK
if (*((int*)p) & (sizeof(union overhead) - 1))
-#if !(defined(I286) || defined(atarist))
- fprintf(stderr,"Corrupt malloc ptr 0x%x at 0x%x\n",*((int*)p),p);
-#else
- fprintf(stderr,"Corrupt malloc ptr 0x%lx at 0x%lx\n",*((int*)p),p);
-#endif
+ fprintf(stderr,"Corrupt malloc ptr 0x%lx at 0x%lx\n",
+ (unsigned long)*((int*)p),(unsigned long)p);
#endif
nextf[bucket] = p->ov_next;
p->ov_magic = MAGIC;
p->ov_rmagic = RMAGIC;
*((u_int *)((caddr_t)p + nbytes - RSLOP)) = RMAGIC;
#endif
- return ((MALLOCPTRTYPE *)(p + 1));
+ return ((Malloc_t)(p + 1));
}
/*
* Allocate more memory to the indicated bucket.
*/
-static
+static void
morecore(bucket)
register int bucket;
{
}
}
-void
+Free_t
free(mp)
- MALLOCPTRTYPE *mp;
+ Malloc_t mp;
{
register MEM_SIZE size;
register union overhead *op;
char *cp = (char*)mp;
#ifdef safemalloc
-#ifdef DEBUGGING
-# if !(defined(I286) || defined(atarist))
- if (debug & 128)
- fprintf(stderr,"0x%x: (%05d) free\n",cp,an++);
-# else
- if (debug & 128)
- fprintf(stderr,"0x%lx: (%05d) free\n",cp,an++);
-# endif
-#endif
+ DEBUG_m(fprintf(stderr,"0x%lx: (%05d) free\n",(unsigned long)cp,an++));
#endif /* safemalloc */
if (cp == NULL)
ASSERT(op->ov_magic == MAGIC); /* make sure it was in use */
#else
if (op->ov_magic != MAGIC) {
+#ifdef RCHECK
warn("%s free() ignored",
- op->ov_magic == OLDMAGIC ? "Duplicate" : "Bad");
+ op->ov_rmagic == RMAGIC - 1 ? "Duplicate" : "Bad");
+#else
+ warn("Bad free() ignored");
+#endif
return; /* sanity */
}
- op->ov_magic = OLDMAGIC;
#endif
#ifdef RCHECK
ASSERT(op->ov_rmagic == RMAGIC);
if (op->ov_index <= 13)
ASSERT(*(u_int *)((caddr_t)op + op->ov_size + 1 - RSLOP) == RMAGIC);
+ op->ov_rmagic = RMAGIC - 1;
#endif
ASSERT(op->ov_index < NBUCKETS);
size = op->ov_index;
*/
int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */
-MALLOCPTRTYPE *
+Malloc_t
realloc(mp, nbytes)
- MALLOCPTRTYPE *mp;
+ Malloc_t mp;
MEM_SIZE nbytes;
{
register MEM_SIZE onb;
#ifdef MSDOS
if (nbytes > 0xffff) {
fprintf(stderr, "Reallocation too large: %lx\n", size);
- exit(1);
+ my_exit(1);
}
#endif /* MSDOS */
if (!cp)
return malloc(nbytes);
#ifdef DEBUGGING
if ((long)nbytes < 0)
- fatal("panic: realloc");
+ croak("panic: realloc");
#endif
#endif /* safemalloc */
#ifdef safemalloc
#ifdef DEBUGGING
-# if !(defined(I286) || defined(atarist))
- if (debug & 128) {
- fprintf(stderr,"0x%x: (%05d) rfree\n",res,an++);
- fprintf(stderr,"0x%x: (%05d) realloc %ld bytes\n",res,an++,(long)size);
- }
-# else
- if (debug & 128) {
- fprintf(stderr,"0x%lx: (%05d) rfree\n",res,an++);
- fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",res,an++,(long)size);
- }
-# endif
+ if (debug & 128) {
+ fprintf(stderr,"0x%lx: (%05d) rfree\n",(unsigned long)res,an++);
+ fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",
+ (unsigned long)res,an++,(long)size);
+ }
#endif
#endif /* safemalloc */
- return ((MALLOCPTRTYPE*)res);
+ return ((Malloc_t)res);
}
/*
projects / p5sagit/p5-mst-13.2.git / blobdiff