aboutsummaryrefslogtreecommitdiff
path: root/src/lib9/debugmalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib9/debugmalloc.c')
-rw-r--r--src/lib9/debugmalloc.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib9/debugmalloc.c b/src/lib9/debugmalloc.c
index 51a2c61f..744af835 100644
--- a/src/lib9/debugmalloc.c
+++ b/src/lib9/debugmalloc.c
@@ -6,7 +6,6 @@
* The Unix libc routines cannot be trusted to do their own locking.
* Sad but apparently true.
*/
-static Lock malloclock;
static int mallocpid;
/*
@@ -112,11 +111,9 @@ p9malloc(ulong n)
if(n == 0)
n++;
/*fprint(2, "%s %d malloc\n", argv0, getpid()); */
- lock(&malloclock);
mallocpid = getpid();
v = malloc(n+Overhead);
v = mark(v, getcallerpc(&n), n, MallocMagic);
- unlock(&malloclock);
/*fprint(2, "%s %d donemalloc\n", argv0, getpid()); */
return v;
}
@@ -128,11 +125,9 @@ p9free(void *v)
return;
/*fprint(2, "%s %d free\n", argv0, getpid()); */
- lock(&malloclock);
mallocpid = getpid();
v = mark(v, getcallerpc(&v), 0, FreeMagic);
free(v);
- unlock(&malloclock);
/*fprint(2, "%s %d donefree\n", argv0, getpid()); */
}
@@ -142,11 +137,9 @@ p9calloc(ulong a, ulong b)
void *v;
/*fprint(2, "%s %d calloc\n", argv0, getpid()); */
- lock(&malloclock);
mallocpid = getpid();
v = calloc(a*b+Overhead, 1);
v = mark(v, getcallerpc(&a), a*b, CallocMagic);
- unlock(&malloclock);
/*fprint(2, "%s %d donecalloc\n", argv0, getpid()); */
return v;
}
@@ -155,12 +148,10 @@ void*
p9realloc(void *v, ulong n)
{
/*fprint(2, "%s %d realloc\n", argv0, getpid()); */
- lock(&malloclock);
mallocpid = getpid();
v = mark(v, getcallerpc(&v), 0, CheckMagic);
v = realloc(v, n+Overhead);
v = mark(v, getcallerpc(&v), n, ReallocMagic);
- unlock(&malloclock);
/*fprint(2, "%s %d donerealloc\n", argv0, getpid()); */
return v;
}