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

libc: unblock main thread in 'Kernel::resume_all()'

Browse Source 
If 'Libc::Kernel::resume:all()' is called from a non-main thread, send a
signal to unblock the main thread from 'wait_and_dispatch_one_signal()'.

Fixes #2283
This commit is contained in:
Christian Prochaska
2017-02-20 16:08:06 +01:00
committed by Christian Helmuth
parent 3226dd0649
commit db0dc0d97c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
repos/libports/src/lib/libc/task.cc
View File

@ -342,11 +342,14 @@ struct Libc::Kernel
{ {
private: private:
Genode::Env &_env; Genode::Env &_env;
Genode::Heap _heap { _env.ram(), _env.rm() }; Genode::Heap _heap { _env.ram(), _env.rm() };
Io_response_handler _io_response_handler; Io_response_handler _io_response_handler;
Env_implementation _libc_env { _env, _heap, _io_response_handler }; Env_implementation _libc_env { _env, _heap, _io_response_handler };
Vfs_plugin _vfs { _libc_env, _heap }; Vfs_plugin _vfs { _libc_env, _heap };
Genode::Reconstructible<Genode::Signal_handler<Kernel>> _resume_main_handler {
_env.ep(), *this, &Kernel::_resume_main };
jmp_buf _kernel_context; jmp_buf _kernel_context;
jmp_buf _user_context; jmp_buf _user_context;
@ -547,7 +550,10 @@ struct Libc::Kernel
if (_scheduled_select_handler) if (_scheduled_select_handler)
_scheduled_select_handler->dispatch_select(); _scheduled_select_handler->dispatch_select();
} else { } else {
_resume_main(); if (_main_context())
_resume_main();
else
Genode::Signal_transmitter(*_resume_main_handler).submit();
} }
_pthreads.resume_all(); _pthreads.resume_all();
@ -612,6 +618,8 @@ struct Libc::Kernel
*/ */
void entrypoint_suspended() void entrypoint_suspended()
{ {
_resume_main_handler.destruct();
_original_suspended_callback(); _original_suspended_callback();
} }
@ -620,6 +628,8 @@ struct Libc::Kernel
*/ */
void entrypoint_resumed() void entrypoint_resumed()
{ {
_resume_main_handler.construct(_env.ep(), *this, &Kernel::_resume_main);
_resume_main(); _resume_main();
} }
}; };