Merge lp:~vanvugt/mir/libprotobuf-unlite into lp:mir

[Daniel van Vugt]

Revert back to linking to libprotobuf instead of libprotobuf-lite.
Thankfully we don't have to change the classes we link to, but it
seems we do need to use the full libprotobuf library in order to
avoid it getting confused, corrupting the heap and crashing unity8
every time you log out. (LP: #1535297)

Consider this a semi-permanent workaround to stop the crash reports
from happening.

This change appears to be free from ABI and protocol breaks. Existing
clients/servers can still talk to the new clients/servers.

As well as hopefully stopping the crash reports, this might also
shrink our system footprint if we were the first/last users of
libprotobuf-lite.

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

FAILED: Continuous integration, rev:3635
https://mir-jenkins.ubuntu.com/job/mir-ci/1405/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1714/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1767
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1758
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1758
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1758
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1735/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1735
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1735/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1735
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1735/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1735/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1735/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/1735/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1735
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1735/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

1. It would be better if we simply stopped loading libprotobuf-lite into global symbol space with "dlopen(info.dli_fname, RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);". I though Cemil was already working on that?

2. If any of the (current or future) Qt plugins use protobuf-lite then we'll see similar issues with this approach. Have we checked?

review: Needs Information

[Daniel van Vugt (vanvugt)]

I was going for a quick fix (and waiting to see if it works afterwards).

If anyone has a better alternative that might work, please do.

[Daniel van Vugt (vanvugt)]

Deja vu:
    Protobuf-can-be-reloaded (SEGFAULT)
on vivid+overlay.

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

FAILED: Continuous integration, rev:3637
https://mir-jenkins.ubuntu.com/job/mir-ci/1415/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1726/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1779
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1770
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1770
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1770
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1748/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1748
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1748/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1748
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1748/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1748
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1748/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/1748/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1748
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1748/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

It only crashes on vivid now. I'd guess that's possibly bug 1391976 regressing, and perhaps it was fixed upstream in protobuf in xenial and later.

But if the required fix isn't in vivid yet then we can't proceed with this.

[Christopher Townsend (townsend)]

Based on your last comment, does the Vivid crash occur on the phone? I thought this was a desktop only crash, and if that is still the case, then we don't care about supporting U8 desktop on Vivid.

If the crash does occur on the phone, then well, uh, ignore this comment:)

Unmerged revisions

3637. By Daniel van Vugt on 2016-08-09

Bump the libmirprotobuf ABI in one last clumsy effort to get
mir_test_reload_protobuf passing on vivid.

3636. By Daniel van Vugt on 2016-08-09

Merge latest trunk

3635. By Daniel van Vugt on 2016-08-08

Working

=== modified file 'debian/control'
--- debian/control	2016-08-01 14:43:19 +0000
+++ debian/control	2016-08-09 07:23:07 +0000
@@ -52,7 +52,7 @@
 # just go ahead. ~mir-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/mir
 
-Package: libmirprotobuf3
+Package: libmirprotobuf4
 Section: libs
 Architecture: linux-any
 Multi-Arch: same

=== renamed file 'debian/libmirprotobuf3.install' => 'debian/libmirprotobuf4.install'
--- debian/libmirprotobuf3.install	2016-01-29 08:18:22 +0000
+++ debian/libmirprotobuf4.install	2016-08-09 07:23:07 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirprotobuf.so.3
+usr/lib/*/libmirprotobuf.so.4

=== modified file 'src/client/mirclient.pc.in'
--- src/client/mirclient.pc.in	2016-01-29 08:18:22 +0000
+++ src/client/mirclient.pc.in	2016-08-09 07:23:07 +0000
@@ -8,6 +8,6 @@
 Name: mirclient
 Description: Mir client library
 Version: @MIR_VERSION@
-Requires.private: protobuf-lite >= 2.4.1, mircookie
+Requires.private: protobuf >= 2.4.1, mircookie
 Libs: -L${libdir} -lmirclient -lmircommon
 Cflags: -I${includedir} -I${common_includedir} 

=== modified file 'src/protobuf/CMakeLists.txt'
--- src/protobuf/CMakeLists.txt	2016-08-04 16:49:58 +0000
+++ src/protobuf/CMakeLists.txt	2016-08-09 07:23:07 +0000
@@ -23,10 +23,10 @@
 
 target_link_libraries(
   mirprotobuf
-  ${PROTOBUF_LITE_LIBRARIES}
+  ${PROTOBUF_LIBRARIES}
 )
 
-set(MIRPROTOBUF_ABI 3)
+set(MIRPROTOBUF_ABI 4)
 
 set_target_properties(
   mirprotobuf

=== modified file 'src/protobuf/mir_protobuf.proto'
--- src/protobuf/mir_protobuf.proto	2016-06-21 21:31:05 +0000
+++ src/protobuf/mir_protobuf.proto	2016-08-09 07:23:07 +0000
@@ -1,3 +1,6 @@
+// We wish to maintain support for protobuf-lite into the future even if we
+// presently access the Lite classes via the full libprotobuf to work around
+// crashes (LP: #1535297)
 option optimize_for = LITE_RUNTIME;
 
 package mir.protobuf;

=== modified file 'src/protobuf/mir_protobuf_wire.proto'
--- src/protobuf/mir_protobuf_wire.proto	2016-01-29 08:18:22 +0000
+++ src/protobuf/mir_protobuf_wire.proto	2016-08-09 07:23:07 +0000
@@ -1,3 +1,6 @@
+// We wish to maintain support for protobuf-lite into the future even if we
+// presently access the Lite classes via the full libprotobuf to work around
+// crashes (LP: #1535297)
 option optimize_for = LITE_RUNTIME;
 
 package mir.protobuf.wire;

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2016-08-01 07:24:32 +0000
+++ tests/integration-tests/CMakeLists.txt	2016-08-09 07:23:07 +0000
@@ -79,7 +79,7 @@
 
   mircommon
 
-  ${PROTOBUF_LITE_LIBRARIES}
+  ${PROTOBUF_LIBRARIES}
   ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}

=== modified file 'tests/integration-tests/graphics/mesa/CMakeLists.txt'
--- tests/integration-tests/graphics/mesa/CMakeLists.txt	2016-08-01 07:24:32 +0000
+++ tests/integration-tests/graphics/mesa/CMakeLists.txt	2016-08-09 07:23:07 +0000
@@ -23,7 +23,7 @@
       mirsharedmesaservercommon-static
       mircommon
 
-      ${PROTOBUF_LITE_LIBRARIES}
+      ${PROTOBUF_LIBRARIES}
       # Mesa platform dependencies
       ${DRM_LDFLAGS} ${DRM_LIBRARIES}
       ${GBM_LDFLAGS} ${GBM_LIBRARIES}
@@ -60,7 +60,7 @@
       mirsharedmesaservercommon-static
       mircommon
 
-      ${PROTOBUF_LITE_LIBRARIES}
+      ${PROTOBUF_LIBRARIES}
       # Mesa platform dependencies
       ${DRM_LDFLAGS} ${DRM_LIBRARIES}
       ${GBM_LDFLAGS} ${GBM_LIBRARIES}

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2016-08-04 18:53:11 +0000
+++ tests/unit-tests/CMakeLists.txt	2016-08-09 07:23:07 +0000
@@ -139,7 +139,7 @@
 
   mircommon
 
-  ${PROTOBUF_LITE_LIBRARIES}
+  ${PROTOBUF_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
@@ -172,7 +172,7 @@
   mir-test-static
   mir-test-framework-static
 
-  ${PROTOBUF_LITE_LIBRARIES}
+  ${PROTOBUF_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}