aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/9term
diff options
context:
space:
mode:
authorDan Cross <cross@gajendra.net>2020-01-16 16:54:19 +0000
committerDan Cross <cross@gajendra.net>2020-01-16 16:54:19 +0000
commit7bf2db4c2ae30c0f7b320e57060715bf6279e98a (patch)
tree4b1d40a34ec3dbd9c3d936e04b6ed9f3c92ef589 /src/cmd/9term
parent3ef80ba5f5c29a8367d32353a9620ec4cf9cb880 (diff)
downloadplan9port-7bf2db4c2ae30c0f7b320e57060715bf6279e98a.tar.gz
plan9port-7bf2db4c2ae30c0f7b320e57060715bf6279e98a.tar.bz2
plan9port-7bf2db4c2ae30c0f7b320e57060715bf6279e98a.zip
malloc: remove locking
The issue manifests in fork: POSIX fork mandates that a fork'd process is created with a single thread. If a multithreaded program forks, and some thread was in malloc() when the fork() happened, then in the child the lock will be held but there will be no thread to release it. We assume the system malloc() must already know how to deal with this and is thread-safe, but it won't know about our custom spinlock. Judging that this is no longer necessary (the lock code was added 15 years ago) we remove it. Signed-off-by: Dan Cross <cross@gajendra.net>
Diffstat (limited to 'src/cmd/9term')
-rw-r--r--src/cmd/9term/malloc.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/cmd/9term/malloc.c b/src/cmd/9term/malloc.c
index 9132235b..7b590bc4 100644
--- a/src/cmd/9term/malloc.c
+++ b/src/cmd/9term/malloc.c
@@ -7,8 +7,6 @@
#define NOPLAN9DEFINES
#include <libc.h>
-static Lock malloclock;
-
void*
p9malloc(ulong n)
{
@@ -16,9 +14,7 @@ p9malloc(ulong n)
if(n == 0)
n++;
- lock(&malloclock);
v = malloc(n);
- unlock(&malloclock);
print("p9malloc %lud => %p; pc %lux\n", n, v, getcallerpc(&n));
return v;
}
@@ -28,10 +24,8 @@ p9free(void *v)
{
if(v == nil)
return;
- lock(&malloclock);
print("p9free %p; pc %lux\n", v, getcallerpc(&v));
free(v);
- unlock(&malloclock);
}
void*
@@ -42,9 +36,7 @@ p9calloc(ulong a, ulong b)
if(a*b == 0)
a = b = 1;
- lock(&malloclock);
v = calloc(a*b, 1);
- unlock(&malloclock);
print("p9calloc %lud %lud => %p; pc %lux\n", a, b, v, getcallerpc(&a));
return v;
}
@@ -54,9 +46,7 @@ p9realloc(void *v, ulong n)
{
void *vv;
- lock(&malloclock);
vv = realloc(v, n);
- unlock(&malloclock);
print("p9realloc %p %lud => %p; pc %lux\n", v, n, vv, getcallerpc(&v));
return vv;
}