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

Pager/Thread_start cleanups 

Don't allocate ec cap twice, in pager.cc and thread_start.cc.
Unmap of utcb has to be done in destructor of thread class, not
in pager class. Free capability selectors of ec and rs.
This commit is contained in:
Alexander Boettcher 2012-06-26 13:23:52 +02:00 committed by Norman Feske
parent 2a3b0d72b3
commit 7f93dae3ff
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base-nova/src/base/pager/pager.cc
View File

@ -96,8 +96,7 @@ void Pager_object::wake_up() { PDBG("not yet implemented"); }
Pager_object::Pager_object(unsigned long badge)
: Thread_base("pager", PF_HANDLER_STACK_SIZE), _badge(badge)
{
_tid.ec_sel = cap_selector_allocator()->alloc();
unsigned pd_sel = cap_selector_allocator()->pd_sel();
addr_t pd_sel = cap_selector_allocator()->pd_sel();
enum { CPU_NO = 0, GLOBAL = false, EXC_BASE = 0 };
@ -154,8 +153,6 @@ Pager_object::Pager_object(unsigned long badge)
Pager_object::~Pager_object()
{
/* Revoke thread capability */
revoke(Obj_crd(_tid.ec_sel, 0), true);
/* Revoke thread portals serving exceptions */
revoke(Obj_crd(_exc_pt_sel,NUM_INITIAL_PT_LOG2), true);
/* Revoke portal used as identity object */
@ -174,15 +171,10 @@ Pager_object::~Pager_object()
/* Revoke portal used for the cleanup call */
revoke(Obj_crd(_pt_cleanup, 0), true);
cap_selector_allocator()->free(_tid.ec_sel, 0);
cap_selector_allocator()->free(_exc_pt_sel, NUM_INITIAL_PT_LOG2);
cap_selector_allocator()->free(_pt_sel, 0);
cap_selector_allocator()->free(_pt_cleanup, 0);
/* revoke utcb */
Rights rwx(true, true, true);
mword_t utcb_context = reinterpret_cast<mword_t>(&_context->utcb);
revoke(Nova::Mem_crd(utcb_context >> 12, 0, rwx));
}

8
base-nova/src/core/thread_start.cc
View File

@ -51,6 +51,14 @@ void Thread_base::_deinit_platform_thread()
{
unmap_local(Nova::Obj_crd(_tid.ec_sel, 0));
unmap_local(Nova::Obj_crd(_tid.rs_sel, 0));
cap_selector_allocator()->free(_tid.ec_sel, 0);
cap_selector_allocator()->free(_tid.rs_sel, 0);
/* revoke utcb */
Nova::Rights rwx(true, true, true);
addr_t utcb = reinterpret_cast<addr_t>(&_context->utcb);
Nova::revoke(Nova::Mem_crd(utcb >> 12, 0, rwx));
}