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

launchpad: Support configuration of launch entries 

This patch enables the recursive startup of launchpad instances, which
was not possible since the recent removal of launchpad's built-in
default configuration.
This commit is contained in:
Norman Feske 2013-11-19 14:19:30 +01:00
parent 2f483500b0
commit b3ccac63c3
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
demo/src/app/launchpad/main.cc
View File

@ -112,13 +112,39 @@ static void process_config(Launchpad *launchpad)
Number_of_bytes default_ram_quota = 0;
ram_quota_attr.value(&default_ram_quota);
/* obtain configuration for the child */
Init::Child_config *config = new (env()->heap())
Init::Child_config(Genode::env()->ram_session_cap(), node);
/*
* Obtain configuration for the child
*/
Dataspace_capability config_ds;
if (node.has_sub_node("configfile")
&& node.sub_node("configfile").has_attribute("name")) {
char name[128];
node.sub_node("configfile").attribute("name").value(name, sizeof(name));
Rom_connection config_rom(name);
config_rom.on_destruction(Rom_connection::KEEP_OPEN);
config_ds = config_rom.dataspace();
}
if (node.has_sub_node("config")) {
Xml_node config_node = node.sub_node("config");
/* allocate dataspace for config */
size_t const config_size = config_node.size();
config_ds = env()->ram_session()->alloc(config_size);
/* copy configuration into new dataspace */
char * const ptr = env()->rm_session()->attach(config_ds);
Genode::memcpy(ptr, config_node.addr(), config_size);
env()->rm_session()->detach(ptr);
}
/* add launchpad entry */
launchpad->add_launcher(filename, default_ram_quota,
config->dataspace());
launchpad->add_launcher(filename, default_ram_quota, config_ds);
launcher_cnt++;
} catch (...) {

4
os/run/demo.run
View File

@ -135,7 +135,9 @@ set launchpad_config_fd [open "bin/launchpad.config" w]
puts $launchpad_config_fd {<config>
<launcher name="testnit" ram_quota="768K" />
<launcher name="scout" ram_quota="41M" />
<launcher name="launchpad" ram_quota="6M" />
<launcher name="launchpad" ram_quota="6M">
<configfile name="launchpad.config" />
</launcher>
<launcher name="nitlog" ram_quota="1M" />
<launcher name="liquid_fb" ram_quota="7M" />
<launcher name="nitpicker" ram_quota="1M" />