ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-20 08:03:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: remove delayed dispatch from Rpc_entrypoint

Browse Source 
Fixes #3833
This commit is contained in:
Alexander Boettcher
2020-07-21 15:58:46 +02:00
committed by Norman Feske
parent d1be1281bc
commit c55a499009
12 changed files with 27 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repos/base-nova/src/lib/base/rpc_entrypoint.cc
View File

@ -64,7 +64,7 @@ Untyped_capability Rpc_entrypoint::_manage(Rpc_object_base *obj)
}
static void cleanup_call(Rpc_object_base *obj, Nova::Utcb * ep_utcb,
Native_capability &cap, Genode::Blockade &delay_start)
Native_capability &cap)
{
/* effectively invalidate the capability used before */
@ -84,9 +84,6 @@ static void cleanup_call(Rpc_object_base *obj, Nova::Utcb * ep_utcb,
if (utcb == ep_utcb)
return;
/* activate entrypoint now - otherwise cleanup call will block forever */
delay_start.wakeup();
/* make a IPC to ensure that cap() identifier is not used anymore */
utcb->msg()[0] = 0xdead;
utcb->set_msg_word(1);
@ -109,8 +106,7 @@ void Rpc_entrypoint::_dissolve(Rpc_object_base *obj)
/* make sure nobody is able to find this object */
remove(obj);
cleanup_call(obj, reinterpret_cast<Nova::Utcb *>(this->utcb()), _cap,
_delay_start);
cleanup_call(obj, reinterpret_cast<Nova::Utcb *>(this->utcb()), _cap);
}
static void reply(Nova::Utcb &utcb, Rpc_exception_code exc, Msgbuf_base &snd_msg)
@ -160,11 +156,6 @@ void Rpc_entrypoint::_activation_entry()
reply(utcb, exc, ep._snd_buf);
}
/* delay start */
ep._delay_start.block();
/* XXX inadequate usage of Blockade here is planned to be removed, see #3612 */
ep._delay_start.wakeup();
/* atomically lookup and lock referenced object */
auto lambda = [&] (Rpc_object_base *obj) {
if (!obj) {
@ -198,20 +189,6 @@ void Rpc_entrypoint::entry()
void Rpc_entrypoint::_block_until_cap_valid() { }
void Rpc_entrypoint::activate()
{
/*
* In contrast to a normal thread, a server activation is created at
* construction time. However, it executes no code because processing
* time is always provided by the caller of the server activation. To
* delay the processing of requests until the 'activate' function is
* called, we grab the '_delay_start' lock on construction and release it
* here.
*/
_delay_start.wakeup();
}
bool Rpc_entrypoint::is_myself() const
{
return (Thread::myself() == this);
@ -219,8 +196,7 @@ bool Rpc_entrypoint::is_myself() const
Rpc_entrypoint::Rpc_entrypoint(Pd_session *pd_session, size_t stack_size,
const char *name, bool start_on_construction,
Affinity::Location location)
const char *name, Affinity::Location location)
:
Thread(Cpu_session::Weight::DEFAULT_WEIGHT, name, stack_size, location),
_pd_session(*pd_session)
@ -246,9 +222,6 @@ Rpc_entrypoint::Rpc_entrypoint(Pd_session *pd_session, size_t stack_size,
/* prepare portal receive window of new thread */
if (!rcv_window.prepare_rcv_window(*(Nova::Utcb *)&_stack->utcb()))
throw Cpu_session::Thread_creation_failed();
if (start_on_construction)
activate();
}
@ -269,8 +242,7 @@ Rpc_entrypoint::~Rpc_entrypoint()
/* avoid any incoming IPC */
Nova::revoke(Nova::Obj_crd(obj->cap().local_name(), 0), true);
cleanup_call(obj, reinterpret_cast<Nova::Utcb *>(this->utcb()), _cap,
_delay_start);
cleanup_call(obj, reinterpret_cast<Nova::Utcb *>(this->utcb()), _cap);
});
if (!_cap.valid())