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

init: prios shall not exceed the lowest prio level

Browse Source 
Fixes #1570
This commit is contained in:
Emery Hemingway
2015-06-25 12:50:01 -05:00
committed by Norman Feske
parent 7e40f5f587
commit c72c9924d3
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repos/os/src/init/main.cc
View File

@ -26,7 +26,7 @@ namespace Init { bool config_verbose = false; }
/**
* Read priority-levels declaration from config
*/
inline long read_prio_levels_log2()
inline long read_prio_levels()
{
using namespace Genode;
@ -35,11 +35,11 @@ inline long read_prio_levels_log2()
config()->xml_node().attribute("prio_levels").value(&prio_levels); }
catch (...) { }
if (prio_levels && prio_levels != (1 << log2(prio_levels))) {
if (prio_levels && (prio_levels != (1 << log2(prio_levels)))) {
printf("Warning: Priolevels is not power of two, priorities are disabled\n");
prio_levels = 0;
return 0;
}
return prio_levels ? log2(prio_levels) : 0;
return prio_levels;
}
@ -334,7 +334,7 @@ int main(int, char **)
try {
children.insert(new (env()->heap())
Init::Child(start_node, default_route_node,
&children, read_prio_levels_log2(),
&children, read_prio_levels(),
read_affinity_space(),
&parent_services, &child_services, &cap));
}