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

launchpad: handle case running out of threads 

Fixes #111
This commit is contained in:
Alexander Boettcher 2015-03-13 11:22:29 +01:00 committed by Christian Helmuth
parent 30094ecd48
commit 7f0460c6a5
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
repos/demo/src/lib/launchpad/launchpad.cc
View File

@ -261,17 +261,31 @@ Launchpad_child *Launchpad::start_child(const char *filename,
return 0; return 0;
} }
Launchpad_child *c = new (&_sliced_heap) try {
Launchpad_child(unique_name, file_cap, ram.cap(), Launchpad_child *c = new (&_sliced_heap)
cpu.cap(), rm.cap(), rom_cap, Launchpad_child(unique_name, file_cap, ram.cap(),
&_cap_session, &_parent_services, &_child_services, cpu.cap(), rm.cap(), rom_cap,
config_ds, this); &_cap_session, &_parent_services, &_child_services,
config_ds, this);
Lock::Guard lock_guard(_children_lock); Lock::Guard lock_guard(_children_lock);
_children.insert(c); _children.insert(c);
add_child(unique_name, ram_quota, c, c->heap()); add_child(unique_name, ram_quota, c, c->heap());
return c;
return c;
} catch (Cpu_session::Thread_creation_failed) {
PWRN("Failed to create child - Cpu_session::Thread_creation_failed");
} catch (...) {
PWRN("Failed to create child - unknown reason");
}
env()->parent()->close(rm.cap());
env()->parent()->close(ram.cap());
env()->parent()->close(cpu.cap());
env()->parent()->close(rom_cap);
return 0;
} }
@ -399,6 +413,9 @@ static Timer::Session *timer_session()
} }
/* construct child-destructor thread early - in case we run out of threads */
static Child_destructor_thread child_destructor;
/** /**
* Destruct Launchpad_child, cope with infinitely blocking server->close calls * Destruct Launchpad_child, cope with infinitely blocking server->close calls
* *
@ -408,9 +425,6 @@ static Timer::Session *timer_session()
static void destruct_child(Allocator *alloc, Launchpad_child *child, static void destruct_child(Allocator *alloc, Launchpad_child *child,
Timer::Session *timer, int timeout) Timer::Session *timer, int timeout)
{ {
/* lazily construct child-destructor thread */
static Child_destructor_thread child_destructor;
/* if no timer session was provided by our caller, we have create one */ /* if no timer session was provided by our caller, we have create one */
if (!timer) if (!timer)
timer = timer_session(); timer = timer_session();