Merge lp:~andreas-pokorny/mir/bump-input-platform-abi-for-0.22 into lp:mir

[Andreas Pokorny]

Bump the input platform ABI to 6 and add a new combined input and graphics server abi numbering.

Merge this before lp:~andreas-pokorny/mir/move-key-repeat-into-input-platforms and before a not yet proposed change that will add a method to query the initial status from input devices on startup.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3448
https://mir-jenkins.ubuntu.com/job/mir-ci/798/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/793/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/830
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/821
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/821
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/802/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/802/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/802/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/802/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/802/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/802/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/798/rebuild

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/bump-input-platform-abi-for-0.22]

3449. By Andreas Pokorny on 2016-04-11

use server platform abi version when loading x11 server platform

[Kevin DuBois (kdub)]

I think there's some disentangling of the ABI/api to be done if input and graphics have to have the same numbering, but given the current situation with the x11 platform, lgtm

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3449
https://mir-jenkins.ubuntu.com/job/mir-ci/808/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/807/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/844
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/835
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/835
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/816/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/816/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/816/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/816/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/816/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/816/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/808/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I think this adds to an already confusing situation.

We have input and graphics ABIs that relate to the corresponding interfaces used by mirserver.

These are implemented in the assorted platform modules which use them to name the stanzas in their symbols maps.

The .soname numbering (which this MP is addressing) shouldn't be tied to to the ABI numbers, nor should the different platform modules be tied to the same .soname numbering.

There is a problem with the X11 platform that needs to support both input and graphics ABIs needed by the server but, theoretically at least, could support just one. But fiddling with the .soname doesn't help.

review: Disapprove

[Andreas Pokorny (andreas-pokorny)]

Given the interfaces that we have - so always a separated input and graphics platform interface, (we might in the future also split the graphics platform interface into more pieces - so we might get more separate interfaces - then this MP will not help either), and the wish that platforms from different mir versions may be installed in parallel without hurting each other we need to change the package number of the platform packages that contains changes. This change intends to separate combined server packages from pure graphics packages. Not splitting that means having new packages even when nothing changed..

> I think this adds to an already confusing situation.
>
> We have input and graphics ABIs that relate to the corresponding interfaces
> used by mirserver.
>
> These are implemented in the assorted platform modules which use them to name
> the stanzas in their symbols maps.
>
> The .soname numbering (which this MP is addressing) shouldn't be tied to to
> the ABI numbers, nor should the different platform modules be tied to the same
> .soname numbering.

The numbering is solely to allow parallel installs, instead of numbers we could also use cat names. But that makes sorting for the newest harder.

> There is a problem with the X11 platform that needs to support both input and
> graphics ABIs needed by the server but, theoretically at least, could support
> just one. But fiddling with the .soname doesn't help.

In theory the x platform is only a display platform and an input platform, allocation and IPC could be taken from the drm/mesa platform. Hm claiming it has only one interface, sounds like a step in the wrong direction. Each of the interfaces should have separate counters and stanzas.

We could also solve this problem by including all ABI change counters in the name of the x platform package using some delimiter.

Or we could avoid this problem entirely by providing more information to the probing function.. that would be some sort of context object that would allow the other part of the x platform access the X11 Display, and also know that we run on X11... then we could split the x platform into two separate packages. This would also scale well when we decide to split the graphics platform displaying and buffer allocation parts (and maybe IPC?).

[Daniel van Vugt (vanvugt)]

I would like us to get to a point where plugins did not need sonames. Or at least for the soname to refer to the ABI level of the initial probing API ("1") which will then never change, and itself will be used to probe the graphics/input/whatever API.

Also, the 'lib' prefix for plugins is inappropriate. 'libXYZ' is used only for compile-time linking to -lXYZ. If the linking is not at compile time (ie. drivers/plugins) then there should be no 'lib' prefix.

[Daniel van Vugt (vanvugt)]

Oh there is no lib prefix...

[Andreas Pokorny (andreas-pokorny)]

> I think this adds to an already confusing situation.
>
> We have input and graphics ABIs that relate to the corresponding interfaces
> used by mirserver.
>
> These are implemented in the assorted platform modules which use them to name
> the stanzas in their symbols maps.
>
> The .soname numbering (which this MP is addressing) shouldn't be tied to to
> the ABI numbers, nor should the different platform modules be tied to the same
> .soname numbering.
>
> There is a problem with the X11 platform that needs to support both input and
> graphics ABIs needed by the server but, theoretically at least, could support
> just one. But fiddling with the .soname doesn't help.

Sorry for conflating probing and other topic into this discussion.

This MP just avoids incrementing the kms and android counter when not necessary. I guess the names are misleading, instead of
set(MIR_SERVER_INPUT_PLATFORM_ABI 5)
set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 9)
we could have
set(MIR_SERVER_INPUT_PLATFORM_SUFFIX 5)
set(MIR_SERVER_GRAPHICS_PLATFORM_SUFFIX 9)
set(MIR_SERVER_COMBINED_PLATFORM_SUFFIX 10)

or _COUNTER ..

[Andreas Pokorny (andreas-pokorny)]

outdated .. and at the moment not yet needed..

Unmerged revisions

3449. By Andreas Pokorny on 2016-04-11

use server platform abi version when loading x11 server platform

3448. By Andreas Pokorny on 2016-04-08

use the 'server' platform abi numbering extension

3447. By Andreas Pokorny on 2016-04-08

Bump input platform ABI and separate the x11 ABI number from kms..

=== modified file 'debian/control'
--- debian/control	2016-03-26 00:19:29 +0000
+++ debian/control	2016-04-11 15:07:10 +0000
@@ -301,7 +301,7 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: mir-platform-graphics-mesa-x8
+Package: mir-platform-graphics-mesa-x9
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -343,7 +343,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Android drivers.
 
-Package: mir-platform-input-evdev5
+Package: mir-platform-input-evdev6
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -406,9 +406,9 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          mir-platform-graphics-mesa-kms8,
-         mir-platform-graphics-mesa-x8,
+         mir-platform-graphics-mesa-x9,
          mir-client-platform-mesa5,
-         mir-platform-input-evdev5,
+         mir-platform-input-evdev6,
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -424,7 +424,7 @@
 Depends: ${misc:Depends},
          mir-platform-graphics-android8,
          mir-client-platform-android5,
-         mir-platform-input-evdev5,
+         mir-platform-input-evdev6,
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
 
=== renamed file 'debian/mir-platform-graphics-mesa-x8.install' => 'debian/mir-platform-graphics-mesa-x9.install'
--- debian/mir-platform-graphics-mesa-x8.install	2016-02-02 16:03:37 +0000
+++ debian/mir-platform-graphics-mesa-x9.install	2016-04-11 15:07:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/server-mesa-x11.so.8
+usr/lib/*/mir/server-platform/server-mesa-x11.so.9
 
=== renamed file 'debian/mir-platform-input-evdev5.install' => 'debian/mir-platform-input-evdev6.install'
--- debian/mir-platform-input-evdev5.install	2016-01-29 08:18:22 +0000
+++ debian/mir-platform-input-evdev6.install	2016-04-11 15:07:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/input-evdev.so.5
+usr/lib/*/mir/server-platform/input-evdev.so.6
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ src/CMakeLists.txt	2016-04-11 15:07:10 +0000
@@ -48,6 +48,7 @@
 set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
 
 # We need the ABI versions in the tests
+set(MIR_SERVER_PLATFORM_ABI ${MIR_SERVER_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)
 
=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ src/platforms/CMakeLists.txt	2016-04-11 15:07:10 +0000
@@ -3,8 +3,10 @@
 # This ABI is much smaller than the full libmirplatform ABI.
 #
 # TODO: Add an extra driver-ABI check target.
-set(MIR_SERVER_INPUT_PLATFORM_ABI 5)
-set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.19)
+set(MIR_SERVER_PLATFORM_ABI 9) # incremented on either input or graphics platform change
+set(MIR_SERVER_PLATFORM_ABI ${MIR_SERVER_PLATFORM_ABI} PARENT_SCOPE)
+set(MIR_SERVER_INPUT_PLATFORM_ABI 6)
+set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.22)
 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")
 set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)
 
=== modified file 'src/platforms/mesa/server/x11/CMakeLists.txt'
--- src/platforms/mesa/server/x11/CMakeLists.txt	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/CMakeLists.txt	2016-04-11 15:07:10 +0000
@@ -39,7 +39,7 @@
   OUTPUT_NAME server-mesa-x11
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
   PREFIX ""
-  SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
+  SUFFIX ".so.${MIR_SERVER_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
 
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2016-04-11 15:07:10 +0000
@@ -15,6 +15,7 @@
     -DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}"
     -DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}"
     -DMIR_CLIENT_PLATFORM_ABI_STRING="${MIR_CLIENT_PLATFORM_ABI}"
+    -DMIR_SERVER_PLATFORM_ABI_STRING="${MIR_SERVER_PLATFORM_ABI}"
     -DMIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING="${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
     -DMIR_SERVER_INPUT_PLATFORM_ABI_STRING="${MIR_SERVER_INPUT_PLATFORM_ABI}"
     -DMIR_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
 
=== modified file 'tests/mir_test_framework/executable_path.cpp'
--- tests/mir_test_framework/executable_path.cpp	2016-03-23 06:39:56 +0000
+++ tests/mir_test_framework/executable_path.cpp	2016-04-11 15:07:10 +0000
@@ -73,7 +73,7 @@
     std::string libname{name};
 
     if (libname.find(".so") == std::string::npos)
-        libname += ".so." MIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING;
+        libname += ".so." MIR_SERVER_PLATFORM_ABI_STRING;
 
     for (auto const& option :
          {library_path() + "/server-modules/", library_path() + "/server-platform/", std::string(MIR_SERVER_PLATFORM_PATH) + '/'})
 
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/CMakeLists.txt	2016-04-11 15:07:10 +0000
@@ -3,6 +3,7 @@
 add_definitions(
   -DMIR_CLIENT_PLATFORM_VERSION="${MIR_CLIENT_PLATFORM_VERSION}"
   -DMIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING="${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
+  -DMIR_SERVER_PLATFORM_ABI_STRING="${MIR_SERVER_PLATFORM_ABI}"
 )
 
 if (MIR_BUILD_PLATFORM_ANDROID)
 
=== modified file 'tests/unit-tests/input/test_input_platform_probing.cpp'
--- tests/unit-tests/input/test_input_platform_probing.cpp	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/input/test_input_platform_probing.cpp	2016-04-11 15:07:10 +0000
@@ -151,7 +151,7 @@
 
 TEST_F(InputPlatformProbe, when_multiple_x11_platforms_are_eligible_only_one_is_selected)
 {
-    auto const real_lib = mtf::server_platform_path() + "server-mesa-x11.so." MIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING;
+    auto const real_lib = mtf::server_platform_path() + "server-mesa-x11.so." MIR_SERVER_PLATFORM_ABI_STRING;
     auto const fake_lib = mtf::server_platform_path() + "server-mesa-x11.so.0";
 
     ASSERT_THAT(real_lib, Ne(fake_lib));
 
=== modified file 'tools/update_package_abis.sh'
--- tools/update_package_abis.sh	2016-01-29 08:18:22 +0000
+++ tools/update_package_abis.sh	2016-04-11 15:07:10 +0000
@@ -20,7 +20,7 @@
     mir-client-platform-android:MIR_CLIENT_PLATFORM_ABI \
     mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
     mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
-    mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
+    mir-platform-graphics-mesa-x:MIR_SERVER_PLATFORM_ABI \
     mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
     mir-platform-input-evdev:MIR_SERVER_INPUT_PLATFORM_ABI"