d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete the XXX comments that refer to spinlock recursion. The malloc/free/

Browse Source 
realloc functions check for recursion within the malloc code itself. In
a thread-safe library, the single spinlock ensures that no two threads
go inside the protected code at the same time. The thread implementation
is responsible for ensuring that the spinlock does in fact protect malloc.
There was a window of opportunity in which this was not the case. I'll fix
that with a commit RSN.
This commit is contained in:
jb 1998-09-30 06:13:59 +00:00
parent 71b89902e8
commit cacbe3ac3d
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/stdlib/malloc.c
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: malloc.c,v 1.41 1998/09/20 01:07:50 alex Exp $
* $Id: malloc.c,v 1.42 1998/09/23 21:26:04 dfr Exp $
*
*/
@ -1068,7 +1068,6 @@ malloc(size_t size)
if (malloc_active++) {
wrtwarning("recursive call.\n");
malloc_active--;
/*THREAD_UNLOCK();*/ /* XXX */
return (0);
}
if (!malloc_started)
@ -1092,18 +1091,6 @@ free(void *ptr)
malloc_func = " in free():";
if (malloc_active++) {
wrtwarning("recursive call.\n");
/*
* XXX
* Ideally the next two lines would be gone and free() would
* exit below. Unfortunately our spinlock implementation
* allows a particular thread to obtain a lock multiple times
* without counting how many times said operation has been
* performed. The practical upshot of which is a single unlock
* causes all locks to be undone at once. For this reason,
* we return without performing an unlock in the case of
* recursion (see also the commented out THREAD_UNLOCK calls
* in malloc & realloc).
*/
malloc_active--;
return;
} else {
@ -1125,7 +1112,6 @@ realloc(void *ptr, size_t size)
if (malloc_active++) {
wrtwarning("recursive call.\n");
malloc_active--;
/*THREAD_UNLOCK();*/ /* XXX */
return (0);
}
if (ptr && !malloc_started) {