add definition for ability to produce a backtrace

[unix-history] / usr / src / sys / kern / kern_malloc.c

diff --git a/usr/src/sys/kern/kern_malloc.c b/usr/src/sys/kern/kern_malloc.c
index b9626da..76d5e1a 100644 (file)
--- a/usr/src/sys/kern/kern_malloc.c
+++ b/usr/src/sys/kern/kern_malloc.c
@@ -1,19 +1,20 @@
 /*
 /*

- * Copyright (c) 1987, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_malloc.c       7.33 (Berkeley) %G%
+ *     @(#)kern_malloc.c       8.3 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "proc.h"
-#include "map.h"
-#include "kernel.h"
-#include "malloc.h"
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/map.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <vm/vm.h>
+#include <vm/vm_kern.h>

 
 struct kmembuckets bucket[MINBUCKET + 16];
 struct kmemstats kmemstats[M_LAST];
 
 struct kmembuckets bucket[MINBUCKET + 16];
 struct kmemstats kmemstats[M_LAST];


@@ -62,6 +63,13 @@ struct freelist {
 };
 #endif /* DIAGNOSTIC */
 
 };
 #endif /* DIAGNOSTIC */
 

+struct uselist {
+       struct  uselist *next;
+       caddr_t mem;
+       long    size;
+       long    type;
+} *listhd;
+

 /*
  * Allocate a block of memory
  */
 /*
  * Allocate a block of memory
  */


@@ -73,7 +81,7 @@ malloc(size, type, flags)
        register struct kmembuckets *kbp;
        register struct kmemusage *kup;
        register struct freelist *freep;
        register struct kmembuckets *kbp;
        register struct kmemusage *kup;
        register struct freelist *freep;

-       long indx, npg, alloc, allocsize;
+       long indx, npg, allocsize;

        int s;
        caddr_t va, cp, rp;
 #ifdef KMEMSTATS
        int s;
        caddr_t va, cp, rp;
 #ifdef KMEMSTATS


@@ -101,11 +109,13 @@ malloc(size, type, flags)
                tsleep((caddr_t)ksp, PSWP+2, memname[type], 0);
                IN;
        }
                tsleep((caddr_t)ksp, PSWP+2, memname[type], 0);
                IN;
        }

+       ksp->ks_size |= 1 << indx;

 #endif
 #ifdef DIAGNOSTIC
        copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY;
 #endif
        if (kbp->kb_next == NULL) {
 #endif
 #ifdef DIAGNOSTIC
        copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY;
 #endif
        if (kbp->kb_next == NULL) {

+               kbp->kb_last = NULL;

                if (size > MAXALLOCSAVE)
                        allocsize = roundup(size, CLBYTES);
                else
                if (size > MAXALLOCSAVE)
                        allocsize = roundup(size, CLBYTES);
                else


@@ -176,6 +186,14 @@ out:
 #else
 out:
 #endif
 #else
 out:
 #endif

+       if (size > 64 && size <= 128) {
+               mlp = (struct uselist *)malloc(sizeof(*mlp), M_TEMP, M_WAITOK);
+               mlp->type = type;
+               mlp->size = size;
+               mlp->mem = va;
+               mlp->next = listhd;
+               listhd = mlp;
+       }

        OUT;
        splx(s);
        return ((void *) va);
        OUT;
        splx(s);
        return ((void *) va);


@@ -227,6 +245,25 @@ free(addr, type)
        size = 1 << kup->ku_indx;
        kbp = &bucket[kup->ku_indx];
        s = splimp();
        size = 1 << kup->ku_indx;
        kbp = &bucket[kup->ku_indx];
        s = splimp();

+       if (size == 128) {
+               struct uselist *mlp, *pmlp;
+
+               mlp = listhd;
+               if (mlp->mem == addr)
+                       listhd = mlp->next;
+               else for (pmlp = mlp, mlp = mlp->next ; mlp; mlp = mlp->next) {
+                       if (mlp->mem == addr) {
+                               pmlp->next = mlp->next;
+                               break;
+                       }
+                       pmlp = mlp;
+               }
+               if (mlp == NULL)
+                       printf("free: lost type %s size %d\n", memname[type],
+                           size);
+               else
+                       free(mlp, M_TEMP);
+       }

 #ifdef DIAGNOSTIC
        /*
         * Check for returns of data that do not point to the
 #ifdef DIAGNOSTIC
        /*
         * Check for returns of data that do not point to the


@@ -303,8 +340,12 @@ free(addr, type)
                wakeup((caddr_t)ksp);
        ksp->ks_inuse--;
 #endif
                wakeup((caddr_t)ksp);
        ksp->ks_inuse--;
 #endif

-       ((caddr_t *)addr)[2] = kbp->kb_next;
-       kbp->kb_next = addr;
+       if (kbp->kb_next == NULL)
+               kbp->kb_next = addr;
+       else
+               ((struct freelist *)kbp->kb_last)->next = addr;
+       freep->next = NULL;
+       kbp->kb_last = addr;

        OUT;
        splx(s);
 }
        OUT;
        splx(s);
 }