← Back to branch summary

~vanvugt/mir/mir-display-config-header

~vanvugt/mir/mir-display-config-header

Viewing all changes in revision 3823.

Committer: Tarmac
Author(s): Christopher James Halse Rogers
Date: 2016-11-15 23:48:01 UTC
mfrom: (3730.3.26 reports-as-observers)
Revision ID: tarmac-20161115234801-2w603k4v3ffhfl3u

Replace the mir::Server-overridable Reports with Observers.

This resolves two problems:
1) It ensures that Mir will respect the various reporting options we provide, even when the shell wants to hook into some of the reports, and
2) It matches the semantic expectations around Reports vs Observers that (most of) the Mir team have. A couple of report call-sites which are unsafe for Observers are fixed in this branch.

Approved by mir-ci-bot, Kevin DuBois, Andreas Pokorny, Cemil Azizoglu.

files added:
include/common/mir/posix_rw_mutex.h

src/server/frontend/session_mediator_observer_multiplexer.cpp

src/server/frontend/session_mediator_observer_multiplexer.h

src/server/graphics/display_configuration_observer_multiplexer.cpp

src/server/graphics/display_configuration_observer_multiplexer.h

src/server/input/seat_observer_multiplexer.cpp

src/server/input/seat_observer_multiplexer.h

src/server/report/reports.cpp

src/server/report/reports.h

files removed:
include/common/mir/posix_rw_mutex.h

files renamed:
include/server/mir/frontend/session_mediator_report.h => include/server/mir/frontend/session_mediator_observer.h

include/server/mir/graphics/display_configuration_report.h => include/server/mir/graphics/display_configuration_observer.h

include/server/mir/input/seat_report.h => include/server/mir/input/seat_observer.h

files modified:
include/server/mir/server.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_seat_report.h

src/common/symbols.map

src/include/server/mir/default_server_configuration.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging/display_configuration_report.cpp

src/server/report/logging/display_configuration_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng_report_factory.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/include/mir_test_framework/fake_input_server_configuration.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

include/common/mir/posix_rw_mutex.h

include/common/mir/posix_rw_mutex.h

include/server/mir/frontend/session_mediator_observer.h

include/server/mir/graphics/display_configuration_observer.h

include/server/mir/input/seat_observer.h

include/server/mir/server.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_seat_report.h

src/common/symbols.map

src/include/server/mir/default_server_configuration.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/session_mediator_observer_multiplexer.cpp

src/server/frontend/session_mediator_observer_multiplexer.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/display_configuration_observer_multiplexer.cpp

src/server/graphics/display_configuration_observer_multiplexer.h

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/input/seat_observer_multiplexer.cpp

src/server/input/seat_observer_multiplexer.h

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging/display_configuration_report.cpp

src/server/report/logging/display_configuration_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng_report_factory.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/report/reports.cpp

src/server/report/reports.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/include/mir_test_framework/fake_input_server_configuration.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Older »