Merge lp:~kdub/mir/ci-test into lp:mir/ubuntu

[Kevin DuBois]

MP just for CI testing, do not land

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

FAILED: Continuous integration, rev:3529
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/ci-test/+merge/301373/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/43/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1630/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1683
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1674
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1674
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1674
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1645/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1645/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1645/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1645/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1645/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:3529
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/ci-test/+merge/301373/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/44/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[lp:~kdub/mir/ci-test]

3530. By Kevin DuBois on 2016-07-28

port over suppression files that we after some recent hybris changes

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

FAILED: Continuous integration, rev:3529
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/ci-test/+merge/301373/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/45/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[lp:~kdub/mir/ci-test]

3531. By Kevin DuBois on 2016-07-28

bzr add the new file when porting

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

FAILED: Continuous integration, rev:3530
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/ci-test/+merge/301373/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/46/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:3531
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/ci-test/+merge/301373/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/47/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1638/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1691
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1682
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1682
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1682
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1653/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/1653/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1653/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

3531. By Kevin DuBois on 2016-07-28

bzr add the new file when porting

3530. By Kevin DuBois on 2016-07-28

port over suppression files that we after some recent hybris changes

3529. By Kevin DuBois on 2016-07-28

include fixes for mir CI (LP: #1584601)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-19 16:34:44 +0000
+++ CMakeLists.txt	2016-07-28 17:57:14 +0000
@@ -29,7 +29,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 23)
-set(MIR_VERSION_PATCH 4)
+set(MIR_VERSION_PATCH 5)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2016-03-23 06:39:56 +0000
+++ cmake/MirCommon.cmake	2016-07-28 17:57:14 +0000
@@ -29,6 +29,7 @@
     set(VALGRIND_CMD ${VALGRIND_CMD} "--num-callers=128")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
     set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.23")
+    set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_libhybris")
     if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
       set(VALGRIND_CMD ${VALGRIND_CMD} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
     endif()

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-19 17:49:47 +0000
+++ debian/changelog	2016-07-28 17:57:14 +0000
@@ -1,3 +1,16 @@
+mir (0.23.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.23.5 (https://launchpad.net/mir/+milestone/0.23.5)
+    - ABI summary:
+      . No ABI changes in any libraries.
+    - Enhancements:
+      . Enable new buffer semantics (NBS) by default.
+    - Bugs fixed:
+      . OSK flickers and buttons are sometimes invisble (LP: #1590765)
+      . Mir fails to build in: COMPOSITOR_TRACE_CALL (LP: #1584601)
+
+ -- Kevin DuBois <[e-mail]>  Wed, 27 Jul 2016 08:36:06 -0400
+
 mir (0.23.4+16.10.20160719.1-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release 0.23.4 (https://launchpad.net/mir/+milestone/0.23.4)

=== modified file 'src/client/buffer_vault.cpp'
--- src/client/buffer_vault.cpp	2016-06-02 13:03:43 +0000
+++ src/client/buffer_vault.cpp	2016-07-28 17:57:14 +0000
@@ -139,8 +139,26 @@
 mcl::NoTLSFuture<std::shared_ptr<mcl::Buffer>> mcl::BufferVault::withdraw()
 {
     std::unique_lock<std::mutex> lk(mutex);
+    std::vector<int> free_ids;
     if (disconnected_)
         BOOST_THROW_EXCEPTION(std::logic_error("server_disconnected"));
+
+    //clean up incorrectly sized buffers
+    for (auto it = buffers.begin(); it != buffers.end();)
+    {
+        auto buffer = checked_buffer_from_map(it->first);
+        if ((it->second == Owner::Self) && (buffer->size() != size)) 
+        {
+            current_buffer_count--;
+            free_ids.push_back(it->first);
+            it = buffers.erase(it);
+        }
+        else
+        {
+            it++;
+        }
+    } 
+
     mcl::NoTLSPromise<std::shared_ptr<mcl::Buffer>> promise;
     auto it = available_buffer();
     auto future = promise.get_future();
@@ -148,6 +166,7 @@
     {
         it->second = Owner::ContentProducer;
         promise.set_value(checked_buffer_from_map(it->first));
+        lk.unlock();
     }
     else
     {
@@ -162,6 +181,9 @@
         if (allocate_buffer)
             alloc_buffer(s, format, usage);
     }
+
+    for(auto& id : free_ids)
+        free_buffer(id);
     return future;
 }
 
@@ -284,30 +306,9 @@
     set_size(lk, new_size);
 }
 
-void mcl::BufferVault::set_size(std::unique_lock<std::mutex>& lk, geometry::Size new_size)
+void mcl::BufferVault::set_size(std::unique_lock<std::mutex> const&, geometry::Size new_size)
 {
-    if (new_size == size)
-        return;
-    std::vector<int> free_ids;
     size = new_size;
-    for (auto it = buffers.begin(); it != buffers.end();)
-    {
-        auto buffer = checked_buffer_from_map(it->first);
-        if ((it->second == Owner::Self) && (buffer->size() != size)) 
-        {
-            current_buffer_count--;
-            free_ids.push_back(it->first);
-            it = buffers.erase(it);
-        }
-        else
-        {
-            it++;
-        }
-    } 
-    lk.unlock();
-
-    for(auto& id : free_ids)
-        free_buffer(id);
 }
 
 void mcl::BufferVault::increase_buffer_count()

=== modified file 'src/client/buffer_vault.h'
--- src/client/buffer_vault.h	2016-06-02 13:03:43 +0000
+++ src/client/buffer_vault.h	2016-07-28 17:57:14 +0000
@@ -85,7 +85,7 @@
     void alloc_buffer(geometry::Size size, MirPixelFormat format, int usage);
     void free_buffer(int free_id);
     void realloc_buffer(int free_id, geometry::Size size, MirPixelFormat format, int usage);
-    void set_size(std::unique_lock<std::mutex>& lk, geometry::Size new_size);
+    void set_size(std::unique_lock<std::mutex>const& lk, geometry::Size new_size);
 
     std::shared_ptr<Buffer> checked_buffer_from_map(int id);
 

=== modified file 'src/client/lttng/CMakeLists.txt'
--- src/client/lttng/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ src/client/lttng/CMakeLists.txt	2016-07-28 17:57:14 +0000
@@ -15,6 +15,15 @@
 string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
 set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
 
+# lttng-ust uses urcu headers which contain code blocks inside expressions 
+# this is a gnu extension.
+string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
+if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
+else()
+    set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
+endif()
+
 add_library(mirclientlttng SHARED tracepoints.c)
 
 # Don't treat missing-field-initializers as an error, since

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2016-06-10 15:51:56 +0000
+++ src/platform/options/default_configuration.cpp	2016-07-28 17:57:14 +0000
@@ -172,7 +172,7 @@
             "How to handle the SharedLibraryProber report. [{log,lttng,off}]")
         (shell_report_opt, po::value<std::string>()->default_value(off_opt_value),
          "How to handle the Shell report. [{log,off}]")
-        (nbuffers_opt, po::value<int>()->default_value(3),
+        (nbuffers_opt, po::value<int>()->default_value(0),
             "Number of buffers per surface.")
         (composite_delay_opt, po::value<int>()->default_value(-1),
             "Compositor frame delay in milliseconds (how long to wait for new "

=== modified file 'src/server/report/lttng/CMakeLists.txt'
--- src/server/report/lttng/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ src/server/report/lttng/CMakeLists.txt	2016-07-28 17:57:14 +0000
@@ -14,6 +14,15 @@
 string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS})
 set(CMAKE_C_FLAGS ${NO_LTO_FLAGS})
 
+# lttng-ust uses urcu headers which contain code blocks inside expressions 
+# this is a gnu extension.
+string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS})
+if("${CMAKE_CXX_COMPILER}" MATCHES "clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-statement-expression")
+else()
+    set(CMAKE_CXX_FLAGS "${NO_PEDANTIC_CHECK_FLAGS}")
+endif()
+
 set(
   LTTNG_SOURCES
 

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2016-06-10 15:51:56 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2016-07-28 17:57:14 +0000
@@ -93,5 +93,5 @@
 
 if (MIR_RUN_ACCEPTANCE_TESTS)
   mir_discover_tests_with_fd_leak_detection(mir_acceptance_tests)
-  mir_discover_tests_with_fd_leak_detection_and_env(mir_acceptance_tests "MIR_SERVER_NBUFFERS=0")
+  mir_discover_tests_with_fd_leak_detection_and_env(mir_acceptance_tests "MIR_SERVER_NBUFFERS=3")
 endif (MIR_RUN_ACCEPTANCE_TESTS)

=== modified file 'tests/unit-tests/client/test_buffer_vault.cpp'
--- tests/unit-tests/client/test_buffer_vault.cpp	2016-06-02 13:03:43 +0000
+++ tests/unit-tests/client/test_buffer_vault.cpp	2016-07-28 17:57:14 +0000
@@ -348,9 +348,10 @@
     EXPECT_CALL(mock_requests, allocate_buffer(new_size,_,_));
 
     vault.wire_transfer_inbound(package.buffer_id());
+    Mock::VerifyAndClearExpectations(&mock_requests);
+
     vault.wire_transfer_inbound(package4.buffer_id());
     EXPECT_THAT(vault.withdraw().get()->size(), Eq(new_size));
-    Mock::VerifyAndClearExpectations(&mock_requests);
 }
 
 TEST_F(StartedBufferVault, withdraw_gives_only_newly_sized_buffers_after_resize)
@@ -363,20 +364,6 @@
     Mock::VerifyAndClearExpectations(&mock_requests);
 }
 
-TEST_F(StartedBufferVault, setting_size_frees_unneeded_buffers_right_away)
-{
-    EXPECT_CALL(mock_requests, free_buffer(_)).Times(3);
-    EXPECT_CALL(mock_requests, allocate_buffer(_,_,_)).Times(0);
-    auto const cycles = 30u;
-    geom::Size new_size(80, 100);
-    for(auto i = 0u; i < cycles; i++)
-    {
-        new_size = geom::Size(geom::Width(i), new_size.height);
-        vault.set_size(new_size);
-    }
-    Mock::VerifyAndClearExpectations(&mock_requests);
-}
-
 TEST_F(StartedBufferVault, scaling_resizes_buffers_right_away)
 {
     EXPECT_CALL(mock_requests, allocate_buffer(_,_,_))
@@ -584,10 +571,28 @@
     Mock::VerifyAndClearExpectations(&mock_requests);
 }
 
+//LP: #1590765 (more efficient allocations, and krillin/mali accommodation)
+TEST_F(StartedBufferVault, doesnt_free_buffer_until_a_newly_sized_buffer_is_called_for)
+{
+    auto i = 0u;
+    auto const num_resizes = 10u;
+    std::array<geom::Size, num_resizes> other_sizes;
+    std::generate(other_sizes.begin(), other_sizes.end(),
+        [&i, this] { return geom::Size{ size.width.as_int() + i, size.height.as_int() + i }; } );
+
+    EXPECT_CALL(mock_requests, free_buffer(_))
+        .Times(0);
+    for(auto const& size : other_sizes)
+        vault.set_size(size);
+    vault.set_size(size); //set back the original size
+
+    auto buffer_future = vault.withdraw();
+    EXPECT_THAT(buffer_future.get()->size(), Eq(size));
+    Mock::VerifyAndClearExpectations(&mock_requests);
+}
+
 TEST_F(StartedBufferVault, doesnt_free_buffers_in_the_driver_after_resize)
 {
-    EXPECT_CALL(mock_requests, free_buffer(_))
-        .Times(2);
     auto buffer = vault.withdraw().get();
     vault.set_size(new_size);
     Mock::VerifyAndClearExpectations(&mock_requests);
@@ -603,8 +608,6 @@
 
 TEST_F(StartedBufferVault, doesnt_free_buffers_with_content_after_resize)
 {
-    EXPECT_CALL(mock_requests, free_buffer(_))
-        .Times(2);
     auto buffer = vault.withdraw().get();
     vault.deposit(buffer);
     vault.set_size(new_size);

=== added file 'tools/valgrind_suppressions_libhybris'
--- tools/valgrind_suppressions_libhybris	1970-01-01 00:00:00 +0000
+++ tools/valgrind_suppressions_libhybris	2016-07-28 17:57:14 +0000
@@ -0,0 +1,10 @@
+{
+    hw_get_module
+    Memcheck:Leak
+    match-leak-kinds: definite
+    fun:malloc
+    obj:*
+    ...
+    fun:_ZN3mir7options20DefaultConfiguration20add_platform_optionsEv
+    ...
+}