ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc: malloc do not destruct allocator

This commit is contained in:
Sebastian Sumpf 2014-02-20 13:37:12 +01:00 committed by Norman Feske
parent 21f031371f
commit 49ee13168b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libports/src/lib/libc/malloc.cc
View File

@ -16,6 +16,7 @@
#include <base/env.h>
#include <base/printf.h>
#include <base/slab.h>
#include <util/construct_at.h>
#include <util/string.h>
#include <util/misc_math.h>
@ -90,6 +91,8 @@ class Malloc : public Genode::Allocator
}
}
~Malloc() { PDBG("CALLED"); }
/**
* Allocator interface
*/
@ -157,8 +160,14 @@ class Malloc : public Genode::Allocator
static Genode::Allocator *allocator()
{
static Malloc _m(Genode::env()->heap());
return &_m;
static bool constructed = 0;
static char placeholder[sizeof(Malloc)];
if (!constructed) {
Genode::construct_at<Malloc>(placeholder, Genode::env()->heap());
constructed = 1;
}
return reinterpret_cast<Malloc *>(placeholder);
}