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

arora: call main function from dedicated thread 

The Arora main thread sometimes blocks on a pthread condition variable,
which prevents Genode signal processing with the current implementation.
This is especially a problem when the thread who could unblock the main
thread calls 'Libc::suspend()'.

As a workaround until the pthread locking mechanisms get adapted to the
Genode libc execution model, the Arora main function can be called from
a dedicated thread.

Fixes #2978
This commit is contained in:
Christian Prochaska 2018-09-11 18:57:40 +02:00 committed by Christian Helmuth
parent 1d1942f48a
commit 090ba0e235
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
repos/ports/src/app/arora/arora_component.cc
View File

@ -16,6 +16,7 @@
/* libc includes */
#include <stdlib.h> /* 'exit' */
#include <pthread.h>
/* Qt includes */
#include <qpluginwidget/qpluginwidget.h>
@ -26,6 +27,19 @@ extern "C" int main(int argc, char const **argv);
extern void initialize_qt_core(Genode::Env &);
extern void initialize_qt_gui(Genode::Env &);
/*
* The main function is called from a dedicated thread, because it sometimes
* blocks on a pthread condition variable, which prevents Genode signal
* processing with the current implementation.
*/
void *arora_main(void *)
{
int argc = 1;
char const *argv[] = { "arora", 0 };
exit(main(argc, argv));
}
void Libc::Component::construct(Libc::Env &env)
{
Libc::with_libc([&] {
@ -34,9 +48,7 @@ void Libc::Component::construct(Libc::Env &env)
initialize_qt_gui(env);
QPluginWidget::env(env);
int argc = 1;
char const *argv[] = { "arora", 0 };
exit(main(argc, argv));
pthread_t main_thread;
pthread_create(&main_thread, nullptr, arora_main, nullptr);
});
}