nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thread secured the kernel heap.

This commit is contained in:
Jonas 'Sortie' Termansen 2012-08-01 14:27:02 +02:00
parent 199fec6674
commit bff1abda2e
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libmaxsi/heap.cpp
View File

@ -1,6 +1,6 @@
/****************************************************************************** /*******************************************************************************
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011. Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
This file is part of LibMaxsi. This file is part of LibMaxsi.
@ -11,8 +11,8 @@
LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
more details. details.
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>. along with LibMaxsi. If not, see <http://www.gnu.org/licenses/>.
@ -20,7 +20,7 @@
heap.cpp heap.cpp
Functions that allocate/free memory from a dynamic memory heap. Functions that allocate/free memory from a dynamic memory heap.
******************************************************************************/ *******************************************************************************/
#include <sys/mman.h> #include <sys/mman.h>
#include <libmaxsi/platform.h> #include <libmaxsi/platform.h>
@ -39,6 +39,7 @@
#ifdef SORTIX_KERNEL #ifdef SORTIX_KERNEL
#include <sortix/kernel/platform.h> #include <sortix/kernel/platform.h>
#include <sortix/kernel/kthread.h>
#include <sortix/kernel/log.h> // DEBUG #include <sortix/kernel/log.h> // DEBUG
#include <sortix/kernel/memorymanagement.h> #include <sortix/kernel/memorymanagement.h>
#include <sortix/kernel/panic.h> #include <sortix/kernel/panic.h>
@ -201,6 +202,10 @@ namespace Maxsi
struct Chunk; struct Chunk;
struct Trailer; struct Trailer;
#ifdef SORTIX_KERNEL
Sortix::kthread_mutex_t heaplock;
#endif
// The location where the heap originally grows from. // The location where the heap originally grows from.
addr_t heapstart; addr_t heapstart;
@ -392,6 +397,9 @@ namespace Maxsi
wildernesssize = 0; wildernesssize = 0;
for ( size_t i = 0; i < NUMBINS; i++ ) { bins[i] = NULL; } for ( size_t i = 0; i < NUMBINS; i++ ) { bins[i] = NULL; }
bincontainschunks = 0; bincontainschunks = 0;
#ifdef SORTIX_KERNEL
heaplock = Sortix::KTHREAD_MUTEX_INITIALIZER;
#endif
} }
// Attempts to expand the wilderness such that it contains at least // Attempts to expand the wilderness such that it contains at least
@ -433,6 +441,10 @@ namespace Maxsi
DUAL_FUNCTION(void*, malloc, Allocate, (size_t size)) DUAL_FUNCTION(void*, malloc, Allocate, (size_t size))
{ {
#ifdef SORTIX_KERNEL
Sortix::ScopedLock scopedlock(&heaplock);
#endif
#if 2 <= PARANOIA #if 2 <= PARANOIA
ASSERT(ValidateHeap()); ASSERT(ValidateHeap());
#endif #endif
@ -613,6 +625,10 @@ namespace Maxsi
DUAL_FUNCTION(void, free, Free, (void* addr)) DUAL_FUNCTION(void, free, Free, (void* addr))
{ {
#ifdef SORTIX_KERNEL
Sortix::ScopedLock scopedlock(&heaplock);
#endif
#if 2 <= PARANOIA #if 2 <= PARANOIA
ASSERT(ValidateHeap()); ASSERT(ValidateHeap());
#endif #endif