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

libc: withstand pthreads calling with_libc()

Browse Source
This commit is contained in:
Christian Helmuth 2018-02-01 11:16:43 +01:00 committed by Norman Feske
parent 584aaec2a5
commit 166e487559
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,6 +777,11 @@ struct Libc::Kernel
*/
bool main_suspended() { return _state == KERNEL; }
/**
* Public alias for _main_context()
*/
bool main_context() const { return _main_context(); }
/**
* Execute application code while already executing in run()
*/
@ -869,16 +874,22 @@ void Libc::schedule_select(Libc::Select_handler_base *h)
void Libc::execute_in_application_context(Libc::Application_code &app_code)
{
/*
* XXX We don't support a second entrypoint - pthreads should work as they
* don't use this code.
*/
if (!kernel) {
error("libc kernel not initialized, needed for with_libc()");
exit(1);
}
/*
* The libc execution model builds on the main entrypoint, which handles
* all relevant signals (e.g., timing and VFS). Additional component
* entrypoints or pthreads should never call with_libc() but we catch this
* here and just execute the application code directly.
*/
if (!kernel->main_context()) {
app_code.execute();
return;
}
static bool nested = false;
if (nested) {