ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-19 11:16:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: call deconstructor of context area

Browse Source 
Issue #905
This commit is contained in:
Alexander Boettcher 2013-09-04 15:24:56 +02:00 committed by Norman Feske
parent ff02dc8f10
commit 772616bf38
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/src/base/thread/thread.cc
View File

@ -150,8 +150,12 @@ Thread_base::Context *Thread_base::_alloc_context(size_t stack_size)
/* /*
* Now the thread context is backed by memory, so it is safe to access its * Now the thread context is backed by memory, so it is safe to access its
* members. * members.
*
* We need to initialize the context object's memory with zeroes,
* otherwise the ds_cap isn't invalid. That would cause trouble
* when the assignment operator of Native_capability is used.
*/ */
memset(context, 0, sizeof(Context) - sizeof(Context::utcb));
context->thread_base = this; context->thread_base = this;
context->stack_base = ds_addr; context->stack_base = ds_addr;
context->ds_cap = ds_cap; context->ds_cap = ds_cap;
@ -163,8 +167,14 @@ void Thread_base::_free_context()
{ {
addr_t ds_addr = _context->stack_base - Native_config::context_area_virtual_base(); addr_t ds_addr = _context->stack_base - Native_config::context_area_virtual_base();
Ram_dataspace_capability ds_cap = _context->ds_cap; Ram_dataspace_capability ds_cap = _context->ds_cap;
/* call de-constructor explicitly before memory gets detached */
_context->~Context();
Genode::env_context_area_rm_session()->detach((void *)ds_addr); Genode::env_context_area_rm_session()->detach((void *)ds_addr);
Genode::env_context_area_ram_session()->free(ds_cap); Genode::env_context_area_ram_session()->free(ds_cap);
/* context area ready for reuse */
_context_allocator()->free(this); _context_allocator()->free(this);
} }