libc: malloc do not destruct allocator
This commit is contained in:
parent
21f031371f
commit
49ee13168b
|
@ -16,6 +16,7 @@
|
||||||
#include <base/env.h>
|
#include <base/env.h>
|
||||||
#include <base/printf.h>
|
#include <base/printf.h>
|
||||||
#include <base/slab.h>
|
#include <base/slab.h>
|
||||||
|
#include <util/construct_at.h>
|
||||||
#include <util/string.h>
|
#include <util/string.h>
|
||||||
#include <util/misc_math.h>
|
#include <util/misc_math.h>
|
||||||
|
|
||||||
|
@ -90,6 +91,8 @@ class Malloc : public Genode::Allocator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
~Malloc() { PDBG("CALLED"); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allocator interface
|
* Allocator interface
|
||||||
*/
|
*/
|
||||||
|
@ -157,8 +160,14 @@ class Malloc : public Genode::Allocator
|
||||||
|
|
||||||
static Genode::Allocator *allocator()
|
static Genode::Allocator *allocator()
|
||||||
{
|
{
|
||||||
static Malloc _m(Genode::env()->heap());
|
static bool constructed = 0;
|
||||||
return &_m;
|
static char placeholder[sizeof(Malloc)];
|
||||||
|
if (!constructed) {
|
||||||
|
Genode::construct_at<Malloc>(placeholder, Genode::env()->heap());
|
||||||
|
constructed = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<Malloc *>(placeholder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user