cpu_balancer.run: use shim for hosting cpu_burner

This way, the redirected env sessions for the CPU burner are no longer
called directly by init. Init stays independent from the behavior of the
CPU balancer.

Issue #3837
Issue #4029
This commit is contained in:
Norman Feske 2021-02-25 13:33:19 +01:00
parent c0a7565c21
commit 9a5bc9caf0

View File

@ -21,7 +21,8 @@ set use_trace "yes"
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/report_rom import_from_depot [depot_user]/src/report_rom \
[depot_user]/src/shim
append config { append config {
<config prio_levels="2" verbose="yes"> <config prio_levels="2" verbose="yes">
@ -73,7 +74,7 @@ append config {
report="} $report_config {" report="} $report_config {"
trace="} $use_trace {" trace="} $use_trace {"
verbose="no"> verbose="no">
<component label="cpu_burner" default_policy="none"> <component label="cpu_burner -> " default_policy="none">
<!-- <!--
<thread name="signal handler" policy="pin" xpos="1" ypos="0"/> <thread name="signal handler" policy="pin" xpos="1" ypos="0"/>
--> -->
@ -90,13 +91,24 @@ append config {
</start> </start>
<start name="cpu_burner" priority="-1"> <start name="cpu_burner" priority="-1">
<binary name="shim"/>
<affinity xpos="1" ypos="0" width="2" height="1"/> <affinity xpos="1" ypos="0" width="2" height="1"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<!-- by shim binary -->
<service name="PD" unscoped_label="cpu_burner"> <parent/> </service>
<service name="CPU" unscoped_label="cpu_burner"> <parent/> </service>
<!-- by child of shim -->
<service name="PD"> <child name="cpu_balancer"/> </service> <service name="PD"> <child name="cpu_balancer"/> </service>
<service name="CPU"> <child name="cpu_balancer"/> </service> <service name="CPU"> <child name="cpu_balancer"/> </service>
<service name="ROM" label="binary"> <parent label="cpu_burner"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service> <service name="LOG"> <parent/> </service>
<service name="ROM"> <parent/> </service>
</route> </route>
</start> </start>
<!-- <!--