Merge lp:mir/0.12 into lp:mir/ubuntu

[Alexandros Frantzis]

Release 0.12.1

Release 0.12.1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2304
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1717
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1716/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/29/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Good signs so far. The absence of "symbols.map" or "+++ include/" indicates no ABI breaks :)

[Alexandros Frantzis (afrantzis)]

The change to double buffering is causing some choppiness on krillin (e.g. when flicking apps scope in unity8-dash). Either unity8-dash or unity8 (less likely), is not rendering fast enough to support smooth double buffering. We will probably need to revert the change, but I would appreciate it if someone else also tried the packages too:

https://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/29/artifact/*zip*/archive.zip

[lp:mir/0.12]

2305. By Alberto Aguirre on 2015-03-23

Fix vivid build failure arising from upstream toolchain upgrades.
(LP: #1435127)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2305
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1766
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/30/console

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

review: Needs Fixing (continuous-integration)

[lp:mir/0.12]

2306. By Alexandros Frantzis on 2015-03-23

Revert commit 2297 'Always use double buffers instead of triple. (LP: #1240909)'

Various applications on the phone (notably the Apps scope) are not fast enough
to work smoothly with double buffering.

[Alexandros Frantzis (afrantzis)]

Daniel has verified my findings on the phone. I have reverted back to triple buffering.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2306
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1769
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1768/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/31/console

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

review: Needs Fixing (continuous-integration)

[lp:mir/0.12]

2307. By Alexandros Frantzis on 2015-03-24

Provide our own version of glibc 2.21 default valgrind suppressions and extra armhf suppressions (LP: #1435186)

Backported from lp:mir r2420

2308. By Alexandros Frantzis on 2015-03-24

Update changelog for 0.12.1 release

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2308
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1787/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1786/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-amd64-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-vivid-armhf-ci/32/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2015-02-02 12:18:18 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2015-03-24 12:55:40 +0000
@@ -1224,36 +1224,36 @@
                             "eventually add a new window when it finishes starting up.");
                     goto Unresponsive;
                 }
-
-                ALOGI("Dropping event because there is no touched window.");
-                injectionResult = INPUT_EVENT_INJECTION_FAILED;
-                goto Failed;
-            }
-        }
-
-        // Set target flags.
-        int32_t targetFlags = InputTarget::FLAG_FOREGROUND | InputTarget::FLAG_DISPATCH_AS_IS;
-        if (isSplit) {
-            targetFlags |= InputTarget::FLAG_SPLIT;
-        }
-        if (isWindowObscuredAtPointLocked(newTouchedWindowHandle, x, y)) {
-            targetFlags |= InputTarget::FLAG_WINDOW_IS_OBSCURED;
-        }
-
-        // Update hover state.
-        if (isHoverAction) {
-            newHoverWindowHandle = newTouchedWindowHandle;
-        } else if (maskedAction == AMOTION_EVENT_ACTION_SCROLL) {
-            newHoverWindowHandle = mLastHoverWindowHandle;
-        }
-
-        // Update the temporary touch state.
-        IntSet pointerIds;
-        if (isSplit) {
-            int32_t pointerId = entry->pointerProperties[pointerIndex].id;
-            pointerIds.insert(pointerId);
-        }
-        mTempTouchState.addOrUpdateWindow(newTouchedWindowHandle, targetFlags, pointerIds);
+            }
+        }
+
+        // We may still not have a window handle but we can't just abort the dispatch
+        // cycle because there could be hover exits to dispatch.
+        if (newTouchedWindowHandle != NULL) {
+            // Set target flags.
+            int32_t targetFlags = InputTarget::FLAG_FOREGROUND | InputTarget::FLAG_DISPATCH_AS_IS;
+            if (isSplit) {
+                targetFlags |= InputTarget::FLAG_SPLIT;
+            }
+            if (isWindowObscuredAtPointLocked(newTouchedWindowHandle, x, y)) {
+                targetFlags |= InputTarget::FLAG_WINDOW_IS_OBSCURED;
+            }
+
+            // Update hover state.
+            if (isHoverAction) {
+                newHoverWindowHandle = newTouchedWindowHandle;
+            } else if (maskedAction == AMOTION_EVENT_ACTION_SCROLL) {
+                newHoverWindowHandle = mLastHoverWindowHandle;
+            }
+            
+            // Update the temporary touch state.
+            IntSet pointerIds;
+            if (isSplit) {
+                int32_t pointerId = entry->pointerProperties[pointerIndex].id;
+                pointerIds.insert(pointerId);
+            }
+            mTempTouchState.addOrUpdateWindow(newTouchedWindowHandle, targetFlags, pointerIds);
+        }
     } else {
         /* Case 2: Pointer move, up, cancel or non-splittable pointer down. */
 
@@ -1277,6 +1277,9 @@
             sp<InputWindowHandle> oldTouchedWindowHandle =
                     mTempTouchState.getFirstForegroundWindowHandle();
             sp<InputWindowHandle> newTouchedWindowHandle = findTouchedWindowAtLocked(x, y);
+
+            newHoverWindowHandle = newTouchedWindowHandle;
+            
             if (oldTouchedWindowHandle != newTouchedWindowHandle
                     && newTouchedWindowHandle != NULL) {
 #if DEBUG_FOCUS
@@ -1339,7 +1342,9 @@
         bool haveForegroundWindow = false;
         for (size_t i = 0; i < mTempTouchState.windows.size(); i++) {
             const TouchedWindow& touchedWindow = mTempTouchState.windows[i];
-            if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) {
+            if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND ||
+                // We allow dispatching hover exit events to non foreground windows.
+                touchedWindow.targetFlags & InputTarget::FLAG_DISPATCH_AS_HOVER_EXIT) {
                 haveForegroundWindow = true;
                 if (! checkInjectionPermission(touchedWindow.windowHandle,
                         entry->injectionState)) {

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-01-21 07:34:50 +0000
+++ cmake/MirCommon.cmake	2015-03-24 12:55:40 +0000
@@ -30,8 +30,10 @@
   if(VALGRIND_EXECUTABLE)
     set(VALGRIND_ARGS "--error-exitcode=1" "--trace-children=yes" "--leak-check=full" "--show-leak-kinds=definite" "--errors-for-leak-kinds=definite")
     set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
+    set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
     set(DISCOVER_FLAGS "--enable-memcheck")
     set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_generic")
+    set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_glibc_2.21")
     if (TARGET_ARCH STREQUAL "arm-linux-gnueabihf")
         set(VALGRIND_ARGS ${VALGRIND_ARGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")
         set(DISCOVER_FLAGS ${DISCOVER_FLAGS} "--suppressions=${CMAKE_SOURCE_DIR}/tools/valgrind_suppressions_armhf")

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-28 10:30:53 +0000
+++ debian/changelog	2015-03-24 12:55:40 +0000
@@ -1,3 +1,25 @@
+mir (0.12.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.12.1 (https://launchpad.net/mir/+milestone/0.12.1)
+    - Bug fixes:
+      . [regression] mali, powervr locks up with around the introduction or
+        removal of a third overlay (LP: #1413211)
+      . USC - mouse cursor on AMD graphics is drawing incorrectly
+        (LP: #1417581)
+      . mir_demo_server doesn't emit hover_exit events (LP: #1418569)
+      . SessionMediator locks mutexes in one thread and unlocks them in
+        another (LP: #1427976)
+      . ProtobufResponder::send_response_result race (LP: #1428402)
+      . Some protobuf Closure objects can access dead objects (LP: #1433330)
+      . DisplayConfigurationOutput.physical_size_mm is undefined/zero
+        (LP: #1430315)
+      . vivid fails to build Mir as of 2015-03-22: error: #warning
+        "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+        [-Werror=cpp] (LP: #1435127)
+      . valgrind on armhf fails with with many errors (LP: #1435186)
+
+ -- Alexandros Frantzis <[e-mail]>  Tue, 24 Mar 2015 11:07:41 +0200
+
 mir (0.12.0+15.04.20150228-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-23 19:54:43 +0000
+++ src/CMakeLists.txt	2015-03-24 12:55:40 +0000
@@ -26,7 +26,7 @@
 set_property(TARGET wrapper
              APPEND_STRING PROPERTY COMPILE_FLAGS " -DEXECUTABLE_FORMAT=\\\".%s-uninstalled\\\"")
 set_property(TARGET wrapper
-             APPEND_STRING PROPERTY COMPILE_FLAGS " -D_BSD_SOURCE")
+             APPEND_STRING PROPERTY COMPILE_FLAGS " -D_DEFAULT_SOURCE -D_BSD_SOURCE")
 
 set(
   MIR_GENERATED_INCLUDE_DIRECTORIES

=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
--- src/platforms/android/server/hwc_blanking_control.cpp	2015-01-27 03:02:22 +0000
+++ src/platforms/android/server/hwc_blanking_control.cpp	2015-03-24 12:55:40 +0000
@@ -19,6 +19,7 @@
 #include "hwc_configuration.h"
 #include "hwc_wrapper.h"
 #include "android_format_conversion-inl.h"
+#include "mir/geometry/length.h"
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <boost/throw_exception.hpp>
@@ -26,6 +27,7 @@
 #include <chrono>
 
 namespace mga = mir::graphics::android;
+namespace geom = mir::geometry;
 
 namespace
 {
@@ -99,6 +101,17 @@
     }
 }
 
+namespace
+{
+int dpi_to_mm(uint32_t dpi, int pixel_num)
+{
+    if (dpi == 0) return 0;
+    float dpi_inches = dpi / 1000.0f; //android multiplies by 1000
+    geom::Length length(pixel_num / dpi_inches, geom::Length::Units::inches);
+    return length.as(geom::Length::Units::millimetres);
+}
+}
+
 mga::DisplayAttribs mga::HwcBlankingControl::active_attribs_for(DisplayName display_name)
 {
     auto configs = hwc_device->display_configs(display_name);
@@ -127,7 +140,7 @@
     hwc_device->display_attributes(display_name, configs.front(), attributes, values);
     return {
         {values[0], values[1]},
-        {0, 0}, //TODO: convert DPI to MM and return
+        {dpi_to_mm(values[3], values[0]), dpi_to_mm(values[4], values[1])},
         period_to_hz(std::chrono::nanoseconds{values[2]}),
         true,
         format,

=== modified file 'src/platforms/mesa/server/cursor.cpp'
--- src/platforms/mesa/server/cursor.cpp	2015-01-22 09:00:14 +0000
+++ src/platforms/mesa/server/cursor.cpp	2015-03-24 12:55:40 +0000
@@ -24,6 +24,9 @@
 #include "mir/geometry/rectangle.h"
 #include "mir/graphics/cursor_image.h"
 
+#include <xf86drm.h>
+#include <drm/drm.h>
+
 #include <boost/exception/errinfo_errno.hpp>
 
 #include <stdexcept>
@@ -35,7 +38,7 @@
 
 namespace
 {
-const uint64_t requested_cursor_size = 64;
+const uint64_t fallback_cursor_size = 64;
 
 // Transforms a relative position within the display bounds described by \a rect which is rotated with \a orientation
 geom::Displacement transform(geom::Rectangle const& rect, geom::Displacement const& vector, MirOrientation orientation)
@@ -53,13 +56,38 @@
         return vector;
     }
 }
+// support for older drm headers
+#ifndef DRM_CAP_CURSOR_WIDTH
+#define DRM_CAP_CURSOR_WIDTH            0x8
+#define DRM_CAP_CURSOR_HEIGHT           0x9
+#endif
+
+// In certain combinations of DRI backends and drivers GBM
+// returns a stride size that matches the requested buffers size,
+// instead of the underlying buffer:
+// https://bugs.freedesktop.org/show_bug.cgi?id=89164
+int get_drm_cursor_height(int fd)
+{
+   uint64_t height;
+   if (drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height) < 0)
+       height = fallback_cursor_size;
+   return int(height);
+}
+
+int get_drm_cursor_width(int fd)
+{
+   uint64_t width;
+   if (drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width) < 0)
+       width = fallback_cursor_size;
+   return int(width);
+}
 }
 
 mgm::Cursor::GBMBOWrapper::GBMBOWrapper(gbm_device* gbm) :
     buffer(gbm_bo_create(
                 gbm,
-                requested_cursor_size,
-                requested_cursor_size,
+                get_drm_cursor_width(gbm_device_get_fd(gbm)),
+                get_drm_cursor_height(gbm_device_get_fd(gbm)),
                 GBM_FORMAT_ARGB8888,
                 GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE))
 {

=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
--- src/server/frontend/protobuf_message_processor.cpp	2015-01-27 03:02:22 +0000
+++ src/server/frontend/protobuf_message_processor.cpp	2015-03-24 12:55:40 +0000
@@ -74,9 +74,35 @@
     return request;
 }
 
+class SelfDeletingCallback : public google::protobuf::Closure
+{
+public:
+    SelfDeletingCallback(std::function<void()> const& callback)
+    : callback(callback)
+    {
+    }
+
+    void Run() override
+    {
+        struct Deleter
+        {
+          ~Deleter() { delete obj; }
+          SelfDeletingCallback* obj;
+        };
+        Deleter deleter{this};
+        callback();
+    }
+
+ private:
+  ~SelfDeletingCallback() = default;
+  SelfDeletingCallback(SelfDeletingCallback&) = delete;
+  void operator=(const SelfDeletingCallback&) = delete;
+  std::function<void()> callback;
+};
+
 template<typename RequestType, typename ResponseType>
 void invoke(
-    ProtobufMessageProcessor* self,
+    std::shared_ptr<ProtobufMessageProcessor> const& mp,
     DisplayServer* server,
     void (mir::protobuf::DisplayServer::*function)(
         ::google::protobuf::RpcController* controller,
@@ -88,15 +114,17 @@
 {
     auto const result_message = std::make_shared<ResponseType>();
 
-    auto const callback =
-        google::protobuf::NewCallback<
-            ProtobufMessageProcessor,
-            ::google::protobuf::uint32,
-             std::shared_ptr<ResponseType>>(
-                self,
-                &ProtobufMessageProcessor::send_response,
-                invocation_id,
-                result_message);
+    std::weak_ptr<ProtobufMessageProcessor> weak_mp = mp;
+    auto const response_callback = [weak_mp, invocation_id, result_message]
+    {
+        auto message_processor = weak_mp.lock();
+        if (message_processor)
+        {
+            message_processor->send_response(invocation_id, result_message);
+        }
+    };
+
+    auto callback = new SelfDeletingCallback{response_callback};
 
     try
     {
@@ -108,9 +136,8 @@
     }
     catch (std::exception const& x)
     {
-        delete callback;
         result_message->set_error(boost::diagnostic_information(x));
-        self->send_response(invocation_id, result_message);
+        callback->Run();
     }
 }
 
@@ -179,7 +206,7 @@
         else if ("next_buffer" == invocation.method_name())
         {
             auto request = parse_parameter<mir::protobuf::SurfaceId>(invocation);
-            invoke(this, display_server.get(), &DisplayServer::next_buffer, invocation.id(), &request);
+            invoke(shared_from_this(), display_server.get(), &DisplayServer::next_buffer, invocation.id(), &request);
         }
         else if ("exchange_buffer" == invocation.method_name())
         {
@@ -187,7 +214,7 @@
             request.mutable_buffer()->clear_fd();
             for (auto& fd : side_channel_fds)
                 request.mutable_buffer()->add_fd(fd);
-            invoke(this, display_server.get(), &DisplayServer::exchange_buffer, invocation.id(), &request);
+            invoke(shared_from_this(), display_server.get(), &DisplayServer::exchange_buffer, invocation.id(), &request);
         }
         else if ("release_surface" == invocation.method_name())
         {
@@ -205,7 +232,7 @@
             for (auto& fd : side_channel_fds)
                 request.add_fd(fd);
 
-            invoke(this, display_server.get(), &DisplayServer::platform_operation,
+            invoke(shared_from_this(), display_server.get(), &DisplayServer::platform_operation,
                    invocation.id(), &request);
         }
         else if ("configure_display" == invocation.method_name())

=== modified file 'src/server/frontend/protobuf_message_processor.h'
--- src/server/frontend/protobuf_message_processor.h	2015-01-21 07:34:50 +0000
+++ src/server/frontend/protobuf_message_processor.h	2015-03-24 12:55:40 +0000
@@ -37,7 +37,8 @@
 class DisplayServer;
 class ProtobufMessageSender;
 
-class ProtobufMessageProcessor : public MessageProcessor
+class ProtobufMessageProcessor : public MessageProcessor,
+                                 public std::enable_shared_from_this<ProtobufMessageProcessor>
 {
 public:
     ProtobufMessageProcessor(

=== modified file 'src/server/frontend/protobuf_responder.cpp'
--- src/server/frontend/protobuf_responder.cpp	2015-01-21 07:34:50 +0000
+++ src/server/frontend/protobuf_responder.cpp	2015-03-24 12:55:40 +0000
@@ -43,11 +43,15 @@
 
     response->SerializeWithCachedSizesToArray(send_response_buffer.data());
 
-    send_response_result.set_id(id);
-    send_response_result.set_response(send_response_buffer.data(), send_response_buffer.size());
-
-    send_response_buffer.resize(send_response_result.ByteSize());
-    send_response_result.SerializeWithCachedSizesToArray(send_response_buffer.data());
+    {
+        std::lock_guard<decltype(result_guard)> lock{result_guard};
+
+        send_response_result.set_id(id);
+        send_response_result.set_response(send_response_buffer.data(), send_response_buffer.size());
+
+        send_response_buffer.resize(send_response_result.ByteSize());
+        send_response_result.SerializeWithCachedSizesToArray(send_response_buffer.data());
+    }
 
     sender->send(reinterpret_cast<char*>(send_response_buffer.data()), send_response_buffer.size(), fd_sets);
     resource_cache->free_resource(response);

=== modified file 'src/server/frontend/protobuf_responder.h'
--- src/server/frontend/protobuf_responder.h	2015-01-21 07:34:50 +0000
+++ src/server/frontend/protobuf_responder.h	2015-03-24 12:55:40 +0000
@@ -23,6 +23,7 @@
 #include "mir_protobuf_wire.pb.h"
 
 #include <memory>
+#include <mutex>
 
 namespace mir
 {
@@ -50,6 +51,7 @@
     std::shared_ptr<MessageSender> const sender;
     std::shared_ptr<ResourceCache> const resource_cache;
 
+    std::mutex result_guard;
     mir::protobuf::wire::Result send_response_result;
 };
 }

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2015-02-02 12:18:18 +0000
+++ src/server/frontend/session_mediator.cpp	2015-03-24 12:55:40 +0000
@@ -60,6 +60,7 @@
 #include <boost/throw_exception.hpp>
 
 #include <mutex>
+#include <thread>
 #include <functional>
 
 namespace ms = mir::scene;
@@ -150,17 +151,27 @@
 void mf::SessionMediator::advance_buffer(
     SurfaceId surf_id,
     Surface& surface,
+    graphics::Buffer* old_buffer,
+    std::unique_lock<std::mutex>& lock,
     std::function<void(graphics::Buffer*, graphics::BufferIpcMsgType)> complete)
 {
-    auto client_buffer = surface_tracker.last_buffer(surf_id);
+    auto const tid = std::this_thread::get_id();
+
     surface.swap_buffers(
-        client_buffer, 
-        [this, surf_id, complete](mg::Buffer* new_buffer)
+        old_buffer,
+        // Note: We assume that the lambda will be executed within swap_buffers
+        // (in which case the lock reference is valid) or in a different thread
+        // altogether (in which case the dangling reference is not accessed)
+        [this, tid, &lock, surf_id, complete](mg::Buffer* new_buffer)
         {
+            if (tid == std::this_thread::get_id())
+                lock.unlock();
+
             if (surface_tracker.track_buffer(surf_id, new_buffer))
                 complete(new_buffer, mg::BufferIpcMsgType::update_msg);
             else
                 complete(new_buffer, mg::BufferIpcMsgType::full_msg);
+
         });
 }
 
@@ -171,7 +182,7 @@
     google::protobuf::Closure* done)
 {
 
-    auto const lock = std::make_shared<std::unique_lock<std::mutex>>(session_mutex);
+    std::unique_lock<std::mutex> lock{session_mutex};
 
     auto const session = weak_session.lock();
 
@@ -241,12 +252,10 @@
         setting->set_ivalue(shell->get_surface_attribute(session, surf_id, static_cast<MirSurfaceAttrib>(i)));
     }
 
-    advance_buffer(surf_id, *surface,
-        [lock, this, &surf_id, response, done, session]
+    advance_buffer(surf_id, *surface, surface_tracker.last_buffer(surf_id), lock,
+        [this, surf_id, response, done, session]
         (graphics::Buffer* client_buffer, graphics::BufferIpcMsgType msg_type)
         {
-            lock->unlock();
-
             response->mutable_buffer_stream()->mutable_id()->set_value(
                surf_id.as_value());
             pack_protobuf_buffer(*response->mutable_buffer_stream()->mutable_buffer(),
@@ -270,7 +279,7 @@
 {
     SurfaceId const surf_id{request->value()};
 
-    auto const lock = std::make_shared<std::unique_lock<std::mutex>>(session_mutex);
+    std::unique_lock<std::mutex> lock{session_mutex};
 
     auto const session = weak_session.lock();
 
@@ -280,15 +289,11 @@
     report->session_next_buffer_called(session->name());
 
     auto surface = session->get_surface(surf_id);
-
-    advance_buffer(surf_id, *surface,
-        [lock, this, response, done, session]
+    advance_buffer(surf_id, *surface, surface_tracker.last_buffer(surf_id), lock,
+        [this, response, done]
         (graphics::Buffer* client_buffer, graphics::BufferIpcMsgType msg_type)
         {
-            lock->unlock();
-
             pack_protobuf_buffer(*response, client_buffer, msg_type);
-
             done->Run();
         });
 }
@@ -305,7 +310,7 @@
     mfd::ProtobufBufferPacker request_msg{const_cast<mir::protobuf::Buffer*>(&request->buffer())};
     ipc_operations->unpack_buffer(request_msg, *surface_tracker.last_buffer(surface_id));
 
-    auto const lock = std::make_shared<std::unique_lock<std::mutex>>(session_mutex);
+    std::unique_lock<std::mutex> lock{session_mutex};
     auto const session = weak_session.lock();
     if (!session)
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
@@ -313,17 +318,11 @@
     report->session_exchange_buffer_called(session->name());
 
     auto const& surface = session->get_surface(surface_id);
-    surface->swap_buffers(
-        surface_tracker.buffer_from(buffer_id),
-        [this, surface_id, lock, response, done](mg::Buffer* new_buffer)
+    advance_buffer(surface_id, *surface, surface_tracker.buffer_from(buffer_id), lock,
+        [this, response, done]
+        (graphics::Buffer* new_buffer, graphics::BufferIpcMsgType msg_type)
         {
-            lock->unlock();
-
-            if (surface_tracker.track_buffer(surface_id, new_buffer))
-                pack_protobuf_buffer(*response, new_buffer, mg::BufferIpcMsgType::update_msg);
-            else
-                pack_protobuf_buffer(*response, new_buffer, mg::BufferIpcMsgType::full_msg);
-
+            pack_protobuf_buffer(*response, new_buffer, msg_type);
             done->Run();
         });
 }

=== modified file 'src/server/frontend/session_mediator.h'
--- src/server/frontend/session_mediator.h	2015-01-21 07:34:50 +0000
+++ src/server/frontend/session_mediator.h	2015-03-24 12:55:40 +0000
@@ -192,6 +192,8 @@
     void advance_buffer(
         SurfaceId surf_id,
         Surface& surface,
+        graphics::Buffer* old_buffer,
+        std::unique_lock<std::mutex>& lock,
         std::function<void(graphics::Buffer*, graphics::BufferIpcMsgType)> complete);
 
     virtual std::function<void(std::shared_ptr<Session> const&)> prompt_session_connect_handler() const;

=== modified file 'src/server/frontend/surface_tracker.cpp'
--- src/server/frontend/surface_tracker.cpp	2015-01-21 07:34:50 +0000
+++ src/server/frontend/surface_tracker.cpp	2015-03-24 12:55:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -17,8 +17,11 @@
  */
 
 #include "surface_tracker.h"
+#include "client_buffer_tracker.h"
+
 #include "mir/graphics/buffer.h"
 #include "mir/graphics/buffer_id.h"
+
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
@@ -32,6 +35,7 @@
 
 bool mf::SurfaceTracker::track_buffer(SurfaceId surface_id, mg::Buffer* buffer)
 {
+    std::lock_guard<decltype(mutex)> lock{mutex};
     auto& tracker = client_buffer_tracker[surface_id];
     if (!tracker)
         tracker = std::make_shared<ClientBufferTracker>(client_cache_size);
@@ -53,6 +57,7 @@
 
 void mf::SurfaceTracker::remove_surface(SurfaceId surface_id)
 {
+    std::lock_guard<decltype(mutex)> lock{mutex};
     auto it = client_buffer_tracker.find(surface_id);
     if (it != client_buffer_tracker.end())
         client_buffer_tracker.erase(it);
@@ -64,6 +69,7 @@
 
 mg::Buffer* mf::SurfaceTracker::last_buffer(SurfaceId surface_id) const
 {
+    std::lock_guard<decltype(mutex)> lock{mutex};
     auto it = client_buffer_resource.find(surface_id);
     if (it != client_buffer_resource.end())
         return it->second;
@@ -74,6 +80,7 @@
 
 mg::Buffer* mf::SurfaceTracker::buffer_from(mg::BufferID buffer_id) const
 {
+    std::lock_guard<decltype(mutex)> lock{mutex};
     for (auto const& tracker : client_buffer_tracker)
     {
         auto buffer = tracker.second->buffer_from(buffer_id);

=== modified file 'src/server/frontend/surface_tracker.h'
--- src/server/frontend/surface_tracker.h	2015-01-21 07:34:50 +0000
+++ src/server/frontend/surface_tracker.h	2015-03-24 12:55:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -20,10 +20,12 @@
 #define MIR_FRONTEND_SURFACE_TRACKER_H_
 
 #include "mir/frontend/surface_id.h"
-#include "client_buffer_tracker.h"
+#include "mir/graphics/buffer_id.h"
+
 #include <unordered_map>
 #include <tuple>
 #include <memory>
+#include <mutex>
 
 namespace mir
 {
@@ -33,7 +35,7 @@
 }
 namespace frontend
 {
-
+class ClientBufferTracker;
 class SurfaceTracker
 {
 public:
@@ -65,6 +67,7 @@
     /* accesses the last buffer given to track_buffer() for the given SurfaceId */
     graphics::Buffer* last_buffer(SurfaceId) const;
 private:
+    mutable std::mutex mutex;
     std::unordered_map<SurfaceId, graphics::Buffer*> client_buffer_resource;
 };
 

=== modified file 'src/server/graphics/software_cursor.cpp'
--- src/server/graphics/software_cursor.cpp	2015-01-21 09:03:53 +0000
+++ src/server/graphics/software_cursor.cpp	2015-03-24 12:55:40 +0000
@@ -127,8 +127,11 @@
     // Do a lock dance to make this function threadsafe,
     // while avoiding calling scene methods under lock
     {
+        geom::Point position{0,0};
         std::lock_guard<std::mutex> lg{guard};
-        new_renderable = create_renderable_for(cursor_image);
+        if (renderable)
+            position = renderable->screen_position().top_left;
+        new_renderable = create_renderable_for(cursor_image, position);
     }
 
     // Add the new renderable first, then remove the old one to avoid
@@ -148,26 +151,11 @@
 }
 
 std::shared_ptr<mg::detail::CursorRenderable>
-mg::SoftwareCursor::create_renderable_for(CursorImage const& cursor_image)
+mg::SoftwareCursor::create_renderable_for(CursorImage const& cursor_image, geom::Point position)
 {
-    std::shared_ptr<detail::CursorRenderable> new_renderable;
-
-    // Reuse buffer if possible, to minimize buffer reallocations
-    if (renderable && renderable->buffer()->size() == cursor_image.size())
-    {
-        new_renderable = std::make_shared<detail::CursorRenderable>(
-            renderable->buffer(),
-            renderable->screen_position().top_left + hotspot -
-                cursor_image.hotspot());
-    }
-    else
-    {
-        auto const buffer = allocator->alloc_buffer(
-            {cursor_image.size(), format, mg::BufferUsage::software});
-        new_renderable = std::make_shared<detail::CursorRenderable>(
-            buffer,
-            geom::Point{0,0} - cursor_image.hotspot());
-    }
+    auto new_renderable = std::make_shared<detail::CursorRenderable>(
+        allocator->alloc_buffer({cursor_image.size(), format, mg::BufferUsage::software}),
+        position + hotspot - cursor_image.hotspot());
 
     size_t const pixels_size =
         cursor_image.size().width.as_uint32_t() *

=== modified file 'src/server/graphics/software_cursor.h'
--- src/server/graphics/software_cursor.h	2015-01-13 13:23:21 +0000
+++ src/server/graphics/software_cursor.h	2015-03-24 12:55:40 +0000
@@ -51,7 +51,7 @@
 
 private:
     std::shared_ptr<detail::CursorRenderable> create_renderable_for(
-        CursorImage const& cursor_image);
+        CursorImage const& cursor_image, geometry::Point position);
 
     std::shared_ptr<GraphicBufferAllocator> const allocator;
     std::shared_ptr<input::Scene> const scene;

=== modified file 'tests/acceptance-tests/throwback/test_client_input.cpp'
--- tests/acceptance-tests/throwback/test_client_input.cpp	2015-02-02 12:18:18 +0000
+++ tests/acceptance-tests/throwback/test_client_input.cpp	2015-03-24 12:55:40 +0000
@@ -270,7 +270,7 @@
         mis::a_key_down_event().of_scancode(KEY_4));
 }
 
-TEST_F(TestClientInput, clients_receive_pointer_inside_window)
+TEST_F(TestClientInput, clients_receive_pointer_inside_window_and_crossing_events)
 {
     using namespace testing;
 
@@ -284,7 +284,8 @@
                 handle_input(
                     mt::PointerEventWithPosition(
                         InputClient::surface_width - 1,
-                        InputClient::surface_height - 1)))
+                        InputClient::surface_height - 1)));
+    EXPECT_CALL(client.handler, handle_input(mt::PointerLeaveEvent()))
         .WillOnce(mt::WakeUp(&client.all_events_received));
     // But we should not receive an event for the second movement outside of our surface!
 

=== modified file 'tests/unit-tests/frontend/test_protobuf_message_processor.cpp'
--- tests/unit-tests/frontend/test_protobuf_message_processor.cpp	2015-01-29 04:34:12 +0000
+++ tests/unit-tests/frontend/test_protobuf_message_processor.cpp	2015-03-24 12:55:40 +0000
@@ -87,6 +87,7 @@
         mt::fake_shared(stub_msg_sender),
         mt::fake_shared(stub_display_server),
         mt::fake_shared(stub_report));
+    std::shared_ptr<mfd::MessageProcessor> mp = mt::fake_shared(pb_message_processor);
 
     mpw::Invocation raw_invocation;
     mp::BufferRequest buffer_request;
@@ -97,7 +98,6 @@
     mfd::Invocation invocation(raw_invocation);
 
     std::vector<mir::Fd> fds;
-    mfd::MessageProcessor* mp = &pb_message_processor;
     mp->dispatch(invocation, fds);
 
     ASSERT_THAT(stub_display_server.exchange_buffer_response, testing::Ne(nullptr));

=== modified file 'tests/unit-tests/graphics/android/test_hwc_configuration.cpp'
--- tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-01-22 09:00:14 +0000
+++ tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-03-24 12:55:40 +0000
@@ -128,7 +128,10 @@
 TEST_F(HwcConfiguration, queries_connected_primary_display_properties)
 {
     using namespace testing;
-    geom::Size px_size {343, 254};
+    auto android_reported_dpi_x = 390000u;
+    auto android_reported_dpi_y = 400000u;
+    geom::Size px_size {768, 1280};
+    geom::Size mm_size {50, 81};
 
     std::vector<mga::ConfigId> hwc_config {mga::ConfigId{0xA1}, mga::ConfigId{0xBEE}};
     std::chrono::milliseconds vrefresh_period {16};
@@ -153,6 +156,12 @@
                         case HWC_DISPLAY_VSYNC_PERIOD:
                             values[i] = std::chrono::duration_cast<std::chrono::nanoseconds>(vrefresh_period).count();
                             break;
+                        case HWC_DISPLAY_DPI_X:
+                            values[i] = android_reported_dpi_x;
+                            break;
+                        case HWC_DISPLAY_DPI_Y:
+                            values[i] = android_reported_dpi_y;
+                            break;
                         default:
                             break;
                     }
@@ -165,6 +174,7 @@
     auto vrefresh_hz = 1000.0 / vrefresh_period.count();
     auto attribs = config.active_attribs_for(display);
     EXPECT_THAT(attribs.pixel_size, Eq(px_size));
+    EXPECT_THAT(attribs.mm_size, Eq(mm_size));
     EXPECT_THAT(attribs.vrefresh_hz, Eq(vrefresh_hz));
     EXPECT_TRUE(attribs.connected);
 }
@@ -188,24 +198,29 @@
 TEST_F(HwcConfiguration, no_fpe_from_malformed_refresh)
 {
     using namespace testing;
-    EXPECT_CALL(*mock_hwc_wrapper, display_attributes( _, _, _, _))
+    EXPECT_CALL(*mock_hwc_wrapper, display_attributes(_,_,_,_))
             .WillOnce(Invoke([]
             (mga::DisplayName, mga::ConfigId, uint32_t const* attribute_list, int32_t* values)
             {
                 int i = 0;
                 while(attribute_list[i] != HWC_DISPLAY_NO_ATTRIBUTE)
-                {
-                    switch(attribute_list[i])
-                    {
-                        case HWC_DISPLAY_VSYNC_PERIOD:
-                            values[i] = 0;
-                            break;
-                        default:
-                            break;
-                    }
-                    i++;
-                }
+                    values[i++] = 0;
             }));
     auto attribs = config.active_attribs_for(mga::DisplayName::external);
     EXPECT_THAT(attribs.vrefresh_hz, Eq(0.0f));
 }
+
+TEST_F(HwcConfiguration, no_fpe_from_malformed_dpi)
+{
+    using namespace testing;
+    EXPECT_CALL(*mock_hwc_wrapper, display_attributes(_,_,_,_))
+            .WillOnce(Invoke([]
+            (mga::DisplayName, mga::ConfigId, uint32_t const* attribute_list, int32_t* values)
+            {
+                int i = 0;
+                while(attribute_list[i] != HWC_DISPLAY_NO_ATTRIBUTE)
+                    values[i++] = 0;
+            }));
+    auto attribs = config.active_attribs_for(mga::DisplayName::external);
+    EXPECT_THAT(attribs.mm_size, Eq(geom::Size{0,0}));
+}

=== modified file 'tests/unit-tests/graphics/test_software_cursor.cpp'
--- tests/unit-tests/graphics/test_software_cursor.cpp	2015-01-13 13:23:21 +0000
+++ tests/unit-tests/graphics/test_software_cursor.cpp	2015-03-24 12:55:40 +0000
@@ -274,3 +274,23 @@
 
     cursor.show(another_stub_cursor_image);
 }
+
+//lp: #1413211
+TEST_F(SoftwareCursor, new_buffer_on_each_show)
+{
+    struct MockBufferAllocator : public mg::GraphicBufferAllocator
+    {
+        MOCK_METHOD1(alloc_buffer, std::shared_ptr<mg::Buffer>(mg::BufferProperties const&));
+        std::vector<MirPixelFormat> supported_pixel_formats() { return {mir_pixel_format_abgr_8888}; } 
+    } mock_allocator;
+
+    EXPECT_CALL(mock_allocator, alloc_buffer(testing::_))
+        .Times(3)
+        .WillRepeatedly(testing::Return(std::make_shared<mtd::StubBuffer>()));;
+    mg::SoftwareCursor cursor{
+        mt::fake_shared(mock_allocator),
+        mt::fake_shared(mock_input_scene)};
+    cursor.show(another_stub_cursor_image);
+    cursor.show(another_stub_cursor_image);
+    cursor.show(stub_cursor_image);
+}

=== modified file 'tests/unit-tests/test_fatal.cpp'
--- tests/unit-tests/test_fatal.cpp	2015-01-21 07:34:50 +0000
+++ tests/unit-tests/test_fatal.cpp	2015-03-24 12:55:40 +0000
@@ -24,7 +24,7 @@
 
 using namespace testing;
 
-TEST(FatalTest, abort_formats_message_to_stderr)
+TEST(FatalErrorDeathTest, abort_formats_message_to_stderr)
 {
     mir::FatalErrorStrategy on_error{mir::fatal_error_abort};
 
@@ -32,7 +32,7 @@
                  "Mary had 1 little lamb");
 }
 
-TEST(FatalTest, abort_raises_sigabrt)
+TEST(FatalErrorDeathTest, abort_raises_sigabrt)
 {
     mir::FatalErrorStrategy on_error{mir::fatal_error_abort};
 
@@ -41,7 +41,7 @@
                 "Hello world");
 }
 
-TEST(FatalTest, throw_formats_message_to_what)
+TEST(FatalErrorTest, throw_formats_message_to_what)
 {
     EXPECT_THROW(
         mir::fatal_error("%s had %d %s %s", "Mary", 1, "little", "lamb"),

=== modified file 'tools/valgrind_suppressions_armhf'
--- tools/valgrind_suppressions_armhf	2015-01-27 03:02:22 +0000
+++ tools/valgrind_suppressions_armhf	2015-03-24 12:55:40 +0000
@@ -60,6 +60,33 @@
     ...
 }
 
+{
+   libc_udivmoddi4_cond
+   Memcheck:Cond
+   fun:__udivmoddi4
+}
+
+{
+   libc_udivmoddi4_value4
+   Memcheck:Value4
+   fun:__udivmoddi4
+}
+
+# It's unfortunate that we need these, since they will
+# suppress errors Addr4 and Value4 from libc regardless
+# of call depth
+{
+   libc_addr4
+   Memcheck:Addr4
+   obj:/lib/arm-linux-gnueabihf/libc-2.*.so
+}
+
+{
+   libc_value4
+   Memcheck:Value4
+   obj:/lib/arm-linux-gnueabihf/libc-2.*.so
+}
+
 # libgcc_s
 
 {

=== added file 'tools/valgrind_suppressions_glibc_2.21'
--- tools/valgrind_suppressions_glibc_2.21	1970-01-01 00:00:00 +0000
+++ tools/valgrind_suppressions_glibc_2.21	2015-03-24 12:55:40 +0000
@@ -0,0 +1,1404 @@
+# This is a generated file, composed of the following suppression rules:
+#  exp-sgcheck.supp xfree-3.supp xfree-4.supp glibc-2.X-drd.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.X.supp
+{
+   ld-2.X possibly applying relocations
+   exp-sgcheck:SorG
+   obj:*/*lib*/ld-2.*so*
+   obj:*/*lib*/ld-2.*so*
+}
+
+# I'm pretty sure this is a false positive caused by the sg_ stuff
+{
+   glibc realpath false positive
+   exp-sgcheck:SorG
+   fun:realpath
+   fun:*
+}
+
+{
+   I think this is glibc's ultra optimised getenv doing 2 byte reads
+   exp-sgcheck:SorG
+   fun:getenv
+}
+
+##----------------------------------------------------------------------##
+
+# Errors to suppress by default with XFree86 3.3.6)
+
+# Format of this file is:
+# {
+#     name_of_suppression
+#     tool_name:supp_kind
+#     (optional extra info for some suppression types)
+#     caller0 name, or /name/of/so/file.so
+#     caller1 name, or ditto
+#     (optionally: caller2 name)
+#     (optionally: caller3 name)
+#  }
+#
+# For Memcheck, the supp_kinds are:
+#
+#     Param Value1 Value2 Value4 Value8 Value16 Jump
+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
+#     Cond (previously known as Value0)
+#
+# and the optional extra info is:
+#     if Param: name of system call param
+
+##----------------------------------------------------------------------##
+
+{
+   X11-Cond-0
+   Memcheck:Cond
+   obj:*libXt.so.6.0
+   obj:*libXt.so.6.0
+   obj:*libXt.so.6.0
+}
+{
+   X11-Cond-1
+   Memcheck:Cond
+   fun:__rawmemchr
+   obj:*libXt.so.6.0
+   obj:*libXt.so.6.0
+}
+
+
+# Suppressions for XFree86-3.3.X
+
+{
+   X11-Addr4-1
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libX11.so.6.1
+}
+
+{
+   X11-Addr4-2
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-3
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-4
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-5
+   Memcheck:Addr4
+   fun:__rawmemchr
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-6
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXmu.so.6.0
+   obj:/usr/X11R6/lib/libXmu.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-7
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
+}
+
+{
+   X11-Param-1
+   Memcheck:Param
+   write(buf)
+   fun:__libc_write
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libX11.so.6.1
+}
+
+{
+   X11-Addr4-8
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libX11.so.6.1
+   obj:/usr/X11R6/lib/libXpm.so.4.11
+   obj:/usr/X11R6/lib/libXpm.so.4.11
+}
+
+{
+   X11-Addr4-8
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-9
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXaw.so.6.1
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-10
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXaw.so.6.1
+   obj:/usr/X11R6/lib/libXaw.so.6.1
+   obj:/usr/X11R6/lib/libXt.so.6.0
+}
+
+{
+   X11-Addr4-11
+   Memcheck:Addr4
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXt.so.6.0
+   obj:/usr/X11R6/lib/libXaw.so.6.1
+}
+
+
+
+##----------------------------------------------------------------------##
+
+##----------------------------------------------------------------------##
+
+# Errors to suppress by default with XFree86 4.1.0)
+
+# *** And a bunch of other stuff which is completely unrelated
+# to X.  The default suppressions are a bit of a mess and could do
+# with a good tidying up.
+
+# Format of this file is:
+# {
+#     name_of_suppression
+#     tool_name:supp_kind
+#     (optional extra info for some suppression types)
+#     caller0 name, or /name/of/so/file.so
+#     caller1 name, or ditto
+#     (optionally: caller2 name)
+#     (optionally: caller3 name)
+#  }
+#
+# For Memcheck, the supp_kinds are:
+#
+#     Param Value1 Value2 Value4 Value8 Value16 Jump
+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
+#     Cond (previously known as Value0)
+#
+# and the optional extra info is:
+#     if Param: name of system call param
+
+# Resulting from R H 8.0
+{
+   *libc_write/libX11.so.6.2/*X11TransWrite(Param)
+   Memcheck:Param
+   write(buf)
+   fun:*libc_write
+   obj:/usr/*lib*/libX11.so*
+   fun:*X11TransWrite
+}
+
+{
+   libX11.so.6.2/libX11.so.6.2/libX11.so.6.2(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libX11.so*
+}
+
+{
+   libXt.so.6.2/libXt.so.6.2/libXt.so.6.2(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXt.so*
+   obj:/usr/*lib*/libXt.so*
+   obj:/usr/*lib*/libXt.so*
+}
+
+
+{
+   libXaw.so.7.0/libXaw.so.7.0/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXaw.so*
+}
+
+{
+   libXmu.so.6.2/libXmu.so.6.2/libXmu.so.6.2(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXmu.so*
+   obj:/usr/*lib*/libXmu.so*
+   obj:/usr/*lib*/libXmu.so*
+}
+
+{
+   libXt.so.6.0/libXt.so.6.0/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXt.so*
+   obj:/usr/*lib*/libXt.so*
+   obj:/usr/*lib*/libXaw.so*
+}
+
+{
+   libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Value4)
+   Memcheck:Value4
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXt.so*
+}
+
+{
+   libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXt.so*
+}
+
+{
+   libX11.so.6.2/libX11.so.6.2/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libXaw.so*
+}
+
+{
+   libX11.so.6.2/libX11.so.6.2/libXaw.so.7.0(Addr4)
+   Memcheck:Addr4
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libXaw.so*
+}
+
+{
+   libX11.so.6.2/libXaw.so.7.0/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libXaw.so*
+   obj:/usr/*lib*/libXaw.so*
+}
+
+{
+   libXpm.so.4.11/libXpm.so.4.11/libXpm.so.4.11
+   Memcheck:Cond
+   obj:/usr/*lib*/libXpm.so.4.11
+   obj:/usr/*lib*/libXpm.so.4.11
+   obj:/usr/*lib*/libXpm.so.4.11
+}
+
+{
+   struct with uninitialized paddings
+   Memcheck:Param
+   writev(vector[...])
+   fun:*_writev
+   fun:_X11TransSocketWritev
+   fun:_X11TransWritev
+   fun:*
+}
+
+{
+   struct with uninitialized paddings - libxcb
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/*.so
+   obj:/usr/lib*/libxcb.so.1.0.0
+   obj:/usr/lib*/libxcb.so.1.0.0
+   fun:xcb_send_request
+   fun:_X*
+}
+
+{
+   struct with uninitialized paddings - libxcb
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/*.so
+   obj:/usr/lib*/libxcb.so.1.0.0
+   obj:/usr/lib*/libxcb.so.1.0.0
+   obj:/usr/lib*/libxcb.so.1.0.0
+   fun:xcb_*
+   fun:_X*
+}
+
+{
+   another struct with uninitialized paddings
+   Memcheck:Param
+   write(buf)
+   obj:*
+   fun:_IceTransSocketWrite
+   fun:_IceTransWrite
+   fun:_IceWrite
+}
+
+{
+   Xorg 6.8.1 uninit _write* padding
+   Memcheck:Param
+   write(buf)
+   fun:*
+   fun:_X11TransWrite
+   obj:/usr/*lib*/libX11.so*
+}
+
+{
+   Xorg 6.8.1 uninit write padding
+   Memcheck:Param
+   write(buf)
+   fun:write
+   fun:_X11TransWrite
+   obj:/usr/*lib*/libX11.so*
+}
+
+{
+   Xorg 6.8.1 ICE uninit __write* padding
+   Memcheck:Param
+   write(buf)
+   obj:*
+   fun:_IceTransWrite
+   fun:_IceWrite
+   fun:IceFlush
+}
+
+{
+   Xorg 6.8.1 writev uninit padding
+   Memcheck:Param
+   writev(vector[...])
+   fun:writev
+   obj:/usr/*lib*/libX11.so*
+   fun:_X11TransWritev
+   fun:_XSend
+}
+
+{
+   Xorg 6.9.0 writev uninit padding
+   Memcheck:Param
+   writev(vector[...])
+   fun:do_writev
+   fun:writev
+   obj:/usr/*lib*/libX11.so*
+   fun:_X11TransWritev
+   fun:_XSend
+}
+
+{
+   X on SUSE11 writev uninit padding
+   Memcheck:Param
+   writev(vector[...])
+   fun:writev
+   obj:/usr/lib*/libxcb.so*
+   obj:/usr/lib*/libxcb.so*
+}
+{
+   X on SUSE11 writev uninit padding 2
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/ld-2.*.so*
+   obj:/usr/lib*/libxcb.so*
+   obj:/usr/lib*/libxcb.so*
+}
+{
+   X on SUSE11 writev uninit padding 3
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/ld-2.*.so*
+   obj:/usr/lib*/libORBit*.so*
+   obj:/usr/lib*/libORBit*.so*
+}
+{
+   X on SUSE11 writev uninit padding 4
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/libc-2.*.so*
+   obj:/usr/lib*/libORBit*.so*
+   obj:/usr/lib*/libORBit*.so*
+}
+ 
+
+# There's something strange about a % 127 in XftFontOpenInfo
+# (hashing) which gcc turns into a multiply by 33818641 and
+# some other guff instead.  I don't understand it enough to
+# know if libXft is broken or if memcheck's value tracking is
+# inadequate here.  Anyway, for the moment, suppress it.
+#
+# Use of uninitialised value of size 8
+#   at 0x71A59F8: XftFontOpenInfo (in /usr/X11R6/lib64/libXft.so.2.1.2)
+#   by 0x71A5F0D: XftFontOpenPattern (in /usr/X11R6/lib64/libXft.so.2.1.2)
+#   by 0x65F166E: loadFontConfigFont(QFontPrivate const*, QFontDef const&, 
+#                 QFont::Script) (qfontdatabase_x11.cpp:1942)
+#   by 0x65F5DE4: QFontDatabase::findFont(QFont::Script, QFontPrivate const*,
+#                 QFontDef const&, int) (qfontdatabase.cpp:996)
+{
+   XftFontOpenInfo-umod-127-strangeness
+   Memcheck:Value8
+   obj:/usr/X11*/lib*/libXft.so*
+   obj:/usr/X11*/lib*/libXft.so*
+}
+{
+   XftFontOpenInfo-umod-127-strangeness-a-la-xorg
+   Memcheck:Value8
+   obj:/usr/lib*/libXft.so*
+   obj:/usr/lib*/libXft.so*
+}
+
+{
+   More X padding stuff
+   Memcheck:Param
+   writev(vector[...])
+   fun:*writev*
+   obj:/usr/X11*/lib*/libX11.so*
+   obj:/usr/X11*/lib*/libX11.so*
+}
+
+# Inlined strlen in libX11 on Ubuntu 9.10 amd64, unfortunately.
+# Invalid read of size 4
+#    at 0x9B5CCE6: ??? (in /usr/lib/libX11.so.6.2.0)
+#    by 0x9B5D011: XGetAtomName (in /usr/lib/libX11.so.6.2.0)
+#    by 0x86407C3: gdk_x11_xatom_to_atom_for_display
+#                  (in /usr/lib/libgdk-x11-2.0.so.0.1800.3)
+#    by 0x8636817: ??? (in /usr/lib/libgdk-x11-2.0.so.0.1800.3)
+#  Address 0x1a558e1c is 28 bytes inside a block of size 30 alloc'd
+#    at 0x4C2552D: malloc (vg_replace_malloc.c:236)
+#    by 0x9B642C0: _XUpdateAtomCache (in /usr/lib/libX11.so.6.2.0)
+#    by 0x9B647F1: ??? (in /usr/lib/libX11.so.6.2.0)
+#    by 0x9B81818: ??? (in /usr/lib/libX11.so.6.2.0)
+{
+   libX11.so.6.2.0/libX11.so.6.2.0(Addr4)
+   Memcheck:Addr4
+   obj:/usr/*lib*/libX11.so*
+   obj:/usr/*lib*/libX11.so*
+}
+
+##----------------------------------------------------------------------##
+# Completely inappropriate place, but ...
+
+{
+   ifort-9.X-on-i686-1
+   Memcheck:Addr4
+   fun:unaligned_bigint
+   fun:hash
+   fun:for__add_to_lf_table
+}
+{
+   ifort-9.X-on-amd64-1
+   Memcheck:Addr8
+   fun:unaligned_bigint
+   fun:hash
+   fun:for__add_to_lf_table
+}
+
+
+# zlib-1.2.x uses uninitialised memory in some tricky way which
+# apparently is harmless (it must amount to a vectorised while-loop,
+# nothing else makes sense).  Fools Memcheck though.  See the mentioned
+# URL for details.
+{
+   zlib-1.2.x trickyness (1a): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Cond
+   obj:/*lib*/libz.so.1.2.*
+   ...
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+{
+   zlib-1.2.x trickyness (1b): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Cond
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+
+{
+   zlib-1.2.x trickyness (2a): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value8
+   obj:/*lib*/libz.so.1.2.*
+   ...
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+{
+   zlib-1.2.x trickyness (2b): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value8
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+
+{
+   zlib-1.2.x trickyness (3a): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value4
+   obj:/*lib*/libz.so.1.2.*
+   ...
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+{
+   zlib-1.2.x trickyness (3b): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value4
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+
+
+##----------------------------------------------------------------------##
+
+## More general versions of some of the old X suppressions above
+{
+   Ubuntu804 libXaw.so.7.0/libXaw.so.7.0/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+}
+{
+   Ubuntu804 libXaw.so.7.0/libXaw.so.7.0/libXt(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXt*so*
+}
+
+{
+   Ubuntu804-hack-1
+   Memcheck:Overlap
+   fun:mempcpy
+   fun:_IO_default_xsputn
+   obj:/lib*/libc-2.*so*
+}
+#
+# Suppression patterns for ld, the dynamic loader.
+#
+
+# Suppress all data races triggered by ld.
+{
+   drd-ld
+   drd:ConflictingAccess
+   obj:*/lib*/ld-*.so
+}
+
+#
+# Suppression patterns for libc.
+#
+
+# Suppress all data races where the topmost frame is inside libc.so. Although
+# this could hide some real data races, unfortunately this is the only way to
+# not report any false positives on stdio functions. The glibc functions
+# manipulating FILE objects use locking primitives that cannot be intercepted
+# easily. See also the definitions of _IO_lock_lock() etc. in the file
+# nptl/sysdeps/pthread/bits/stdio-lock.h in the glibc source tree.
+{
+   drd-libc-stdio
+   drd:ConflictingAccess
+   obj:*/lib*/libc-*
+}
+{
+   drd-libc-thread-cancellation-test
+   drd:ConflictingAccess
+   fun:write
+}
+{
+   drd-libc-random
+   drd:ConflictingAccess
+   fun:random_r
+   fun:random
+}
+
+#
+# Suppression patterns for libstdc++, the implementation of the standard C++
+# library included with the gcc compiler.
+#
+# Note: several versions of the libstdc++ library (4.2.2, 4.3.2, 4.4.0, 4.5.0
+# and their predecessors) contain an implementation of the std::string class
+# that triggers conflicting memory accesses. See also
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518
+#
+
+# {
+#    drd-libstdc++-std::string::string()
+#    drd:ConflictingAccess
+#    fun:_ZNSsC1ERKSs
+# }
+
+{
+   drd-libstdc++-cxa_guard_release
+   drd:CondErr
+   fun:pthread_cond_broadcast@*
+   fun:__cxa_guard_release
+}
+
+
+#
+# Suppression patterns for libpthread.
+#
+
+{
+   drd-libpthread-pthread_create
+   drd:ConflictingAccess
+   ...
+   fun:pthread_create*
+}
+{
+   drd-libpthread-pthread_join
+   drd:ConflictingAccess
+   fun:pthread_join
+   fun:pthread_join
+}
+{
+   drd-libpthread-__deallocate_stack
+   drd:ConflictingAccess
+   ...
+   fun:__deallocate_stack
+}
+{
+   drd-libpthread-__free_stacks
+   drd:ConflictingAccess
+   fun:__free_stacks
+}
+{
+   drd-libpthread-__free_tcb
+   drd:ConflictingAccess
+   ...
+   fun:__free_tcb
+}
+{
+   drd-libpthread-__nptl_deallocate_tsd
+   drd:ConflictingAccess
+   fun:__nptl_deallocate_tsd
+}
+{
+   drd-libpthread-pthread_detach
+   drd:ConflictingAccess
+   fun:pthread_detach
+   fun:pthread_detach
+}
+{
+   drd-libpthread-pthread_once
+   drd:ConflictingAccess
+   fun:pthread_once
+}
+{
+   drd-libpthread-pthread_cancel_init
+   drd:ConflictingAccess
+   fun:pthread_cancel_init
+}
+{
+   drd-libpthread-_Unwind_ForcedUnwind
+   drd:ConflictingAccess
+   ...
+   fun:_Unwind_ForcedUnwind
+}
+{
+   drd-libpthread-_Unwind_GetCFA
+   drd:ConflictingAccess
+   fun:_Unwind_GetCFA
+}
+{
+   drd-libpthread-_Unwind_Resume
+   drd:ConflictingAccess
+   ...
+   fun:_Unwind_Resume
+}
+{
+   drd-libpthread-?
+   drd:ConflictingAccess
+   obj:*/lib/libgcc_s.so.1
+}
+{
+   drd-libpthread-nanosleep
+   drd:ConflictingAccess
+   fun:nanosleep
+}
+
+#
+# Suppression patterns for libgomp.
+#
+
+# Unfortunately many statements in libgomp trigger conflicting accesses. It is
+# not clear to me which of these are safe and which ones not. See also
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40362
+{
+   drd-libgomp
+   drd:ConflictingAccess
+   obj:/usr/lib*/libgomp.so*
+}
+
+#
+# Suppression patterns for libX11.
+#
+
+{
+   drd-libX11-XCreateFontSet
+   drd:CondErr
+   fun:pthread_cond_init*
+   fun:_XReply
+   fun:XListFontsWithInfo
+   obj:/usr/lib*/libX11.so*
+   fun:XCreateOC
+   fun:XCreateFontSet
+}
+
+#
+# Suppression patterns for libxcb.
+#
+
+{
+   drd-libxcb-xcb_wait_for_reply
+   drd:CondErr
+   ...
+   fun:pthread_cond_destroy*
+   fun:xcb_wait_for_reply
+}
+
+#
+# Suppression patterns for libglib.
+#
+
+{
+   drd-libglib-access-g_threads_got_initialized
+   drd:ConflictingAccess
+   ...
+   fun:g_slice_alloc
+   fun:g_ptr_array_sized_new
+}
+{
+   drd-libglib-access-g_threads_got_initialized
+   drd:ConflictingAccess
+   ...
+   fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext
+   fun:_ZN20QEventDispatcherGlibC1EP7QObject
+   obj:/usr/lib*/libQtCore.so.4.*
+   obj:/usr/lib*/libQtCore.so.4.*
+}
+{
+   drd-libglib-access-g_mem_initialized
+   drd:ConflictingAccess
+   fun:g_malloc0
+}
+{
+   drd-libglib-g_private_get_posix_impl
+   drd:ConflictingAccess
+   fun:g_private_get_posix_impl
+}
+{
+   drd-libglib-g_private_set_posix_impl
+   drd:ConflictingAccess
+   fun:g_private_set_posix_impl
+}
+{
+   drd-libglib-g_get_language_names
+   drd:ConflictingAccess
+   fun:g_slice_free_chain_with_offset
+}
+{
+   drd-libglib-g_main_context_new
+   drd:ConflictingAccess
+   fun:fcntl
+   obj:/usr/lib*/libglib-*.so*
+   fun:g_main_context_new
+}
+
+#
+# Suppression patterns for libQtCore.
+#
+
+{
+   drd-libQtCore-deref-that-calls-QThreadData-destructor
+   drd:ConflictingAccess
+   fun:_ZN11QThreadDataD1Ev
+   obj:/usr/lib*/libQtCore.so.4.*
+}
+{
+   drd-libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList
+   drd:ConflictingAccess
+   obj:/usr/lib*/libQtCore.so.4.*
+   fun:_ZN11QMetaObject8activateEP7QObjectiiPPv
+   fun:_ZN11QMetaObject8activateEP7QObjectPKS_iPPv
+}
+{
+   drd-libQtCore-QObjectPrivate::clearGuards(QObject*)
+   drd:ConflictingAccess
+   fun:_ZN14QReadWriteLock12lockForWriteEv
+   fun:_ZN14QObjectPrivate11clearGuardsEP7QObject
+   fun:_ZN7QObjectD2Ev
+}
+{
+   drd-libQtCore-QObjectPrivate::clearGuards(QObject*)
+   drd:ConflictingAccess
+   fun:_ZN14QReadWriteLock12lockForWriteEv
+   fun:_ZN12QWriteLocker6relockEv
+   fun:_ZN12QWriteLockerC1EP14QReadWriteLock
+   fun:_ZN14QObjectPrivate11clearGuardsEP7QObject
+   fun:_ZN7QObjectD2Ev
+   fun:_ZN24QAbstractEventDispatcherD2Ev
+   fun:_ZN20QEventDispatcherGlibD0Ev
+}
+{
+   drd-libQtCore-QMutexPool::get(void const*)
+   drd:ConflictingAccess
+   fun:_ZN10QMutexPool3getEPKv
+}
+{
+   drd-libQtCore-qt_gettime_is_monotonic()
+   drd:ConflictingAccess
+   fun:_Z23qt_gettime_is_monotonicv
+}
+
+#
+# Suppression patterns for libboost.
+#
+
+# Suppress the races on boost::once_flag::epoch and on
+# boost::detail::this_thread_epoch. See also the source file
+# boost/thread/pthread/once.hpp in the Boost source tree
+# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp).
+{
+   drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)())
+   drd:ConflictingAccess
+   ...
+   fun:_ZN5boost9call_onceIPFvvEEEvRNS_9once_flagET_
+}
+{
+   drd-libboost-boost::detail::get_once_per_thread_epoch()
+   drd:ConflictingAccess
+   fun:_ZN5boost6detail25get_once_per_thread_epochEv
+}
+# Suppress the race reports on boost::detail::current_thread_tls_key. See also
+# https://svn.boost.org/trac/boost/ticket/3526 for more information about why
+# the access pattern of current_thread_tls_key is safe.
+{
+   drd-libboost-boost::detail::get_current_thread_data()
+   drd:ConflictingAccess
+   ...
+   fun:_ZN5boost6detail23get_current_thread_dataEv
+}
+{
+   drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*)
+   drd:ConflictingAccess
+   ...
+   fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE
+}
+
+# FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of
+# other stuff.  They should be removed.
+
+##----------------------------------------------------------------------##
+# Suppressions for the Helgrind tool when using 
+# a glibc-2.{3,4,5,6,7,8,9} system
+
+####################################################
+# glibc-2.X specific
+# These are generic cover-alls which catch a lot of stuff
+# in various combinations of ld, libc and libpthread
+#
+# Note this is heavyhanded and not very clever:
+#
+# - suppress anything that has its top frame in ld.so
+#   That's fine, since it's mostly dynamic linking stuff,
+#   which has various deliberate (harmless) races
+#
+# - suppress anything that has its top frame in libc.so.
+#   This really isn't clever, since it could hide some 
+#   legitimate races.  But the problem is, if we don't do
+#   this, then loads of errors to do with stdio are reported, because
+#   H fails to see glibc's internal locking/unlocking of FILE*s
+#   as required by POSIX.  A better solution is needed.
+
+#{
+#   helgrind-glibc2X-001
+#   Helgrind:Race
+#   obj:*/lib*/ld-2.*so*
+#}
+
+# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001
+
+{
+   helgrind-glibc2X-004
+   Helgrind:Race
+   obj:*/lib*/libc-2.*so*
+}
+
+{
+   helgrind-glibc2X-005
+   Helgrind:Race
+   obj:*/lib*/libpthread-2.*so*
+}
+
+# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
+
+# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004
+
+# helgrind-glibc2X-009 was merged into helgrind-glibc2X-004
+
+# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-011 was merged into helgrind-glibc2X-004
+
+# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001
+
+# helgrind-glibc2X-015 was merged into helgrind-glibc2X-004
+
+# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004
+
+# These are very ugly.  They are needed to suppress errors inside (eg)
+# NPTL's pthread_cond_signal.  Why only one stack frame -- at least we
+# should see the wrapper calling the real functions, right?
+# Unfortunately, no: the real functions are handwritten assembly (in
+# the glibc-2.5 sources) and does not create a proper stack frame.
+# Therefore it's only one level of unwinding before we're back out in
+# user code rather than the 2 levels you'd expect.
+{
+   helgrind-glibc2X-101
+   Helgrind:Race
+   obj:*/lib*/libpthread-2.*so*
+   fun:pthread_*
+}
+{
+   helgrind-glibc2X-102
+   Helgrind:Race
+   fun:mythread_wrapper
+   obj:*/lib*/libpthread-2.*so*
+}
+{
+   helgrind-glibc2X-103
+   Helgrind:Race
+   fun:pthread_cond_*@@GLIBC_2.*
+}
+{
+   helgrind-glibc2X-104
+   Helgrind:Race
+   fun:__lll_mutex_*
+}
+{
+   helgrind-glibc2X-105
+   Helgrind:Race
+   fun:pthread_rwlock_*lock*
+}
+{
+   helgrind-glibc2X-106
+   Helgrind:Race
+   fun:__lll_lock_wait
+}
+{
+   helgrind-glibc2X-107
+   Helgrind:Race
+   obj:*/lib*/libpthread-2.*so*
+   fun:sem_*
+}
+{
+   helgrind-glibc2X-108
+   Helgrind:Race
+   fun:clone
+}
+{
+   helgrind-glibc2X-109
+   Helgrind:Race
+   fun:start_thread
+}
+{
+   helgrind-glibc2X-110
+   Helgrind:Race
+   obj:*/lib*/libc-2.*so*
+   fun:pthread_*
+}
+{
+   helgrind-glibc2X-111
+   Helgrind:Race
+   fun:__lll_*lock_*
+}
+{
+   helgrind-glibc2X-113
+   Helgrind:Race
+   fun:pthread_barrier_wait*
+}
+
+
+####################################################
+# qt4 specific (GNU mangling)
+#
+{
+   helgrind-qt4---QMutex::lock()-QMutex::lock()
+   Helgrind:Race
+   ...
+   fun:_ZN6QMutex4lockEv
+   fun:_ZN6QMutex4lockEv
+}
+
+{                                                               
+   helgrind-qt4---QMutex::unlock()-QMutex::unlock()
+   Helgrind:Race                                                
+   ...
+   fun:_ZN6QMutex6unlockEv                                      
+   fun:_ZN6QMutex6unlockEv
+}
+
+{
+   helgrind-qt4---pthread_setspecific-QThreadPrivate::start(void*)
+   Helgrind:Race
+   fun:pthread_setspecific
+   fun:_ZN14QThreadPrivate5startEPv
+}
+
+
+####################################################
+# Other stuff.
+#
+# pthread_exit apparently calls some kind of unwind
+# mechanism - maybe to remove some number of frames
+# from the thread's stack, so as to get back to the 
+# outermost frame for the thread?  Anyway..
+
+{
+   helgrind---*Unwind*-...-pthread_exit
+   Helgrind:Race
+   fun:*Unwind*
+   ...
+   fun:pthread_exit
+}
+
+{
+   helgrind---...-*Unwind*-*pthread_unwind*
+   Helgrind:Race
+   ...
+   fun:*Unwind*
+   fun:*pthread_unwind*
+}
+
+{
+   helgrind---...-*Unwind*-*pthread_unwind*
+   Helgrind:Race
+   ...
+   fun:_Unwind*
+   ...
+   fun:_Unwind_Backtrace
+}
+
+
+
+
+####################################################
+# To do with thread stack allocation and deallocation?
+#
+{
+   helgrind---free_stacks-__deallocate_stack
+   Helgrind:Race
+   fun:free_stacks
+   fun:__deallocate_stack
+}
+
+{
+   helgrind---__deallocate_stack-start_thread-clone
+   Helgrind:Race
+   fun:__deallocate_stack
+   fun:start_thread
+   fun:clone
+}
+
+
+####################################################
+# To do with pthread_{set,get}specific
+#
+{
+   helgrind---pthread_setspecific
+   Helgrind:Race
+   fun:pthread_setspecific
+}
+
+{
+   helgrind---pthread_getspecific
+   Helgrind:Race
+   fun:pthread_getspecific
+}
+
+
+####################################################
+# To do with dynamic linking
+#
+# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001
+
+{
+   helgrind---_dl_allocate_tls 
+   Helgrind:Race
+   fun:mempcpy
+   fun:_dl_allocate_tls_init
+   ...
+   fun:pthread_create@@GLIBC_2.2*
+   fun:pthread_create_WRK
+   fun:pthread_create@*
+}
+
+####################################################
+# To do with GNU libgomp
+#
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_sync
+}
+
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_next
+}
+
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_last
+}
+
+##----------------------------------------------------------------------##
+
+# Errors to suppress by default with glibc 2.21.x
+
+# IMPORTANT: DO NOT EDIT glibc-2.X.supp, as it is as a generated
+# file.  Instead edit glibc-2.X.supp.in.
+
+# Format of this file is:
+# {
+#     name_of_suppression
+#     tool_name:supp_kind
+#     (optional extra info for some suppression types)
+#     caller0 name, or /name/of/so/file.so
+#     caller1 name, or ditto
+#     (optionally: caller2 name)
+#     (optionally: caller3 name)
+#  }
+#
+# For Memcheck, the supp_kinds are:
+#
+#     Param Value1 Value2 Value4 Value8 Value16 Jump
+#     Free Addr1 Addr2 Addr4 Addr8 Addr16
+#     Cond (previously known as Value0)
+#
+# and the optional extra info is:
+#     if Param: name of system call param
+
+##----------------------------------------------------------------------##
+##--- generic suppressions                                           ---##
+##----------------------------------------------------------------------##
+
+{
+   dl-hack3-cond-0
+   Memcheck:Cond
+   fun:_dl_start
+   fun:_start
+}
+{
+   dl-hack3-cond-1
+   Memcheck:Cond
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+}
+{
+   dl-hack3-cond-2
+   Memcheck:Cond
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/libc-2.21*.so*
+}
+{
+   dl-hack3-cond-3
+   Memcheck:Cond
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/libc-2.21*.so*
+   obj:*/lib*/libc-2.21*.so*
+}
+{
+   dl-hack3-cond-4
+   Memcheck:Cond
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/libdl-2.21*.so*
+}
+
+{
+   dl-hack4-64bit-addr-1
+   Memcheck:Addr8
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+}
+{
+   dl-hack4-64bit-addr-2
+   Memcheck:Addr8
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/libc-2.21*.so*
+}
+{
+   dl-hack4-64bit-addr-3
+   Memcheck:Addr8
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/ld-2.21*.so*
+   obj:*/lib*/libdl-2.21*.so*
+}
+
+{
+   dl-hack5-32bit-addr-1
+   Memcheck:Addr4
+   obj:*/lib*/ld-2.21*.so
+   obj:*/lib*/ld-2.21*.so
+   obj:*/lib*/ld-2.21*.so
+}
+{
+   dl-hack5-32bit-addr-3
+   Memcheck:Addr4
+   obj:*/lib*/ld-2.21*.so
+   obj:*/lib*/ld-2.21*.so
+   obj:*/lib*/libdl-2.21*.so*
+}
+{
+   dl-hack5-32bit-addr-4
+   Memcheck:Addr4
+   obj:*/lib*/ld-2.21*.so
+   obj:*/lib*/libdl-2.21*.so*
+   obj:*/lib*/ld-2.21*.so
+}
+
+
+##----------------------------------------------------------------------##
+##--- Misc ad-hoc hacks                                              ---##
+##----------------------------------------------------------------------##
+{
+   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
+   Memcheck:Cond
+   fun:_dl_start_final
+   fun:_dl_start
+   fun:_start
+}
+{
+   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
+   Memcheck:Cond
+   fun:index
+   obj:*ld-2.21.*.so
+}
+{
+   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
+   Memcheck:Addr4
+   fun:index
+   fun:expand_dynamic_string_token
+}
+{
+   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
+   Memcheck:Addr4
+   fun:index
+   obj:*ld-2.21.*.so
+}
+{
+   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
+   Memcheck:Addr4
+   fun:*wordcopy_fwd_dest_aligned*
+   fun:mem*cpy
+   obj:*lib*2.21.*.so
+}
+
+{
+   glibc-2.21-on-SUSE-10.3-(x86)
+   Memcheck:Addr4
+   obj:*/lib/ld-2.21*.so
+   obj:*/lib/ld-2.21*.so
+   obj:*/lib/ld-2.21*.so
+}
+
+{
+   glibc24-64bit-padding-1a
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   fun:get_mapping
+   fun:__nscd_get_map_ref
+   fun:nscd*
+}
+{
+   glibc24-64bit-padding-1b
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:__sendto_nocancel
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+}
+{
+   glibc24-64bit-padding-1c
+   Memcheck:Param
+   socketcall.send(msg)
+   fun:send
+   fun:__nscd_get_map_ref
+   fun:nscd_get*_r
+   fun:*nscd*
+   obj:/*libc-2.21*.so
+}
+
+
+{
+   X11-64bit-padding-3a
+   Memcheck:Param
+   write(buf)
+   obj:/*libpthread-2.4.so*
+   obj:/usr/lib*/libX11.so*
+   obj:/usr/lib*/libX11.so*
+   obj:/usr/lib*/libX11.so*
+}
+
+{
+   X11-64bit-padding-4a
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+}
+{
+   X11-64bit-padding-4b
+   Memcheck:Param
+   socketcall.send(msg)
+   fun:send
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+   obj:/*libc-2.21*.so
+}
+
+##----------------------------------------------------------------------##
+# MontaVista Linux 4.0.1 on ppc32
+{
+    MVL-401-linuxthreads-pthread_create
+    Memcheck:Param
+    write(buf)
+    fun:pthread_create
+}
+{
+   MVL-401-linuxthreads-pthread_create
+   Memcheck:Param
+   write(buf)
+   obj:*/lib/libpthread-0.10.so
+   fun:pthread_create
+}
+
+##----------------------------------------------------------------------##
+# Ubuntu 10.04 on ARM (Thumb).  Not sure why this is necessary.
+{
+   U1004-ARM-_dl_relocate_object
+   Memcheck:Cond
+   fun:_dl_relocate_object
+}