Merge lp:~albaguirre/mir/fix-1522581 into lp:mir

[Alberto Aguirre]

Fix TSan build when using GCC

Fix TSan build when using GCC

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3168
http://jenkins.qa.ubuntu.com/job/mir-ci/5770/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5142
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/96/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5142
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7672
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25802
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/94/console

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Builds and works properly on xenial.

Note that TSAN catches some data races in our tests, so there is some work to be done before we reenable a CI job for this.

review: Approve

[Alexandros Frantzis (afrantzis)]

Actually, (some of) these comments seem to be out-of-date?

# TSan does not support multi-threaded fork
# TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
# TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood

review: Needs Information

[lp:~albaguirre/mir/fix-1522581]

3169. By Alberto Aguirre on 2015-12-04

Remove obsolete comments

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3169
http://jenkins.qa.ubuntu.com/job/mir-ci/5776/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5155
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/101/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5155
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7685
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25818
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/99/console

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Sounds good.

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Alexandros Frantzis (afrantzis)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-02 14:55:35 +0000
+++ CMakeLists.txt	2015-12-04 15:08:42 +0000
@@ -103,6 +103,9 @@
     # -fsanitize=thread is used, but doesn't.
     #
     # Linking everything with tsan is harmless and simple, so do that.
+    if (CMAKE_VERSION VERSION_GREATER 3.2.1)
+      cmake_policy(SET CMP0022 OLD)
+    endif()
     link_libraries(tsan)
   endif()
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=thread")

=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake	2015-09-09 18:37:28 +0000
+++ cmake/FindGtestGmock.cmake	2015-12-04 15:08:42 +0000
@@ -23,11 +23,18 @@
 set(GTEST_CXX_FLAGS "-fPIC")
 if (cmake_build_type_lower MATCHES "threadsanitizer")
   set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=thread")
+elseif (cmake_build_type_lower MATCHES "ubsanitizer")
+  set(GTEST_CXX_FLAGS "${GTEST_CXX_FLAGS} -fsanitize=undefined")
 endif()
 
 set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS}")
 list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 list(APPEND GTEST_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+if (cmake_build_type_lower MATCHES "threadsanitizer")
+  #Skip compiler check, since if GCC is the compiler, we need to link against -ltsan
+  #explicitly; specifying additional linker flags doesn't seem possible for external projects
+  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=1)
+endif()
 if (${CMAKE_CROSSCOMPILING})
   if(DEFINED MIR_NDK_PATH)
     list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-10-07 02:34:05 +0000
+++ cmake/MirCommon.cmake	2015-12-04 15:08:42 +0000
@@ -67,16 +67,14 @@
   endif()
 
   if(cmake_build_type_lower MATCHES "threadsanitizer")
-    find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
-    if (LLVM_SYMBOLIZER)
+    if (NOT CMAKE_COMPILER_IS_GNUCXX)
+      find_program(LLVM_SYMBOLIZER llvm-symbolizer-3.6)
+      if (LLVM_SYMBOLIZER)
         set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}")
+      endif()
     endif()
     # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing 
     list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 ${TSAN_EXTRA_OPTIONS} \"")
-    # TSan does not support multi-threaded fork
-    # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
-    # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
-    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted:BufferQueue/WithTwoOrMoreBuffers.client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.slow_client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.queue_size_scales_with_client_performance*")
   endif()
 
   if(SYSTEM_SUPPORTS_O_TMPFILE EQUAL 1)

=== modified file 'tools/tsan-suppressions'
--- tools/tsan-suppressions	2015-07-17 05:46:53 +0000
+++ tools/tsan-suppressions	2015-12-04 15:08:42 +0000
@@ -1,7 +1,4 @@
 race:libglib*
 race:libgio*
 race:testing::internal::FunctionMockerBase
-race:~posix_event
-race:boost::asio::detail::posix_event::signal_and_unlock
-#Suppress false positive when deleting main loop shared_ptr
-race:std::__shared_ptr<mir::MainLoop, (__gnu_cxx::_Lock_policy)2>::operator->()
+race:std::__future_base::_State_baseV2::wait()
\ No newline at end of file