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

core: implement core allocator's free (ref #1573)

This commit is contained in:
Stefan Kalkowski 2015-06-09 15:06:16 +02:00 committed by Christian Helmuth
parent 6f167b449c
commit 409ac1468e
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/base-hw/src/core/include/page_slab.h
View File

@ -188,13 +188,14 @@ class Genode::Page_slab : public Genode::Allocator
*/
void free(void *addr)
{
for (List_element<Slab_block> *le = _b_list.first();
le; le = le->next()) {
if (!le->object()->free(addr)) continue;
for (List_element<Slab_block> *le = _b_list.first(); le;) {
List_element<Slab_block> *cur = le;
le = le->next();
if (!cur->object()->free(addr)) continue;
if (_free_slab_entries++ > (MIN_SLABS+SLABS_PER_BLOCK)
&& !le->object()->ref_counter)
_free_slab_block(le->object());
&& !cur->object()->ref_counter)
_free_slab_block(cur->object());
}
}

18
repos/base/src/core/core_mem_alloc.cc
View File

@ -75,3 +75,21 @@ Core_mem_allocator::Mapped_mem_allocator::alloc_aligned(size_t size, void **out_
return Alloc_return::OK;
}
void Core_mem_allocator::Mapped_mem_allocator::free(void *addr, size_t size)
{
using Block = Mapped_avl_allocator::Block;
Block *b = static_cast<Block *>(_virt_alloc->_find_by_address((addr_t)addr));
if (!b) return;
_unmap_local((addr_t)addr, b->size());
_phys_alloc->free(b->map_addr, b->size());
_virt_alloc->free(addr, b->size());
}
void Core_mem_allocator::Mapped_mem_allocator::free(void *addr)
{
PWRN("Not implemented!");
}

14
repos/base/src/core/include/core_mem_alloc.h
View File

@ -68,12 +68,16 @@ class Genode::Core_mem_allocator : public Genode::Core_mem_translator
*/
struct Metadata { void * map_addr; };
class Mapped_mem_allocator;
/**
* Page-size granular allocator that links ranges to related ones.
*/
class Mapped_avl_allocator
: public Allocator_avl_tpl<Metadata, get_page_size()>
{
friend class Mapped_mem_allocator;
public:
/**
@ -166,7 +170,7 @@ class Genode::Core_mem_allocator : public Genode::Core_mem_translator
addr_t to = ~0UL) override;
Alloc_return alloc_addr(size_t size, addr_t addr) override {
return Alloc_return::RANGE_CONFLICT; }
void free(void *addr) override { }
void free(void *addr) override;
size_t avail() const override { return _phys_alloc->avail(); }
bool valid_addr(addr_t addr) const override {
return _virt_alloc->valid_addr(addr); }
@ -178,7 +182,7 @@ class Genode::Core_mem_allocator : public Genode::Core_mem_translator
bool alloc(size_t size, void **out_addr) override {
return alloc_aligned(size, out_addr).is_ok(); }
void free(void *addr, size_t) override { free(addr); }
void free(void *addr, size_t) override;
size_t consumed() const override { return _phys_alloc->consumed(); }
size_t overhead(size_t size) const override {
return _phys_alloc->overhead(size); }
@ -300,7 +304,11 @@ class Genode::Core_mem_allocator : public Genode::Core_mem_translator
bool alloc(size_t size, void **out_addr) override {
return alloc_aligned(size, out_addr).is_ok(); }
void free(void *addr, size_t) override { free(addr); }
void free(void *addr, size_t size) override
{
Lock::Guard lock_guard(_lock);
return _mem_alloc.free(addr, size);
}
size_t consumed() const override { return _phys_alloc.consumed(); }
size_t overhead(size_t size) const override { return _phys_alloc.overhead(size); }