Merge lp:~alan-griffiths/mir/fix-1475994-g++-5 into lp:mir

[Alan Griffiths]

Rework code that didn't compile with gcc-5.0

Rework code that didn't compile with gcc-5.0

[Andreas Pokorny (andreas-pokorny)]

Hmm I believe .good() tests more.. I think static_cast<bool> would do too - but the extra check for eof should not matter.

We could also use __func__ which ould be closer to __FRETTY_FUNCTION__ or __FUNCTION__.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2758
http://jenkins.qa.ubuntu.com/job/mir-ci/4361/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3220
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/745
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3168/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/510
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3168
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3168/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5972/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21984

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4361/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2758
http://jenkins.qa.ubuntu.com/job/mir-ci/4369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3229
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/754
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3177/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/518
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3177
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3177/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5979/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21993

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4369/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Works for me on desktop (wily + gcc5). Approved pending Jenkins...

review: Approve

[Alan Griffiths (alan-griffiths)]

> ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
> Dynamic exception type: N5boost16exception_detail10clone_implINS0_19error_info_injectorINS_6system12system_errorEEEEE
> std::exception::what: bind: No such file or directory

Yikes!

Looks like we have two sets of boost RTTI in the address space. (Presumably somewhere we're loading both 4.9 and 5.0 versions.)

[Daniel van Vugt (vanvugt)]

Probably some android ABI we failed to bump and it's loading the old version via that system-installed android driver.

Actually anpok just landed a potential fix for that on lp:mir/0.14 so try resubmitting -- it might be resolved already.

[Alan Griffiths (alan-griffiths)]

> Probably some android ABI we failed to bump and it's loading the old version
> via that system-installed android driver.
>
> Actually anpok just landed a potential fix for that on lp:mir/0.14 so try
> resubmitting -- it might be resolved already.

I don't think landings on 0.14 affect trunk. We'd need to port that fix.

[Alan Griffiths (alan-griffiths)]

> > try resubmitting -- it might be resolved already.
>
> I don't think landings on 0.14 affect trunk. We'd need to port that fix.

...and those ABIs are bumped already.

[Alan Griffiths (alan-griffiths)]

OTOH I think this may go away after 0.14 hits archive/overlay: The modules in 0.14 no longer use the ensure_loaded_with_rtld_global() hack to force RTLD_GLOBAL (and we have fixed the link dependencies to avoid various infelicities).

[Alan Griffiths (alan-griffiths)]

> > ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
> > Dynamic exception type: N5boost16exception_detail10clone_implINS0_19error_in
> fo_injectorINS_6system12system_errorEEEEE
> > std::exception::what: bind: No such file or directory
>
> Yikes!
>
> Looks like we have two sets of boost RTTI in the address space. (Presumably
> somewhere we're loading both 4.9 and 5.0 versions.)

Thinko: we're not building with 5.0

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2759
http://jenkins.qa.ubuntu.com/job/mir-ci/4378/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3240
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/527
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/527/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3188
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5990
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22017

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4378/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/basic.c'
--- examples/basic.c	2015-04-28 07:54:10 +0000
+++ examples/basic.c	2015-07-21 10:17:04 +0000
@@ -91,7 +91,7 @@
 
     ///\internal [connect_tag]
     // Call mir_connect and wait for callback to complete.
-    mir_wait_for(mir_connect(server, __PRETTY_FUNCTION__, connection_callback, &mcd));
+    mir_wait_for(mir_connect(server, __FILE__, connection_callback, &mcd));
     puts("Connected");
     ///\internal [connect_tag]
 
@@ -125,7 +125,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(mcd.connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
 
     ///\internal [surface_create_tag]
     // ...we create a surface using that format and wait for callback to complete.
 
=== modified file 'examples/flicker.c'
--- examples/flicker.c	2015-04-28 07:54:10 +0000
+++ examples/flicker.c	2015-07-21 10:17:04 +0000
@@ -129,7 +129,7 @@
 
     puts("Starting");
 
-    connection = mir_connect_sync(socket_file, __PRETTY_FUNCTION__);
+    connection = mir_connect_sync(socket_file, __FILE__);
     assert(connection != NULL);
     assert(mir_connection_is_valid(connection));
     assert(strcmp(mir_connection_get_error_message(connection), "") == 0);
@@ -144,7 +144,7 @@
     MirSurfaceSpec *spec =
         mir_connection_create_spec_for_normal_surface(connection, 640, 480, pixel_format);
     assert(spec != NULL);
-    mir_surface_spec_set_name(spec, __PRETTY_FUNCTION__);
+    mir_surface_spec_set_name(spec, __FILE__);
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
 
     surface = mir_surface_create_sync(spec);
 
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-07-16 07:03:19 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-07-21 10:17:04 +0000
@@ -19,7 +19,6 @@
 #include "mir_protobuf_rpc_channel.h"
 #include "rpc_report.h"
 
-#include "mir/protobuf/google_protobuf_guard.h"
 #include "../surface_map.h"
 #include "../mir_surface.h"
 #include "../display_configuration.h"
 
=== removed file 'src/include/common/mir/protobuf/google_protobuf_guard.h'
--- src/include/common/mir/protobuf/google_protobuf_guard.h	2015-02-22 07:46:25 +0000
+++ src/include/common/mir/protobuf/google_protobuf_guard.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#ifndef MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_
-#define MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_
-
-namespace mir
-{
-
-/// subsystem dealing with Google protobuf protocol.
-namespace protobuf
-{
-void google_protobuf_guard();
-}
-}
-
-// Any translation unit that includes this header will get this as part
-// of its initialization, and, in turn, this ensures that protobuf gets
-// initialized (and cleaned up) in a sensible sequence.
-namespace
-{
-bool force_google_protobuf_init{(mir::protobuf::google_protobuf_guard(), true)};
-}
-
-#endif /* MIR_PROTOBUF_GOOGLE_PROTOBUF_GUARD_H_ */
 
=== modified file 'src/protobuf/google_protobuf_guard.cpp'
--- src/protobuf/google_protobuf_guard.cpp	2015-06-23 10:02:53 +0000
+++ src/protobuf/google_protobuf_guard.cpp	2015-07-21 10:17:04 +0000
@@ -16,20 +16,11 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/protobuf/google_protobuf_guard.h"
-
 #include <google/protobuf/descriptor.h>
-#include <mutex>
 #include <dlfcn.h>
 
-namespace mir
-{
-namespace
-{
-std::once_flag init_flag;
-std::once_flag shutdown_flag;
-
-void init_google_protobuf()
+extern "C" int __attribute__((constructor))
+init_google_protobuf()
 {
     // Leak libmirprotobuf.so.X
     // This will stop it getting unloaded/reloaded and work around LP: #1391976
@@ -40,24 +31,20 @@
     }
 
     GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+    return 0;
 }
 
-void shutdown_google_protobuf()
+extern "C" int __attribute__((destructor))
+shutdown_google_protobuf()
 {
     google::protobuf::ShutdownProtobufLibrary();
+    return 0;
 }
 
-// Too clever? The idea is to ensure protbuf version is verified once (on
-// the first google_protobuf_guard() call) and memory is released on exit.
-struct google_protobuf_guard_t
-{
-    google_protobuf_guard_t() { std::call_once(init_flag, init_google_protobuf); }
-    ~google_protobuf_guard_t() { std::call_once(shutdown_flag, shutdown_google_protobuf); }
-};
-}
-}
+// Preserve ABI
+namespace mir { namespace protobuf { void google_protobuf_guard(); }}
 
 void mir::protobuf::google_protobuf_guard()
 {
-    static google_protobuf_guard_t guard;
 }
 
=== modified file 'src/server/frontend/protobuf_connection_creator.cpp'
--- src/server/frontend/protobuf_connection_creator.cpp	2015-06-18 11:54:56 +0000
+++ src/server/frontend/protobuf_connection_creator.cpp	2015-07-21 10:17:04 +0000
@@ -27,7 +27,6 @@
 
 #include "protobuf_ipc_factory.h"
 #include "mir/frontend/session_authorizer.h"
-#include "mir/protobuf/google_protobuf_guard.h"
 
 namespace mf = mir::frontend;
 namespace mfd = mir::frontend::detail;
 
=== modified file 'tests/unit-tests/android_input/property_map.cpp'
--- tests/unit-tests/android_input/property_map.cpp	2013-05-03 16:38:07 +0000
+++ tests/unit-tests/android_input/property_map.cpp	2015-07-21 10:17:04 +0000
@@ -36,7 +36,7 @@
 
     static void SetUpTestCase()
     {
-        ASSERT_TRUE(std::ofstream(test_file) <<
+        ASSERT_TRUE((std::ofstream(test_file) <<
             "test.string=a_string\n"
             "#test.bool.true=true\n"
             "test.bool.true=1\n"
@@ -45,7 +45,7 @@
             "# a comment\n"
             "#test.int.ignored=1\n"
             "test.int_32=123\n"
-            "test.float=0.5\n");
+            "test.float=0.5\n").good());
     }
 
     void SetUp()