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

Turn framebuffer drivers into capture clients

Browse Source 
This patch replaces the use of the "Framebuffer" session interface by
the new "Capture" session interface in all framebuffer drivers. Thanks
to this change, those drivers have become mere clients of the nitpicker
GUI server now, and are no longer critical for the liveliness of the GUI
server.

The patch touches the following areas:

- The actual driver components. The new versions of all drivers have
  been tested on the respective hardware. Generally, the drivers
  have become simpler.

- The drivers_interactive packages for various boards. The drivers
  subsystem no longer provides a "Framebuffer" service but needs a
  valid route to the "Capture" service provided by nitpicker.

- The driver manager of Sculpt OS.

- This patch changes the role of the test-framebuffer component from a
  framebuffer client to a capture server so that drivers (capture clients)
  can be directly connected to the test component without the nitpicker
  server.

- Framebuffer driver no longer support the unbuffered mode.

- The fb_bench.run script is no longer very meaningful because it
  interplays solely with nitpicker, not with the driver directly.

- All run scripts for graphical scenarios and the related depot
  archives got adapted to the change.

Fixes #3813
This commit is contained in:
Norman Feske
2020-07-01 22:26:11 +02:00
parent 6743669ab8
commit c81af531a3
72 changed files with 1492 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
repos/gems/recipes/raw/drivers_managed-pc/drivers.config
View File

@@ -11,6 +11,7 @@
<service name="LOG"/>
<service name="Timer"/>
<service name="Report"/>
<service name="Capture"/>
</parent-provides>
<default-route>
@@ -19,9 +20,6 @@
<default caps="100"/>
<service name="Framebuffer">
<default-policy> <child name="dynamic"/> </default-policy> </service>
<service name="Block">
<default-policy> <child name="dynamic"/> </default-policy> </service>
@@ -228,6 +226,7 @@
<service name="IO_MEM"> <parent/> </service>
<service name="IO_PORT"> <parent/> </service>
<service name="Timer"> <parent/> </service>
<service name="Capture"> <parent/> </service>
</route>
</start>

2
repos/gems/recipes/src/driver_manager/used_apis
View File

@@ -3,6 +3,6 @@ os
report_session
block_session
usb_session
framebuffer_session
capture_session
timer_session
platform_session

13
repos/gems/run/cpu_load_display.run
View File

@@ -37,18 +37,19 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Gui"/></provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<domain name="pointer" layer="1" label="no" content="client" origin="pointer" />
<domain name="default" layer="2" label="no" content="client" hover="always" />

13
repos/gems/run/decorator.run
View File

@@ -39,12 +39,11 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="report_rom">
@@ -58,8 +57,9 @@ install_config {
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Gui"/> </provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<report pointer="yes" />
<domain name="default" layer="2" content="client" label="no"/>
<default-policy domain="default"/>
@@ -168,6 +168,7 @@ install_config {
</service>
<any-service> <parent/> <any-child/> </any-service>
</route>
<config> <default-policy/> </config>
</start>
</config>}

12
repos/gems/run/decorator_stress.run
View File

@@ -41,18 +41,18 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker" caps="200">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Gui"/> </provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<domain name="" layer="2" content="client" label="no" />
<default-policy domain=""/>
<report pointer="yes" />

12
repos/gems/run/depot_deploy.run
View File

@@ -50,18 +50,18 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides><service name="Gui"/></provides>
<config focus="rom">
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config focus="rom" request_framebuffer="no">
<capture/>
<background color="#123456"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="3" content="client" label="no" hover="always" />

24
repos/gems/run/driver_manager.run
View File

@@ -11,6 +11,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/drivers_managed-pc \
[depot_user]/src/report_rom \
[depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker \
[depot_user]/src/init
install_config {
@@ -41,6 +42,7 @@ install_config {
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="yes">
<policy label="test-driver_manager -> block_devices" report="drivers -> block_devices"/>
<policy label="test-driver_manager -> displays" report="nitpicker -> displays"/>
</config>
</start>
@@ -57,13 +59,13 @@ install_config {
<service name="ROM" label="numlock"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="system"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="usb_policy"><child name="dynamic_rom"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/>
<service name="Framebuffer"/>
<service name="Block"/>
</provides>
</start>
@@ -95,16 +97,30 @@ install_config {
</config>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no" request_input="no">
<capture/>
<report displays="yes"/>
</config>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="test-driver_manager">
<resource name="RAM" quantum="1M"/>
<config>
<check_ahci_block_device label="ahci-1" block_count="65536" block_size="512"
model="QEMU HARDDISK"/>
<check_input/>
<check_framebuffer/>
<check_displays/>
</config>
<route>
<service name="ROM" label="block_devices"> <child name="report_rom"/> </service>
<service name="ROM" label="displays"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

13
repos/gems/run/gui_fader.run
View File

@@ -36,18 +36,19 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Gui"/></provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="3" content="client" label="no" focus="click" hover="always" />

14
repos/gems/run/leitzentrale.run
View File

@@ -70,12 +70,11 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="report_rom">
@@ -93,8 +92,9 @@ install_config {
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides><service name="Gui"/></provides>
<config focus="rom">
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config focus="rom" request_framebuffer="no">
<capture/>
<report hover="yes" displays="yes"/>
<background color="#000000"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
@@ -226,7 +226,7 @@ install_config {
<start name="ahci-2">
<binary name="vfs_block"/>
<resource name="RAM" quantum="10M"/>
<resource name="RAM" quantum="12M"/>
<provides> <service name="Block"/> </provides>
<config>
<vfs>

13
repos/gems/run/menu_view.run
View File

@@ -40,18 +40,19 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides><service name="Gui"/></provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<background color="#123456"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="3" content="client" label="no" hover="always" />

13
repos/gems/run/nano3d.run
View File

@@ -31,12 +31,11 @@ append config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="timer">
@@ -46,8 +45,10 @@ append config {
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Gui"/></provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<domain name="default" layer="2" content="client" label="no"/>
<domain name="nano3d" layer="1" content="client" label="no" origin="pointer"/>

15
repos/gems/run/sculpt.run
View File

@@ -254,13 +254,13 @@ install_config {
<service name="ROM" label_last="usb_policy">
<child name="config_fs_rom" label="usb"/> </service>
<service name="ROM" label_last="numlock"> <child name="report_rom"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Report"> <child name="fs_report"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<service name="Report"> <child name="fs_report"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/>
<service name="Framebuffer"/>
<service name="Block"/>
<service name="Usb"/>
<service name="Platform"/>
@@ -269,7 +269,7 @@ install_config {
<start name="nitpicker" caps="1000">
<resource name="RAM" quantum="6M"/>
<provides><service name="Gui"/></provides>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<route>
<service name="ROM" label="config">
<child name="config_fs_rom" label="nitpicker"/> </service>
@@ -277,10 +277,9 @@ install_config {
<child name="nit_focus"/> </service>
<service name="Report" label="keystate">
<child name="report_logger"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Framebuffer"> <child name="drivers"/> </service>
<service name="Input"> <child name="drivers"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Input"> <child name="drivers"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>

4
repos/gems/run/sculpt/nitpicker.config
View File

@@ -1,6 +1,8 @@
<config focus="rom">
<config focus="rom" request_framebuffer="no">
<capture/>
<report hover="yes" focus="yes" clicked="yes" keystate="no" displays="yes"/>
<background color="#000000"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="lock" layer="2" content="client" label="no" hover="always" focus="click"/>
<domain name="leitzentrale" layer="3" content="client" label="no" hover="always" focus="click" />

15
repos/gems/run/terminal_log.run
View File

@@ -40,26 +40,25 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Gui"/> </provides>
<config>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config request_framebuffer="no">
<capture/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="2" content="client" label="no" focus="click" hover="always" />
<policy label_prefix="pointer" domain="pointer"/>
<default-policy domain="default"/>
</config>
<route>
<service name="Input"> <child name="drivers"/> </service>
<service name="Framebuffer"> <child name="drivers"/> </service>
<service name="Input"> <child name="drivers"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

12
repos/gems/run/text_area.run
View File

@@ -40,12 +40,11 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="report_rom">
@@ -59,8 +58,9 @@ install_config {
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides><service name="Gui"/></provides>
<config focus="rom">
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config focus="rom" request_framebuffer="no">
<capture/>
<report hover="yes"/>
<background color="#123456"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />

38
repos/gems/run/text_painter.run
View File

@@ -5,6 +5,8 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/vfs \
[depot_user]/src/nitpicker \
[depot_user]/src/gui_fb \
[depot_user]/raw/ttf-bitstream-vera-minimal
install_config {
@@ -36,12 +38,36 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config focus="rom" request_framebuffer="no">
<capture/>
<domain name="default" layer="2" content="client" label="no"
hover="always" width="1024" height="768"/>
<default-policy domain="default"/>
</config>
<route>
<service name="Input"> <child name="drivers"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="gui_fb">
<resource name="RAM" quantum="4M"/>
<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
<config/>
<route>
<service name="Gui"> <child name="nitpicker"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="font_vfs">
@@ -70,6 +96,10 @@ install_config {
build { server/vfs test/text_painter lib/vfs/ttf }
set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>"
close $fd
build_boot_image { vfs test-text_painter vfs_ttf.lib.so }
run_genode_until forever

13
repos/gems/run/wm.run
View File

@@ -43,18 +43,19 @@ install_config {
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides>
<service name="Input"/> <service name="Framebuffer"/>
</provides>
<provides> <service name="Input"/> </provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="4M"/>
<provides><service name="Gui"/></provides>
<config focus="rom">
<provides> <service name="Gui"/> <service name="Capture"/> </provides>
<config focus="rom" request_framebuffer="no">
<capture/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="2" content="client" label="no" hover="always"/>

9
repos/gems/src/app/driver_manager/main.cc
View File

@@ -18,7 +18,7 @@
#include <os/reporter.h>
#include <block_session/block_session.h>
#include <rm_session/rm_session.h>
#include <framebuffer_session/framebuffer_session.h>
#include <capture_session/capture_session.h>
#include <io_mem_session/io_mem_session.h>
#include <io_port_session/io_port_session.h>
#include <timer_session/timer_session.h>
@@ -128,13 +128,11 @@ struct Driver_manager::Intel_fb_driver : Device_driver
_gen_common_start_node_content(xml, "intel_fb_drv", "intel_fb_drv",
Ram_quota{42*1024*1024}, Cap_quota{800},
Priority{0});
_gen_provides_node<Framebuffer::Session>(xml);
xml.node("route", [&] () {
_gen_config_route(xml, "fb_drv.config");
_gen_default_parent_route(xml);
});
});
_gen_forwarded_service<Framebuffer::Session>(xml, "intel_fb_drv");
}
};
@@ -147,13 +145,11 @@ struct Driver_manager::Vesa_fb_driver : Device_driver
_gen_common_start_node_content(xml, "vesa_fb_drv", "vesa_fb_drv",
Ram_quota{8*1024*1024}, Cap_quota{100},
Priority{-1});
_gen_provides_node<Framebuffer::Session>(xml);
xml.node("route", [&] () {
_gen_config_route(xml, "fb_drv.config");
_gen_default_parent_route(xml);
});
});
_gen_forwarded_service<Framebuffer::Session>(xml, "vesa_fb_drv");
}
};
@@ -193,13 +189,11 @@ struct Driver_manager::Boot_fb_driver : Device_driver
_gen_common_start_node_content(xml, "fb_boot_drv", "fb_boot_drv",
_ram_quota, Cap_quota{100},
Priority{-1});
_gen_provides_node<Framebuffer::Session>(xml);
xml.node("route", [&] () {
_gen_config_route(xml, "fb_drv.config");
_gen_default_parent_route(xml);
});
});
_gen_forwarded_service<Framebuffer::Session>(xml, "fb_boot_drv");
}
};
@@ -538,6 +532,7 @@ void Driver_manager::Main::_generate_init_config(Reporter &init_config) const
_gen_parent_service_xml(xml, Platform::Session::service_name());
_gen_parent_service_xml(xml, Report::Session::service_name());
_gen_parent_service_xml(xml, Usb::Session::service_name());
_gen_parent_service_xml(xml, Capture::Session::service_name());
});

16
repos/gems/src/test/driver_manager/main.cc
View File

@@ -16,7 +16,6 @@
#include <base/attached_rom_dataspace.h>
#include <base/allocator_avl.h>
#include <base/heap.h>
#include <framebuffer_session/connection.h>
#include <input_session/connection.h>
#include <block_session/connection.h>
@@ -32,6 +31,7 @@ struct Test::Main
Attached_rom_dataspace _config { _env, "config" };
Attached_rom_dataspace _block_devices { _env, "block_devices" };
Attached_rom_dataspace _displays { _env, "displays" };
static bool _attribute_matches(char const *attr, Xml_node expected, Xml_node checked)
{
@@ -113,6 +113,14 @@ struct Test::Main
Block::Connection<> block(_env, &packet_alloc, 128*1024, label.string());
});
if (_config.xml().has_sub_node("check_displays")) {
_displays.update();
if (!_displays.xml().has_sub_node("display"))
return;
log("available displays: ", _displays.xml());
}
log("all expected devices present and accessible");
}
@@ -121,12 +129,6 @@ struct Test::Main
Main(Env &env) : _env(env)
{
if (_config.xml().has_sub_node("check_framebuffer")) {
log("connect to framebuffer driver");
Framebuffer::Mode mode { .area = { 640, 480 } };
Framebuffer::Connection fb(_env, mode);
}
if (_config.xml().has_sub_node("check_input")) {
log("connect to input driver");
Input::Connection input(_env);