Merge lp:mir/0.8 into lp:mir/ubuntu

[Cemil Azizoglu]

Mir 0.8.0 release.

Mir 0.8.0 release.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1963
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-utopic-amd64-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-utopic-amd64-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file '3rd_party/android-deps/std/atomic.h'
--- 3rd_party/android-deps/std/atomic.h	2013-03-13 04:54:15 +0000
+++ 3rd_party/android-deps/std/atomic.h	2014-10-10 13:43:10 +0000
@@ -80,7 +80,7 @@
 //int android_atomic_acquire_cas(int32_t oldvalue, int32_t newvalue,
 //        volatile int32_t* addr);
 inline int android_atomic_release_cas(int32_t oldvalue, int32_t newvalue,
-    android_atomic_int32_t* addr) { return !addr->compare_exchange_weak(oldvalue, newvalue); }
+    android_atomic_int32_t* addr) { return !addr->compare_exchange_strong(oldvalue, newvalue); }
 }
 
 /*

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2014-07-14 10:39:48 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -7,7 +7,9 @@
   system/extras/ext4_utils
 
   ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/src/include/platform
 )
 
 add_definitions(

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-16 08:33:51 +0000
+++ CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -27,8 +27,8 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 7) # This should change at least with every MIRSERVER_ABI
-set(MIR_VERSION_PATCH 3)
+set(MIR_VERSION_MINOR 8) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_PATCH 0)
 
 set(MIR_VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH})
 
@@ -104,10 +104,10 @@
 
 enable_testing()
 
-include_directories(include/shared)
+include_directories(include/common src/include/common)
 
 # Check for boost
-find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams REQUIRED)
+find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams filesystem REQUIRED)
 include_directories (
   ${Boost_INCLUDE_DIRS}
 )
@@ -125,10 +125,10 @@
 
 add_definitions(-DMESA_EGL_NO_X11_HEADERS)
 
-# Default to mesa backend
+# Default to mesa backend, but build all of them
 set(
   MIR_PLATFORM
-  mesa
+  mesa;android
   CACHE
   STRING
   "a list of graphics backends to build (options are 'mesa' or 'android')"
@@ -190,6 +190,7 @@
 add_subdirectory(benchmarks/)
 add_subdirectory(tools/)
 add_subdirectory(examples/)
+add_subdirectory(playground/)
 add_subdirectory(guides/)
 add_subdirectory(cmake/)
 
@@ -200,10 +201,10 @@
 
   # There's no nice way to format this. Thanks CMake.
   add_test(LGPL-required
-    /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/shared ${PROJECT_SOURCE_DIR}/include/shared ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform"
+    /bin/sh -c "! grep -rl 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform"
   )
   add_test(GPL-required
-    /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/include/test ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
+    /bin/sh -c "! grep -rl 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/src/include/server ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"
   )
   
   add_test(NAME server-ABI-unchanged
@@ -229,3 +230,5 @@
 
 enable_coverage_report(mirserver)
 include (cmake/Doxygen.cmake)
+include (cmake/ABICheck.cmake)
+

=== modified file 'benchmarks/android-input/CMakeLists.txt'
--- benchmarks/android-input/CMakeLists.txt	2014-08-27 19:44:04 +0000
+++ benchmarks/android-input/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -5,7 +5,7 @@
  )
 
 include_directories(
-  ${Mir_SOURCE_DIR}/include/test
+  ${Mir_SOURCE_DIR}/tests/include
   ${Mir_SOURCE_DIR}/include/platform
 )
 

=== modified file 'client-ABI-sha1sums'
--- client-ABI-sha1sums	2014-08-05 14:01:56 +0000
+++ client-ABI-sha1sums	2014-10-10 13:43:10 +0000
@@ -8,9 +8,9 @@
 21d07e655e85eeec8a3523e1c6f9c2252176ec01  include/client/mir_toolkit/mir_screencast.h
 8609754db3be20e11e43858dd2c36b5bd480d5ec  include/client/mir_toolkit/mir_surface.h
 b141c4d79802ad626d969249c0004744e5c2a525  include/client/mir_toolkit/mir_wait.h
-9907751d046e4aea81881cf19e5df52c7a6a813e  include/shared/mir_toolkit/client_types.h
-183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/shared/mir_toolkit/common.h
-fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/shared/mir_toolkit/cursors.h
-bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/shared/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/shared/mir_toolkit/mesa/native_display.h
-101017c17714a57db57d79b7b5e7df40a3568236  include/shared/mir_toolkit/mir_native_buffer.h
+9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
+183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
+fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
+bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
+99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h

=== added file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ABICheck.cmake	2014-10-10 13:43:10 +0000
@@ -0,0 +1,109 @@
+cmake_minimum_required (VERSION 2.6)
+
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE ABI_CHECK_TARGET_MACH OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(ABI_CHECK_BASE_DIR $ENV{MIR_ABI_CHECK_BASE_DIR})
+set(ABI_DUMP_PREBUILT_LIBDIR $ENV{MIR_ABI_DUMP_PREBUILT_LIBDIR})
+
+if ("${ABI_CHECK_BASE_DIR}" STREQUAL "")
+  set(ABI_CHECK_BASE_DIR ${CMAKE_BINARY_DIR}/abi_dumps)
+endif()
+
+set(ABI_DUMPS_DIR_PREFIX "abi_dumps/${ABI_CHECK_TARGET_MACH}")
+
+function(get_value_for_arg alist name output)
+  list(FIND alist ${name} idx)
+  if (idx GREATER -1)
+    math(EXPR idx "${idx} + 1")
+    list(GET alist ${idx} tmp_out)
+    set(${output} "${tmp_out}" PARENT_SCOPE)
+  endif()
+endfunction()
+
+function(get_includes libname output)
+  get_property(lib_includes TARGET ${libname} PROPERTY INCLUDE_DIRECTORIES)
+  list(REMOVE_DUPLICATES lib_includes)
+  string(REPLACE ";" "\n    " tmp_out "${lib_includes}")
+  set(${output} "${tmp_out}" PARENT_SCOPE)
+endfunction()
+
+function(make_lib_descriptor name)
+  set(libname "mir${name}")
+
+  list(FIND ARGN "INCLUDE_PRIVATE" include_private)
+  if (include_private GREATER -1)
+    set(private_headers "${CMAKE_SOURCE_DIR}/src/include/${name}")
+  endif()
+  
+  set(LIB_DESC_HEADERS "${CMAKE_SOURCE_DIR}/include/${name}
+    ${private_headers}"
+  )
+
+  if ("${ABI_DUMP_PREBUILT_LIBDIR}" STREQUAL "")
+    get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION)
+  else()
+    get_property(liblocation TARGET ${libname} PROPERTY LOCATION)
+    get_filename_component(libfilename ${liblocation} NAME)
+    set(LIB_DESC_LIBS "${ABI_DUMP_PREBUILT_LIBDIR}/${libfilename}")
+  endif()
+
+  get_includes(${libname} LIB_DESC_INCLUDE_PATHS)
+  set(LIB_DESC_GCC_OPTS "${CMAKE_CXX_FLAGS}")
+
+  get_value_for_arg("${ARGN}" "EXCLUDE_HEADERS" LIB_DESC_SKIP_HEADERS)
+
+  configure_file(${CMAKE_SOURCE_DIR}/tools/lib_descriptor.xml.skel ${libname}_desc.xml)
+endfunction()
+
+#These headers are not part of the libmircommon interface
+set(android-platform-headers "${CMAKE_SOURCE_DIR}/src/include/common/mir/graphics/android")
+
+make_lib_descriptor(client)
+make_lib_descriptor(server)
+make_lib_descriptor(common INCLUDE_PRIVATE EXCLUDE_HEADERS ${android-platform-headers})
+make_lib_descriptor(platform INCLUDE_PRIVATE)
+
+macro(_add_custom_abi_dump_command libname version)
+  set(ABI_DUMP_NAME ${ABI_DUMPS_DIR_PREFIX}/${libname}_${version}.abi.tar.gz)
+
+  if ("${ABI_DUMP_PREBUILT_LIBDIR}" STREQUAL "")
+    set(dump_depends ${libname})
+  else()
+    set(dump_depends "")
+  endif()
+
+  add_custom_command(OUTPUT ${ABI_DUMP_NAME}
+    COMMAND abi-compliance-checker -gcc-path ${CMAKE_C_COMPILER} -l ${libname} -v1 ${version} -dump-path ${ABI_DUMP_NAME} -dump-abi ${libname}_desc.xml
+    DEPENDS ${dump_depends}
+  )
+endmacro(_add_custom_abi_dump_command)
+
+macro(_define_abi_dump_for libname)
+  _add_custom_abi_dump_command(${libname} next)
+  add_custom_target(abi-dump-${libname} DEPENDS ${ABI_DUMP_NAME})
+  _add_custom_abi_dump_command(${libname} base)
+  add_custom_target(abi-dump-base-${libname} DEPENDS ${ABI_DUMP_NAME})
+endmacro(_define_abi_dump_for)
+
+macro(_define_abi_check_for libname) 
+  set(OLD_ABI_DUMP "${ABI_CHECK_BASE_DIR}/${ABI_CHECK_TARGET_MACH}/${libname}_base.abi.tar.gz")
+  set(NEW_ABI_DUMP ${ABI_DUMPS_DIR_PREFIX}/${libname}_next.abi.tar.gz)
+  add_custom_target(abi-check-${libname} 
+    COMMAND abi-compliance-checker -l ${libname} -old "${OLD_ABI_DUMP}" -new "${NEW_ABI_DUMP}" -check-implementation
+    DEPENDS abi-dump-${libname}
+  )
+endmacro(_define_abi_check_for)
+
+set(the_libs mirserver mirclient mircommon mirplatform)
+
+foreach(libname ${the_libs})
+  _define_abi_dump_for(${libname})
+  _define_abi_check_for(${libname})
+  list(APPEND abi-dump-list abi-dump-${libname})
+  list(APPEND abi-dump-base-list abi-dump-base-${libname})
+  list(APPEND abi-check-list abi-check-${libname})
+endforeach(libname)
+
+add_custom_target(abi-dump DEPENDS ${abi-dump-list})
+add_custom_target(abi-dump-base DEPENDS ${abi-dump-base-list})
+add_custom_target(abi-check DEPENDS ${abi-check-list})

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2014-08-26 14:59:57 +0000
+++ cmake/MirCommon.cmake	2014-10-10 13:43:10 +0000
@@ -16,6 +16,12 @@
   OFF
 )
 
+option(
+  MIR_USE_PRECOMPILED_HEADERS
+  "Use precompiled headers"
+  ON
+)
+
 if(ENABLE_MEMCHECK_OPTION)
   find_program(
     VALGRIND_EXECUTABLE
@@ -117,3 +123,33 @@
       endif()
   endif()
 endfunction()
+
+function (mir_precompiled_header TARGET HEADER)
+  if (MIR_USE_PRECOMPILED_HEADERS)
+    get_property(TARGET_COMPILE_FLAGS TARGET ${TARGET} PROPERTY COMPILE_FLAGS)
+    get_property(TARGET_INCLUDE_DIRECTORIES TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES)
+    foreach(dir ${TARGET_INCLUDE_DIRECTORIES})
+      if (${dir} MATCHES "usr/include")
+        set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -isystem ${dir}")
+      else()
+        set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -I${dir}")
+      endif()
+    endforeach()
+
+    separate_arguments(
+      PCH_CXX_FLAGS UNIX_COMMAND
+      "${CMAKE_CXX_FLAGS} ${TARGET_COMPILE_FLAGS} ${TARGET_INCLUDE_DIRECTORIES_STRING}"
+    )
+
+    add_custom_command(
+      OUTPUT ${TARGET}_precompiled.hpp.gch
+      DEPENDS ${HEADER}
+      COMMAND ${CMAKE_CXX_COMPILER} ${PCH_CXX_FLAGS} -x c++-header -c ${HEADER} -o ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_precompiled.hpp.gch
+    )
+
+    set_property(TARGET ${TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " -include ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_precompiled.hpp -Winvalid-pch ")
+
+    add_custom_target(${TARGET}_pch DEPENDS ${TARGET}_precompiled.hpp.gch)
+    add_dependencies(${TARGET} ${TARGET}_pch)
+  endif()
+endfunction()

=== modified file 'common-ABI-sha1sums'
--- common-ABI-sha1sums	2014-08-27 19:35:36 +0000
+++ common-ABI-sha1sums	2014-10-10 13:43:10 +0000
@@ -1,45 +1,18 @@
-6ad1f35928df9ffd917fbf17cbcdd533a8b5b27d  include/shared/mir/basic_observers.h
-3329ada91412ded2f127aee9a92f065e57b81cb2  include/shared/mir/cached_ptr.h
-691278e8b89265fa7f11db78dc8a9b530cef6e99  include/shared/mir/default_configuration.h
-82ff9499ef62739379616e02164dc98f9914c329  include/shared/mir/fd.h
-15dd88e8de39d195c3a4e7c166678cd9b6951994  include/shared/mir/frontend/client_constants.h
-b399dc08514751c86e23824612a52378dd9b1e23  include/shared/mir/geometry/dimensions.h
-7031270546292995d38e6de165600db21ff51c68  include/shared/mir/geometry/displacement.h
-283cb0ecf9d544300681fc2ab86bec568e2d20ff  include/shared/mir/geometry/forward.h
-bfd87d9fb800c1c1b528c00185570abac569caf2  include/shared/mir/geometry/length.h
-d954464ef2d20c2876db68c94512a443186da09b  include/shared/mir/geometry/point.h
-65148c6d432950fb07589b6348afc4aab8b5079a  include/shared/mir/geometry/rectangle.h
-1b6632a6ee0a8758201739fb16c4eb1ce196344a  include/shared/mir/geometry/rectangles.h
-7d3ede2c85e9febc1c4951a342939e3a6dacb99e  include/shared/mir/geometry/size.h
-76d576231de039e25f4cf30829504552dcb9fc53  include/shared/mir/graphics/android/android_driver_interpreter.h
-c02a1e68d5a8ccfd8710440e166c9e32bc974f1e  include/shared/mir/graphics/android/android_native_buffer.h
-05e7b043ccf49582a78e880967b3bc1f3512e010  include/shared/mir/graphics/android/fence.h
-0168b68dea12355c22cd39fbfc50bca0e21fd6e5  include/shared/mir/graphics/android/mir_native_window.h
-8f6d9dc681f3e0d212e6a74f9170ea7b3eb2607f  include/shared/mir/graphics/android/native_buffer.h
-424d1ff5b9bc299fc43f0afe961c4dafc3227992  include/shared/mir/graphics/android/sync_fence.h
-e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/shared/mir/graphics/native_buffer.h
-ec29bd74becf1c4f1004797e71d4e49d376dbfc8  include/shared/mir/input/android/android_input_lexicon.h
-dcf8b8982f138bdde39a241825c610e955cd5e33  include/shared/mir/input/input_platform.h
-de92c0e3f7a1cf204330cd29847e7524a3af00cd  include/shared/mir/input/input_receiver_report.h
-208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/shared/mir/input/input_receiver_thread.h
-3829a4722360d794658ed4db4af005c79f6504c5  include/shared/mir/input/null_input_receiver_report.h
-2801f1a4fa975a1d8f9388192da2408d2bb472f4  include/shared/mir/input/xkb_mapper.h
-be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/shared/mir/int_wrapper.h
-2319b60bf87801a93af636d3bbfbae420f6776a4  include/shared/mir/logging/dumb_console_logger.h
-52cb642982f7f4fa623cf041b11eca126a3df0f4  include/shared/mir/logging/input_timestamp.h
-72e20902d70588af73bea7a524337264b853bf0a  include/shared/mir/logging/logger.h
-f199066a30882b22be901de0c4e6aa62e320e593  include/shared/mir/protobuf/google_protobuf_guard.h
-4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2  include/shared/mir/raii.h
-bb27ec04b2861d128f420698491941f71e1aefc0  include/shared/mir/recursive_read_write_mutex.h
-903210453b98267e47c03ab2920c1db047ba0457  include/shared/mir/report/lttng/mir_tracepoint.h
-52b6b60543a361e91dbeaa2549114239f57b6b4e  include/shared/mir/report/lttng/tracepoint_provider.h
-dc80f8a57f133276dd5a72f4d0360a7b71154d16  include/shared/mir/shared_library.h
-b4e96264b9a57a1f2ceceb700c5379658905ded7  include/shared/mir/thread_name.h
-9907751d046e4aea81881cf19e5df52c7a6a813e  include/shared/mir_toolkit/client_types.h
-183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/shared/mir_toolkit/common.h
-fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/shared/mir_toolkit/cursors.h
-bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/shared/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/shared/mir_toolkit/mesa/native_display.h
-101017c17714a57db57d79b7b5e7df40a3568236  include/shared/mir_toolkit/mir_native_buffer.h
-9f646fa12eaca5fc3b7a8fde6208673c071c8ef3  include/shared/mir/udev/wrapper.h
-9fd77ab693cc4c9a200e44804f5493733528a674  include/shared/mir/variable_length_array.h
+3329ada91412ded2f127aee9a92f065e57b81cb2  include/common/mir/cached_ptr.h
+82ff9499ef62739379616e02164dc98f9914c329  include/common/mir/fd.h
+b399dc08514751c86e23824612a52378dd9b1e23  include/common/mir/geometry/dimensions.h
+d954464ef2d20c2876db68c94512a443186da09b  include/common/mir/geometry/point.h
+dc7c62d3916eec025e8e7deaf57e06077ce38928  include/common/mir/geometry/rectangle.h
[phone]e3ca4f5fa4e7db025d0978d2bbef06  include/common/mir/geometry/rectangles.h
+42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
+e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
+dcf8b8982f138bdde39a241825c610e955cd5e33  include/common/mir/input/input_platform.h
+208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
+be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613  include/common/mir/time/clock.h
+9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
+183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
+fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
+bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
+99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2014-03-26 05:48:59 +0000
+++ cross-compile-chroot.sh	2014-10-10 13:43:10 +0000
@@ -24,9 +24,11 @@
     case $OPTNAME in
       c )
         clean_build_dir ${BUILD_DIR}
+        shift
         ;;
       u )
         _do_update_chroot=1
+        shift
         ;;
       h )
         usage
@@ -78,6 +80,6 @@
       -DMIR_PLATFORM=android\;mesa \
       .. 
 
-    make -j${NUM_JOBS}
+    make -j${NUM_JOBS} $@
 
 popd > /dev/null 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-18 14:54:51 +0000
+++ debian/changelog	2014-10-10 13:43:10 +0000
@@ -1,3 +1,98 @@
+mir (0.8.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.8.0 (https://launchpad.net/mir/+milestone/0.8.0)
+    - Enhancements:
+      . Less sensitivity to ABI breaks - many headers unused by external
+        projects are now hidden and not installed by -dev packaes. If you
+        require any headers that are missing, just ask.
+      . Touchspots: --enable-touchspots to servers; visually shows touch
+        locations (warning: This affects performance LP: #1373692).
+      . Client performance reporting: Any Mir client can now get accurate
+        performance information (frame rate, render time, buffer lag etc)
+        logged to stdout. Just set env MIR_CLIENT_PERF_REPORT=log
+      . Further improved touch responsiveness, with less lag and smoother
+        scrolling (so long as you don't enable touchspots).
+      . Slightly faster builds using precompiled headers.
+      . Turn hardware overlays on by default. When in use, this halves the
+        CPU usage of a Mir server. Already enabled in unity-system-compositor.
+      . More scripting to detect ABI breaks.
+      . Improved src/ tree consistency (renamed "src/shared" to "src/common").
+      . Improved fatal signal design: Changed from SIGTERM to SIGHUP delivered
+        to clients on unexpected server disconnection.
+      . Improved library/package design to allow concurrent installations
+        of different Mir versions without conflicts.
+      . Fd reception code is now common to client and server.
+    - ABI summary: Servers need rebuilding, but clients do not;
+      . Mirclient ABI unchanged at 8
+      . Mircommon ABI bumped to 2
+      . Mirplatform ABI bumped to 3
+      . Mirserver ABI bumped to 26
+    - API changes between Mir 0.7 and 0.8:
+      . Lots of headers removed from the public SDK! We have only hidden
+        headers not known to be used by any known projects. Please let us
+        know if anything is missing - https://bugs.launchpad.net/mir/+filebug
+      . graphics::Platform - interface changed significantly.
+      . Lots of server API changes to support touchspots.
+      . File descriptors now passed as type Fd instead of int32_t.
+    - Bug fixes:
+      . [regression] Mir deb packages with versioned names cannot be installed
+        simultaneously any more (LP: #1293944)
+      . A frozen client can hang the whole server (LP: #1350207)
+      . QtMir FTBFS: fatal error: mir/input/input_channel.h: No such file or
+        directory (LP: #1365934)
+      . [regression] platform-api fails to build against Mir 0.8 (LP: #1368354)
+      . Mir FTBFS with gcc 4.9.1-14 (utopic update):
+        auto_unblock_thread.h:44:46: error: no matching function for call to
+        ‘std::thread::thread(<brace-enclosed initializer list>)’ (LP: #1369389)
+      . [regression] Compositing is jerky and stutters during touch events
+        (LP: #1372850)
+      . unit test fails: AndroidInputReceiverSetup.slow_raw_input_doesnt_cause_
+        frameskipping (LP: #1373826)
+      . intermittent hang in TestClientInput (LP: #1338612)
+      . TestClientInput.scene_obscure_motion_events_by_stacking fails
+        intermittently (LP: #1361757)
+      . [regression] First frame is composited as black (even though the client
+        has provided a non-black frame) (LP: #1362444)
+      . Some mali drivers crash after repeatedly creating/destroying the mir
+        compositor threads (LP: #1362841)
+      . [android] SIGTERM to server with connected client causes crash
+        (LP: #1364637)
+      . [regression] acceptance tests fails in
+        ServerDisconnect.causes_client_to_terminate_by_default (LP: #1364772)
+      . [regression] symbol lookup error:
+        /usr/lib/arm-linux-gnueabihf/libmirserver.so.24: undefined symbol:
+        _ZTIN7android7RefBaseE (libmirserver 0.6.1 doesn't work with
+        libmircommon 0.7.0) (LP: #1364890)
+      . [regression] Mir FTBFS with g++-4.8 [error: ISO C++ forbids casting
+        between pointer-to-function and pointer-to-object] (LP: #1366134)
+      . Intermittent CI failure in DemoPrivateProtobuf.client_calls_server
+        (LP: #1367353)
+      . Overly strict libmirplatform* dependencies are blocking CI
+        (LP: #1370866)
+      . [regression] mir demo servers segfault on shutdown (LP: #1371619)
+      . Nested server crashes with SIGSEGV on shutdown in eglDestroyContext()
+        (LP: #1372276)
+      . [regression] Moving/resizing clients in a nested server is very
+        jerky/stuttery (LP: #1372300)
+      . [regression] Bypass/overlays are toggling constantly (LP: #1373689)
+      . [regression] Mir server uses too much CPU during touch scrolling
+        (LP: #1373809)
+      . Intermittent test failures in TestClientCursorAPI.* (LP: #1342567)
+      . clang emits lots of warnings about lttng headers (LP: #1348472)
+      . [enhancement] Draw input event location (LP: #1323522)
+      . demo shell: Keep colours consistent, regardless of the physical pixel
+        format of your framebuffer (LP: #1375660)
+      . tests: Fix SharedLibraryProber test runs on i386. (LP: #1375829)
+      . Touchspots rendered as squares on some devices (LP: #1373698)
+      . The headers needed to use features shown in the acceptance tests are
+        not published (LP: #1375301)
+      . update-all-ABI-sha1sums.sh and install_on_android.sh are no longer
+        executable. (LP: #1376547)
+      . Fix arm64 package by adding arm64 to the shared library prober test.
+        (LP: #1379478)
+
+ -- Daniel van Vugt <[e-mail]>  Tue, 30 Sep 2014 16:08:44 +0800
+
 mir (0.7.3+14.10.20140918.1-0ubuntu1) utopic; urgency=medium
 
   [ Andreas Pokorny ]

=== modified file 'debian/control'
--- debian/control	2014-09-18 06:04:10 +0000
+++ debian/control	2014-10-10 13:43:10 +0000
@@ -19,6 +19,7 @@
                libboost-program-options-dev,
                libboost-system-dev,
                libboost-iostreams-dev,
+               libboost-filesystem-dev,
                protobuf-compiler,
                libdrm-dev,
                libegl1-mesa-dev,
@@ -44,22 +45,21 @@
 # just go ahead. ~mir-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~mir-team/mir/trunk
 
-Package: libmirserver25
+Package: libmirserver26
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmirplatformgraphics-mesa (= ${binary:Version}) |
-           libmirplatformgraphics-android (= ${binary:Version}),
+         libmirplatform3driver-mesa | libmirplatform3driver-android,
 Description: Display server for Ubuntu - server library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
  .
  Contains the shared library needed by server applications for Mir.
 
-Package: libmirplatform2
+Package: libmirplatform3
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -73,7 +73,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the underlying hardware platform.
 
-Package: libmirplatformgraphics-mesa
+Package: libmirplatform3driver-mesa
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -87,7 +87,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: libmirplatformgraphics-android
+Package: libmirplatform3driver-android
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -106,7 +106,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmircommon1 (= ${binary:Version}), 
+Depends: libmircommon2 (= ${binary:Version}), 
          libprotobuf-dev (>= 2.4.1),
          ${misc:Depends},
 Breaks: mircommon-dev (<< 0.6)
@@ -122,7 +122,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirplatform2 (= ${binary:Version}), 
+Depends: libmirplatform3 (= ${binary:Version}), 
          libmircommon-dev,
          libboost-program-options-dev,
          ${misc:Depends},
@@ -139,7 +139,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver25 (= ${binary:Version}),
+Depends: libmirserver26 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -157,8 +157,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmirclientplatform-mesa (= ${binary:Version}) |
-           libmirclientplatform-android (= ${binary:Version}),
+         libmirclient8driver-mesa | libmirclient8driver-android,
 Description: Display server for Ubuntu - client library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -180,14 +179,13 @@
  .
  Contains header files required to develop against Mir.
 
-Package: libmirclientplatform-mesa
+Package: libmirclient8driver-mesa
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libmirclientplatform
 Description: Display server for Ubuntu - client platform library for Mesa
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -195,14 +193,13 @@
  Contains the shared libraries required for the Mir clients to interact with
  the underlying hardware platform using the Mesa drivers.
 
-Package: libmirclientplatform-android
+Package: libmirclient8driver-android
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libmirclientplatform
 Description: Display server for Ubuntu - client platform library for Android
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -250,7 +247,7 @@
  .
  Contains a tool for stress testing the Mir display server
 
-Package: libmircommon1
+Package: libmircommon2
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same

=== modified file 'debian/copyright'
--- debian/copyright	2013-08-28 03:41:48 +0000
+++ debian/copyright	2014-10-10 13:43:10 +0000
@@ -50,7 +50,7 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: include/client/* include/shared/* src/client/* src/shared/* 3rd_party/android-deps/std/*
+Files: include/client/* include/common/* src/client/* src/common/* 3rd_party/android-deps/std/*
 Copyright: 2012-2013, Canonical Ltd.
 License: LGPL-3
  This program is free software: you can redistribute it and/or modify

=== modified file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	2014-04-15 15:02:05 +0000
+++ debian/create_postinst_prerm_scripts.sh	2014-10-10 13:43:10 +0000
@@ -6,7 +6,7 @@
 deb_host_arch=$1
 deb_host_multiarch=$2
 
-mir_platform_types="platformgraphics clientplatform"
+mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
 case $deb_host_arch in
     arm64)
         mir_platforms="mesa"

=== modified file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh	2014-04-15 15:02:05 +0000
+++ debian/install_ld_so_conf.sh	2014-10-10 13:43:10 +0000
@@ -5,7 +5,7 @@
 DEB_HOST_ARCH=$1
 DEB_HOST_MULTIARCH=$2
 
-mir_platform_types="platformgraphics clientplatform"
+mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
 case $DEB_HOST_ARCH in
     arm64)
         mir_platforms="mesa"

=== renamed file 'debian/libmirclientplatform-android.install' => 'debian/libmirclient8driver-android.install'
--- debian/libmirclientplatform-android.install	2014-02-14 08:43:47 +0000
+++ debian/libmirclient8driver-android.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/clientplatform/android/*
+usr/lib/*/mir/client*driver/android/*

=== renamed file 'debian/libmirclientplatform-mesa.install' => 'debian/libmirclient8driver-mesa.install'
--- debian/libmirclientplatform-mesa.install	2014-02-14 08:43:47 +0000
+++ debian/libmirclient8driver-mesa.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/clientplatform/mesa/*
+usr/lib/*/mir/client*driver/mesa/*

=== renamed file 'debian/libmircommon1.install' => 'debian/libmircommon2.install'
--- debian/libmircommon1.install	2014-08-26 14:59:57 +0000
+++ debian/libmircommon2.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmircommon.so.1
+usr/lib/*/libmircommon.so.2

=== renamed file 'debian/libmirplatform2.install' => 'debian/libmirplatform3.install'
--- debian/libmirplatform2.install	2014-08-26 14:41:22 +0000
+++ debian/libmirplatform3.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirplatform.so.2
+usr/lib/*/libmirplatform.so.3

=== renamed file 'debian/libmirplatformgraphics-android.install' => 'debian/libmirplatform3driver-android.install'
--- debian/libmirplatformgraphics-android.install	2014-02-14 08:43:47 +0000
+++ debian/libmirplatform3driver-android.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platformgraphics/android/*
+usr/lib/*/mir/platform*driver/android/*

=== renamed file 'debian/libmirplatformgraphics-mesa.install' => 'debian/libmirplatform3driver-mesa.install'
--- debian/libmirplatformgraphics-mesa.install	2014-02-14 08:43:47 +0000
+++ debian/libmirplatform3driver-mesa.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platformgraphics/mesa/*
+usr/lib/*/mir/platform*driver/mesa/*

=== renamed file 'debian/libmirserver25.install' => 'debian/libmirserver26.install'
--- debian/libmirserver25.install	2014-08-26 14:41:22 +0000
+++ debian/libmirserver26.install	2014-10-10 13:43:10 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.25
+usr/lib/*/libmirserver.so.26

=== modified file 'debian/rules'
--- debian/rules	2014-08-27 19:34:09 +0000
+++ debian/rules	2014-10-10 13:43:10 +0000
@@ -13,6 +13,9 @@
 export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
+export PLATFORM_DRIVER = platform3driver
+export CLIENT_DRIVER = client8driver
+
 %:
 	dh $@ --parallel --fail-missing
 
@@ -49,8 +52,8 @@
 
 override_dh_install:
 	dh_install --fail-missing \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirplatformgraphics.so \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirclientplatform.so
+	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so \
+	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(CLIENT_DRIVER).so
 	sh debian/install_ld_so_conf.sh $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
 
 override_dh_installdeb:

=== added file 'doc/abi_compatibility_tools.md'
--- doc/abi_compatibility_tools.md	1970-01-01 00:00:00 +0000
+++ doc/abi_compatibility_tools.md	2014-10-10 13:43:10 +0000
@@ -0,0 +1,82 @@
+Tools to track ABI compatibility {#abi_compatibility_tools}
+================================
+
+We have created a few build targets to help us track ABI compatibility across
+different Mir versions and ensure we increase the ABI version properly. These
+target use the abi-compliance-checker tool to create and check the ABI dumps.
+
+The targets are:
+
+* **make abi-dump** (or abi-dump-<library> for a specific library, e.g., abi-dump-mirclient)
+
+  Produces ABI dumps for the public versioned libraries shipped by Mir. The
+  resulting ABI dump for each library is saved as
+  <build-dir>/abi_dumps/<arch>/<libname>_next.abi.tar.gz.
+
+  By default, this target also builds the libraries needed for create the
+  requested ABI dumps. The environment variable `MIR_ABI_DUMP_PREBUILT_LIBDIR`
+  can be set **at configuration time** (i.e., when invoking cmake) to a path
+  containing pre-built libraries to use instead.
+
+  _N.B: the path set with MIR_ABI_DUMP_PREBUILT_LIBDIR is expected to contain
+  *.so files, not only *.so.X files._
+
+* **make abi-dump-base** (or abi-dump-base-<library> for a specific library,
+  e.g., abi-dump-base-mirclient)
+
+  Similar to make abi-dump, but saves the ABI dump as
+  <build-dir>/abi_dumps/<arch>/<libname>_base.abi.tar.gz (note the 'base' vs
+  'next' in the file name).
+
+* **make abi-check** (or abi-check-<library>, for a specific library)
+  e.g., abi-check-mirclient)
+
+  Produces ABI dumps (this target depends on the abi-dump target), and checks
+  them against a set of base ABI dumps. The base ABI dumps are assumed to be
+  located in <build-dir>/abi_dumps/<arch>/, i.e., where make abi-dump-base
+  would normally place the files.
+
+  The environment variable `MIR_ABI_CHECK_BASE_DIR` can be set **at
+  configuration time** (i.e., when invoking cmake) to set a different directory
+  for the base ABI dumps. The supplied directory must **not** contain the
+  <arch> portion of the path (e.g., just build_dir/abi_dumps, not
+  build_dir/abi_dumps/x86_64-linux-gnu).
+
+  Since this target depends on the abi-dump target, the
+  `MIR_ABI_DUMP_PREBUILT_LIBDIR` environment variable can be set to use
+  pre-built libraries instead of building them.
+
+Sample usage
+------------
+
+A common scenario is to check the ABI of the development version against the
+latest archive version. This is one way to perform the check:
+
+### Step 1: Produce the ABI dumps for the installed version
+
+Start by download the source corresponding to the installed version:
+
+    $ apt-get source mir
+    $ cd mir-<version>
+
+At this point we can select whether to build the libraries from scratch:
+
+    $ debian/rules override_dh_auto_configure
+
+... or to reuse the pre-built libraries, assuming they are installed (we
+need their -dev packages too!):
+
+    $ MIR_ABI_DUMP_PREBUILT_LIBDIR=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) debian/rules override_dh_auto_configure
+
+Now we can create the ABI dumps:
+
+    $ cd <build-dir> && make abi-dump-base
+
+This will create base ABI dump files which we can use in the next step.
+
+### Step 2: Check the ABI of the development version against the produced base ABI dumps
+
+    $ bzr branch lp:mir && cd mir 
+    $ MIR_ABI_CHECK_BASE_DIR=/path/to/base/abi/dumps debian/rules override_dh_auto_configure
+    $ cd <build-dir>
+    $ make abi-check

=== added file 'doc/dso_versioning_guide.md'
--- doc/dso_versioning_guide.md	1970-01-01 00:00:00 +0000
+++ doc/dso_versioning_guide.md	2014-10-10 13:43:10 +0000
@@ -0,0 +1,195 @@
+A brief guide for versioning symbols in the Mir DSOs {#dso_versioning_guide}
+====================================================
+
+So, what do I have to do?
+-------------------------
+
+There are more detailed descriptions below, but as a general rule:
+
+ - If you add a new symbol, add it to a _new_ dotted-decimal version stanza,
+   like `MIR_CLIENT_8.1`, `MIR_CLIENT_8.2`, etc.
+ - If you change the behaviour or signature of a symbol and not change SONAME,
+   see "Change symbols without breaking ABI" below
+ - If you change SONAME, collect all previous symbol version stanzas into a
+   single labelled with the new SOVER. For example, remove the `MIR_CLIENT_8`,
+   `MIR_CLIENT_8.1`, and `MIR_CLIENT_8.2` stanzas and consolidate their
+   contents into a single new `MIR_CLIENT_9` stanza.
+
+Can I have some details?
+------------------------
+
+Sure.
+
+Mir is a set of libraries, one C++ library for writing display-
+server/compositor/shells and one C library for writing clients (or, more
+usually, toolkits for clients) that use a Mir display-server for output. Mir
+also has internal dynamic libraries for platform support - drivers - and may in
+future allow the same with extensions to the core functionality. As such, the
+ABI of these interfaces is important to keep in mind.
+
+Mir uses the ELF symbol versioning support. This provides three advantages:
+
+ - Consumers of the Mir libraries can know at load time rather than symbol
+   resolution time whether the library exposes all the symbols they expect.
+ - We can drop or change the behaviour of symbols without breaking ABI by
+   exposing multiple different implementations under different versions, and
+ - We can (modulo protobuf singletons in our current implementation, and with
+   some care) safely load multiple different versions of Mir libraries into the
+   same process.
+
+When should I bump SONAME?
+--------------------------
+
+There are varying standards for when to bump SONAME. In Mir we choose to bump
+the SONAME of a library whenever we make a change that could cause a binary
+linked to the library to fail _as long as_ the binary is using only public
+interfaces and (where applicable) relying on documented behaviour. In general,
+changes that make an interface work as described by its documentation will not
+result in SONAME bumps.
+
+With that explanation, you _should_ bump SONAME when:
+
+ - You remove a public symbol from a library
+ - You change the signature of a public symbol _without_ retaining the previous
+   signature exposed under the old versioning.
+ - You change the behaviour of a public symbol _without_ retaining the previous
+   behaviour exposed with the old versioning.
+
+If you are changing the behaviour of an interface, think about whether it's easy
+to maintain the old interface in parallel. If it is, you should consider
+providing both under different versions. This should become easier over time as
+the Mir ABI becomes more stable and also more valuable over time as the Mir
+libraries become more widely used.
+
+Load-time version detection
+---------------------------
+
+When using versioned symbols the linker adds an extra, special symbol containing
+the version(s) exported from the library. Consumers of the library resolve this
+on library load. For example:
+
+    $ objdump -C -T lib/libmirclient.so
+    …
+    00000000002a2080  w   DO .data.rel.ro   0000000000000080  MIR_CLIENT_8 vtable for mir::client::DefaultConnectionConfiguration
+    0000000000000000 g    DO *ABS*  0000000000000000  MIR_CLIENT_8 MIR_CLIENT_8
+    0000000000030ed2 g    DF .text  0000000000000098  MIR_CLIENT_8 mir::client::DefaultConnectionConfiguration::the_rpc_report()
+    …
+
+This shows the special `MIR_CLIENT_8` symbol of the current libmirclient, along
+with a versioned symbol in the read-only data segment (the vtable for
+`mir::client::DefaultConnectionConfiguration`) and a versioned symbol in the
+text segment (the implementation of
+`mir::client::DefaultConnectionConfiguration::the_rpc_report()`). If a client
+needed a symbol versioned with `MIR_CLIENT_9`, it would try to resolve this at
+load time and fail, rather than failing when the symbol was first referenced -
+possibly much later, and more confusingly.
+
+### So what do I have to do to make this work?
+
+When you add new symbols, add them to a new `version` block in the relevant
+`symbols.map` file, like so:
+
+    MIR_CLIENT_8 {
+        global:
+            mir_connect_sync;
+            ...
+            /* Other symbols go here */
+    };
+
+    MIR_CLIENT_8.1 {
+        global:
+            mir_connect_new_symbol;
+        local:
+            *;
+    } MIR_CLIENT_8;
+
+Note that the script is read top to bottom; wildcards are greedily bound when
+first encountered, so to avoid surprises you should only have a wildcard in the
+final stanza.
+
+Change symbols without breaking ABI
+-----------------------------------
+
+ELF DSOs can have multiple implementations for the same symbol with different
+versions. This means that you can change the signature or behaviour of a symbol
+without breaking dependants that use the old behaviour. While there can be as
+many different implementations with different versions as you want, there can
+only be one default implementation - this is what the linker will resolve to
+when building a dependant project.
+
+Binding different implementations to the versioned symbol is done with `__asm__`
+directives in the relevant source file(s). The default implementation is
+specified with `symbol_name@@VERSION`; other versions are specified with
+`symbol_name@VERSION`.
+
+Note that this does _not_ require a change in SONAME. Binaries that have been
+linked against the old library will continue to work and resolve to the old
+implementation. Binaries linked against the new library will resolve to the new
+(default) implementation.
+
+### So, what do I have to do to make this work?
+For example, if you wanted to change the signature of
+`mir_connection_create_surface` to take a new parameter:
+
+`mir_connection_api.cpp`:
+
+    __asm__(".symver old_mir_connection_create_surface,mir_connection_create_surface@MIR_CLIENT_8");
+
+    MirWaitHandle* old_mir_connection_create_surface(...)
+    /* The old implementation */
+
+    /* The @@ specifies that this is the default version */
+    __asm__(".symver mir_connection_create_surface,mir_connection_create_surface@@@MIR_CLIENT_8.1");
+    MirWaitHandle* mir_connection_create_surface(...)
+    /* The new implementation */
+
+`symbols.map`:
+
+    MIR_CLIENT_8 {
+        global:
+            ...
+            mir_connection_create_surface;
+            ...
+    };
+
+    MIR_CLIENT_8.1 {
+        global:
+            ...
+            mir_connection_create_surface;
+            ...
+        local:
+            *;
+    } MIR_CLIENT_8;
+
+Safely load multiple versions of a library into the same address space
+----------------------------------------------------------------------
+
+This benefit is currently theoretical, as there seems to be a Protobuf singleton
+that aborts if we try this. But should that be resolved, it's theoretically
+possible and of some benefit...
+
+This situation will come about - the Qtmir plugin links to libmirclient and also
+libEGL, and libEGL will link to libmirclient itself. There is no guarantee that
+Qtmir and libEGL will link to the same SONAME, and so a process can end up
+trying to load both `libmirclient.so.8` and `libmirclient.so.9` into its address
+space. Without symbol versioning this is potentially broken - there's no
+mechanism for libEGL to only resolve symbols from `libmirclient.so.8` and Qtmir
+to only resolve symbols from `libmirclient.so.9`, so in cases where symbols have
+changed use of those symbols will break.
+
+By versioning the symbols we ensure that code always gets exactly the symbol
+implementation it expects, even when multiple library versions are loaded.
+
+### So, what do I have to do to make this work?
+
+Ensure that different implementations of a symbol have different versions.
+
+Additionally there's the complication of passing objects between different
+versions. For the moment, we can not bother trying to make this work.
+
+
+See also: 
+---------
+[Binutils manual](https://sourceware.org/binutils/docs/ld/VERSION.html)
+
+[Former glibc maintainer's DSO guide](http://www.akkadia.org/drepper/dsohowto.pdf)

=== modified file 'doc/mainpage.md'
--- doc/mainpage.md	2014-08-29 13:20:26 +0000
+++ doc/mainpage.md	2014-10-10 13:43:10 +0000
@@ -85,3 +85,5 @@
  - \ref md_HACKING "Mir hacking guide"
  - \subpage android_new_device_bringup "New android device bringup" 
  - \ref component_reports
+ - \ref dso_versioning_guide
+ - \ref abi_compatibility_tools

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-08-08 17:04:36 +0000
+++ examples/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -1,12 +1,14 @@
 
-#its a bit troubling that these need to be included for demo_input_filter
-include_directories(${MIR_3RD_PARTY_INCLUDE_DIRECTORIES})
-include_directories(${MIR_ANDROID_INCLUDE_DIRECTORIES})
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
 
 add_library(eglapp STATIC
   eglapp.c
 )
+
+add_library(exampleserverconfig STATIC
+  server_configuration.cpp
+)
+
 target_link_libraries(eglapp
   mirclient
   ${EGL_LIBRARIES}
@@ -121,35 +123,13 @@
     ${Boost_LIBRARIES}
 )
 
-add_executable(mir_demo_standalone_render_overlays
-    render_overlays.cpp
-)
-
-target_link_libraries(mir_demo_standalone_render_overlays
-    mirserver
-    mirtestdraw
-    mircommon
-)
-
-set(RENDER_SURFACES_SOURCES
-    render_surfaces.cpp
-    buffer_render_target.cpp
-    image_renderer.cpp
-    server_configuration.cpp
-)
-add_executable(mir_demo_standalone_render_surfaces ${RENDER_SURFACES_SOURCES})
-target_link_libraries(mir_demo_standalone_render_surfaces
-    mirserver
-    ${Boost_LIBRARIES}
-)
-
 add_executable(mir_demo_standalone_input_filter
   demo_input_filter.cpp
-  server_configuration.cpp
 )
 
 target_link_libraries(mir_demo_standalone_input_filter
   mirserver
+  exampleserverconfig
 )
 
 set (INSTALL_DEMOS
@@ -159,6 +139,7 @@
   mir_demo_client_eglflash
   mir_demo_client_egltriangle
   mir_demo_client_eglplasma
+  mir_demo_client_eglcounter
   mir_demo_client_fingerpaint
   mir_demo_client_multiwin
   mir_demo_client_display_config
@@ -166,23 +147,18 @@
   mir_demo_client_prompt_session
   mir_demo_standalone_input_filter
   mir_demo_standalone_render_to_fb
-  mir_demo_standalone_render_surfaces
 )
 
-add_subdirectory(demo-inprocess-surface-client)
-add_subdirectory(demo-shell)
-add_subdirectory(testdraw)
-
 install(TARGETS ${INSTALL_DEMOS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(mir_demo_server_basic
   basic_server.cpp
   basic_server_configuration.cpp
-  server_configuration.cpp
 )
 
 target_link_libraries(mir_demo_server_basic
   mirserver
+  exampleserverconfig
   ${Boost_LIBRARIES}
 )
 
@@ -201,14 +177,30 @@
   translucent_server_configuration.cpp
   pixel_format_selector.cpp
   basic_server_configuration.cpp
-  server_configuration.cpp
 )
 
 target_link_libraries(mir_demo_server_translucent
   mirserver
+  exampleserverconfig
   ${Boost_LIBRARIES}
 )
 
 install(TARGETS mir_demo_server_translucent
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
+
+add_executable(mir_demo_standalone_render_overlays
+    render_overlays.cpp
+)
+
+target_link_libraries(mir_demo_standalone_render_overlays
+    mirserver
+    mirtestdraw
+    mircommon
+)
+
+install(TARGETS mir_demo_standalone_render_overlays
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+add_subdirectory(testdraw/)

=== modified file 'examples/basic_server_configuration.cpp'
--- examples/basic_server_configuration.cpp	2014-03-06 06:05:17 +0000
+++ examples/basic_server_configuration.cpp	2014-10-10 13:43:10 +0000
@@ -20,7 +20,6 @@
 #include "mir/options/default_configuration.h"
 
 #include "mir/abnormal_exit.h"
-#include "mir/frontend/connector.h"
 #include "mir/options/option.h"
 
 #include <cstdlib>
@@ -54,9 +53,6 @@
 {
     if (the_options()->is_set(launch_child_opt))
     {
-        char buffer[128] = {0};
-        sprintf(buffer, "fd://%d", the_connector()->client_socket_fd());
-        setenv("MIR_SOCKET", buffer, 1);
         auto ignore = std::system((the_options()->get<std::string>(launch_child_opt) + "&").c_str());
         (void)ignore;
     }

=== modified file 'examples/demo_input_filter.cpp'
--- examples/demo_input_filter.cpp	2014-03-06 06:05:17 +0000
+++ examples/demo_input_filter.cpp	2014-10-10 13:43:10 +0000
@@ -84,7 +84,6 @@
 }
 
 
-#include <std/MirLog.h>
 void my_write_to_log(int /*prio*/, char const* buffer)
 {
     printf("%s\n", buffer);
@@ -94,7 +93,6 @@
 try
 {
     DemoServerConfiguration config(argc, argv);
-    mir::write_to_log = my_write_to_log;
 
     mir::run_mir(config, [](mir::DisplayServer&) {/* empty init */});
     return 0;

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2014-07-08 16:27:24 +0000
+++ examples/eglapp.c	2014-10-10 13:43:10 +0000
@@ -70,12 +70,6 @@
 
 void mir_eglapp_swap_buffers(void)
 {
-    static time_t lasttime = 0;
-    static int lastcount = 0;
-    static int count = 0;
-    time_t now = time(NULL);
-    time_t dtime;
-    int dcount;
     EGLint width, height;
 
     if (!running)
@@ -83,16 +77,6 @@
 
     eglSwapBuffers(egldisplay, eglsurface);
 
-    count++;
-    dcount = count - lastcount;
-    dtime = now - lasttime;
-    if (dtime)
-    {
-        printf("%d FPS\n", dcount);
-        lasttime = now;
-        lastcount = count;
-    }
-
     /*
      * Querying the surface (actually the current buffer) dimensions here is
      * the only truly safe way to be sure that the dimensions we think we
@@ -404,6 +388,7 @@
 
     signal(SIGINT, shutdown);
     signal(SIGTERM, shutdown);
+    signal(SIGHUP, shutdown);
 
     *width = surfaceparm.width;
     *height = surfaceparm.height;

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2014-07-21 03:35:31 +0000
+++ examples/fingerpaint.c	2014-10-10 13:43:10 +0000
@@ -403,6 +403,7 @@
         {
             signal(SIGINT, shutdown);
             signal(SIGTERM, shutdown);
+            signal(SIGHUP, shutdown);
         
             clear_region(&canvas, &background);
             redraw(surf, &canvas);

=== modified file 'examples/flicker.c'
--- examples/flicker.c	2014-03-06 06:05:17 +0000
+++ examples/flicker.c	2014-10-10 13:43:10 +0000
@@ -156,10 +156,6 @@
     uint32_t pattern[2] = {0};
     fill_pattern(pattern, pixel_format);
 
-    time_t lasttime = 0;
-    int lastcount = 0;
-    int count = 0;
-
     MirGraphicsRegion graphics_region;
     int i=0;
     while (1)
@@ -168,15 +164,6 @@
         i++;
         render_pattern(&graphics_region, pattern[i & 1]);
         mir_surface_swap_buffers_sync(surface);
-
-        count++;
-        time_t now = time(NULL);
-        if (now != lasttime)
-        {
-            printf("%d FPS\n", count - lastcount);
-            lasttime = now;
-            lastcount = count;
-        }
     }
 
     mir_surface_release_sync(surface);

=== modified file 'examples/multiwin.c'
--- examples/multiwin.c	2014-07-11 03:33:03 +0000
+++ examples/multiwin.c	2014-10-10 13:43:10 +0000
@@ -218,6 +218,7 @@
 
     signal(SIGINT, shutdown);
     signal(SIGTERM, shutdown);
+    signal(SIGHUP, shutdown);
 
     while (running)
     {

=== modified file 'examples/pixel_format_selector.cpp'
--- examples/pixel_format_selector.cpp	2014-03-26 05:48:59 +0000
+++ examples/pixel_format_selector.cpp	2014-10-10 13:43:10 +0000
@@ -19,11 +19,18 @@
 #include "pixel_format_selector.h"
 
 #include "mir/graphics/display_configuration.h"
-#include "mir/graphics/pixel_format_utils.h"
 
 #include <stdexcept>
 #include <algorithm>
 
+namespace
+{
+bool contains_alpha(MirPixelFormat format)
+{
+    return (format == mir_pixel_format_abgr_8888 ||
+            format == mir_pixel_format_argb_8888);
+}
+}
 
 namespace mir
 {
@@ -48,7 +55,7 @@
                                       conf_output.pixel_formats.end(),
                                       [&](MirPixelFormat format) -> bool
                                           {
-                                              return graphics::contains_alpha(format) == with_alpha;
+                                              return contains_alpha(format) == with_alpha;
                                           }
                                      );
 

=== modified file 'examples/progressbar.c'
--- examples/progressbar.c	2014-03-06 06:05:17 +0000
+++ examples/progressbar.c	2014-10-10 13:43:10 +0000
@@ -268,6 +268,7 @@
 
             signal(SIGINT, shutdown);
             signal(SIGTERM, shutdown);
+            signal(SIGHUP, shutdown);
         
             while (running)
             {

=== modified file 'examples/render_overlays.cpp'
--- examples/render_overlays.cpp	2014-07-09 07:54:29 +0000
+++ examples/render_overlays.cpp	2014-10-10 13:43:10 +0000
@@ -115,11 +115,6 @@
         return client->last_rendered();
     }
 
-    bool alpha_enabled() const override
-    {
-        return false;
-    }
-
     geom::Rectangle screen_position() const override
     {
         return position;

=== modified file 'examples/testdraw/mesa_graphics_region_factory.cpp'
--- examples/testdraw/mesa_graphics_region_factory.cpp	2014-07-22 13:42:01 +0000
+++ examples/testdraw/mesa_graphics_region_factory.cpp	2014-10-10 13:43:10 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "examples/testdraw/graphics_region_factory.h"
+#include "graphics_region_factory.h"
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 

=== renamed directory 'include/shared' => 'include/common'
=== modified file 'include/common/mir/geometry/rectangle.h'
--- include/shared/mir/geometry/rectangle.h	2014-07-21 03:35:31 +0000
+++ include/common/mir/geometry/rectangle.h	2014-10-10 13:43:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_GEOMETRY_RECTANGLE_H_
 #define MIR_GEOMETRY_RECTANGLE_H_
 
-#include "point.h"
+#include "mir/geometry/point.h"
 #include "size.h"
 
 #include <iosfwd>

=== modified file 'include/common/mir/geometry/rectangles.h'
--- include/shared/mir/geometry/rectangles.h	2013-08-28 03:41:48 +0000
+++ include/common/mir/geometry/rectangles.h	2014-10-10 13:43:10 +0000
@@ -14,13 +14,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Alexandros Frantzis <[e-mail]>
+ *
+ * XXX This header is only used externally in one location in QtMir. It could
+ *     possibly be made private with only minor changes.
  */
 
 #ifndef MIR_GEOMETRY_RECTANGLES_H_
 #define MIR_GEOMETRY_RECTANGLES_H_
 
-#include "point.h"
-#include "rectangle.h"
+#include "mir/geometry/point.h"
+#include "mir/geometry/rectangle.h"
 
 #include <vector>
 #include <initializer_list>

=== modified file 'include/common/mir/geometry/size.h'
--- include/shared/mir/geometry/size.h	2014-03-06 06:05:17 +0000
+++ include/common/mir/geometry/size.h	2014-10-10 13:43:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_GEOMETRY_SIZE_H_
 #define MIR_GEOMETRY_SIZE_H_
 
-#include "dimensions.h"
+#include "mir/geometry/dimensions.h"
 #include <iosfwd>
 
 namespace mir

=== added directory 'include/common/mir/time'
=== renamed file 'include/server/mir/time/clock.h' => 'include/common/mir/time/clock.h'
--- include/server/mir/time/clock.h	2014-03-06 06:05:17 +0000
+++ include/common/mir/time/clock.h	2014-10-10 13:43:10 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2012 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,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voss <[e-mail]>
@@ -27,6 +27,7 @@
 {
 
 typedef std::chrono::high_resolution_clock::time_point Timestamp;
+typedef std::chrono::high_resolution_clock::duration Duration;
 
 class Clock
 {

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2014-06-02 17:07:02 +0000
+++ include/platform/mir/graphics/display_configuration.h	2014-10-10 13:43:10 +0000
@@ -23,7 +23,6 @@
 #include "mir/geometry/size.h"
 #include "mir/geometry/rectangle.h"
 #include "mir/geometry/point.h"
-#include "mir/graphics/pixel_format_utils.h"
 #include "mir_toolkit/common.h"
 
 #include <functional>

=== modified file 'include/platform/mir/graphics/native_platform.h'
--- include/platform/mir/graphics/native_platform.h	2014-06-16 23:37:57 +0000
+++ include/platform/mir/graphics/native_platform.h	2014-10-10 13:43:10 +0000
@@ -19,6 +19,7 @@
 #define MIR_GRAPHICS_NATIVE_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
+#include "mir/graphics/platform_ipc_operations.h"
 #include <memory>
 #include <functional>
 
@@ -34,8 +35,9 @@
 class BufferInitializer;
 class PlatformIPCPackage;
 class InternalClient;
-class BufferIPCPacker;
+class BufferIpcMessage;
 class Buffer;
+class BufferWriter;
 class DisplayReport;
 class NestedContext;
 
@@ -49,15 +51,17 @@
     virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
         std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
 
-    virtual std::shared_ptr<PlatformIPCPackage> get_ipc_package() = 0;
+    virtual std::shared_ptr<PlatformIPCPackage> connection_ipc_package() = 0;
 
     virtual std::shared_ptr<InternalClient> create_internal_client() = 0;
 
     virtual void fill_buffer_package(
-        BufferIPCPacker* packer,
+        BufferIpcMessage* message,
         Buffer const* buffer,
         BufferIpcMsgType msg_type) const = 0;
 
+    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
+
     virtual ~NativePlatform() = default;
     NativePlatform(NativePlatform const&) = delete;
     NativePlatform& operator=(NativePlatform const&) = delete;

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2014-06-19 15:44:20 +0000
+++ include/platform/mir/graphics/platform.h	2014-10-10 13:43:10 +0000
@@ -42,10 +42,8 @@
 /// the graphics environment.
 namespace graphics
 {
-class BufferIPCPacker;
 class Buffer;
 class Display;
-struct PlatformIPCPackage;
 class BufferInitializer;
 class InternalClient;
 class DisplayReport;
@@ -53,12 +51,9 @@
 class GraphicBufferAllocator;
 class GLConfig;
 class GLProgramFactory;
+class PlatformIpcOperations;
+class BufferWriter;
 
-enum class BufferIpcMsgType
-{
-    full_msg, //pack the full ipc representation of the buffer
-    update_msg //assume the client has a full representation, and pack only updates to the buffer 
-};
 /**
  * \defgroup platform_enablement Mir platform enablement
  *
@@ -86,6 +81,8 @@
 
     virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
         std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
+    
+    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
 
     /**
      * Creates the display subsystem.
@@ -96,28 +93,10 @@
         std::shared_ptr<GLConfig> const& gl_config) = 0;
 
     /**
-     * Gets the IPC package for the platform.
-     *
-     * The IPC package will be sent to clients when they connect.
-     */
-    virtual std::shared_ptr<PlatformIPCPackage> get_ipc_package() = 0;
-
-    /**
-     * Arranges the IPC package for a buffer that is to be sent through
-     * the frontend. This should be called every time a buffer is to be
-     * sent cross-process.
-     *
-     * The Buffer IPC package will be sent to clients when receiving a buffer.
-     * The implementation must use the provided packer object to perform the packing.
-     *
-     * \param [in] packer   the object providing the packing functionality
-     * \param [in] buffer   the buffer to fill the IPC package for
-     * \param [in] ipc_type what sort of ipc message is needed
-     */
-    virtual void fill_buffer_package(
-        BufferIPCPacker* packer,
-        Buffer const* buffer,
-        BufferIpcMsgType msg_type) const = 0;
+     * Creates an object capable of doing platform specific processing of buffers
+     * before they are sent or after they are recieved accross IPC
+     */
+    virtual std::shared_ptr<PlatformIpcOperations> make_ipc_operations() const = 0;
 
     /**
      * Creates the in-process client support object.

=== added file 'include/platform/mir/graphics/platform_ipc_operations.h'
--- include/platform/mir/graphics/platform_ipc_operations.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/platform_ipc_operations.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_PLATFORM_IPC_OPERATIONS_H_
+#define MIR_GRAPHICS_PLATFORM_IPC_OPERATIONS_H_
+
+#include <memory>
+
+namespace mir
+{
+namespace graphics
+{
+enum class BufferIpcMsgType
+{
+    full_msg, //pack the full ipc representation of the buffer
+    update_msg //assume the client has a full representation, and pack only updates to the buffer 
+};
+class Buffer;
+class BufferIpcMessage;
+struct PlatformIPCPackage;
+
+class PlatformIpcOperations
+{
+public:
+    virtual ~PlatformIpcOperations() = default;
+    /**
+     * Arranges the IPC package for a buffer that is to be sent through
+     * the frontend from server to client. This should be called every
+     * time a buffer is to be sent cross-process.
+     *
+     * Pack the platform specific contents of Buffer into BufferIpcMessage for sending to the client
+     *
+     * \param [in] message   the message that will be sent
+     * \param [in] buffer    the buffer to be put in the message
+     * \param [in] ipc_type  what sort of ipc message is needed
+     */
+    virtual void pack_buffer(BufferIpcMessage& message, Buffer const& buffer, BufferIpcMsgType msg_type) const = 0;
+
+    /**
+     * Arranges the IPC package for a buffer that was sent over IPC
+     * client to server. This must be called every time a buffer is
+     * received, as some platform specific processing has to be done on
+     * the incoming buffer.
+     * \param [in] message   the message that was sent to the server
+     * \param [in] buffer    the buffer associated with the message
+     */
+    virtual void unpack_buffer(BufferIpcMessage& message, Buffer const& buffer) const = 0;
+
+    /**
+     * Gets the connection package for the platform.
+     *
+     * The IPC package will be sent to clients when they connect.
+     */
+    virtual std::shared_ptr<PlatformIPCPackage> connection_ipc_package() = 0;
+
+protected:
+    PlatformIpcOperations() = default;
+    PlatformIpcOperations(PlatformIpcOperations const&) = delete;
+    PlatformIpcOperations& operator=(PlatformIpcOperations const&) = delete;
+
+};
+
+}
+}
+
+#endif /* MIR_GRAPHICS_BUFFER_IPC_PACKER_H_ */

=== modified file 'include/platform/mir/graphics/renderable.h'
--- include/platform/mir/graphics/renderable.h	2014-07-09 07:54:29 +0000
+++ include/platform/mir/graphics/renderable.h	2014-10-10 13:43:10 +0000
@@ -48,7 +48,6 @@
      */
     virtual std::shared_ptr<Buffer> buffer() const = 0;
 
-    virtual bool alpha_enabled() const = 0;
     virtual geometry::Rectangle screen_position() const = 0;
 
     // These are from the old CompositingCriteria. There is a little bit

=== modified file 'include/platform/mir/options/configuration.h'
--- include/platform/mir/options/configuration.h	2014-08-08 17:06:49 +0000
+++ include/platform/mir/options/configuration.h	2014-10-10 13:43:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_OPTIONS_CONFIGURATION_H_
 #define MIR_OPTIONS_CONFIGURATION_H_
 
-#include "mir/options/program_option.h"
+#include "mir/options/option.h"
 
 #include <memory>
 
@@ -41,6 +41,7 @@
 extern char const* const input_report_opt;
 extern char const* const host_socket_opt;
 extern char const* const frontend_threads_opt;
+extern char const* const touchspots_opt;
 extern char const* const fatal_abort_opt;
 
 extern char const* const name_opt;

=== modified file 'include/platform/mir/options/default_configuration.h'
--- include/platform/mir/options/default_configuration.h	2014-08-08 17:03:03 +0000
+++ include/platform/mir/options/default_configuration.h	2014-10-10 13:43:10 +0000
@@ -20,7 +20,8 @@
 #define MIR_OPTIONS_DEFAULT_CONFIGURATION_H_
 
 #include "mir/options/configuration.h"
-
+#include "mir/options/program_option.h"
+#include <boost/program_options/options_description.hpp>
 
 namespace mir
 {

=== modified file 'include/platform/mir/options/program_option.h'
--- include/platform/mir/options/program_option.h	2014-08-08 17:03:03 +0000
+++ include/platform/mir/options/program_option.h	2014-10-10 13:43:10 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_OPTIONS_PROGRAM_OPTION_H_
 #define MIR_OPTIONS_PROGRAM_OPTION_H_
 
-#include "option.h"
+#include "mir/options/option.h"
 
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/options_description.hpp>

=== removed directory 'include/platform/mir/udev'
=== modified file 'include/server/mir/compositor/scene_element.h'
--- include/server/mir/compositor/scene_element.h	2014-06-20 17:57:16 +0000
+++ include/server/mir/compositor/scene_element.h	2014-10-10 13:43:10 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_COMPOSITOR_SCENE_ELEMENT_H_
 #define MIR_COMPOSITOR_SCENE_ELEMENT_H_
 
-#include "compositor_id.h"
+#include "mir/compositor/compositor_id.h"
 #include <memory>
 
 namespace mir
@@ -39,6 +39,10 @@
     virtual std::shared_ptr<graphics::Renderable> renderable() const = 0;
     virtual void rendered_in(CompositorID cid) = 0;
     virtual void occluded_in(CompositorID cid) = 0;
+    
+    // Query whether the SceneElement represents a window-surface, which at the discretion of the compositor
+    // may be eligible for window decoration.
+    virtual bool is_a_surface() const = 0;
 
 protected:
     SceneElement() = default;

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-08-08 17:06:49 +0000
+++ include/server/mir/default_server_configuration.h	2014-10-10 13:43:10 +0000
@@ -105,6 +105,7 @@
 class BufferInitializer;
 class DisplayReport;
 class GraphicBufferAllocator;
+class BufferWriter;
 class Cursor;
 class CursorImage;
 class GLConfig;
@@ -114,7 +115,7 @@
 namespace input
 {
 class InputReport;
-class InputTargets;
+class Scene;
 class InputManager;
 class CompositeEventFilter;
 class InputChannelFactory;
@@ -214,6 +215,7 @@
      * dependencies of compositor on the rest of the Mir
      *  @{ */
     virtual std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator();
+    virtual std::shared_ptr<graphics::BufferWriter> the_buffer_writer();
     virtual std::shared_ptr<compositor::Scene>                  the_scene();
     virtual std::shared_ptr<compositor::FrameDroppingPolicyFactory> the_frame_dropping_policy_factory();
     /** @} */
@@ -291,7 +293,7 @@
     virtual std::shared_ptr<input::InputReport> the_input_report();
     virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
     virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
-    virtual std::shared_ptr<input::InputTargets>  the_input_targets();
+    virtual std::shared_ptr<input::Scene>  the_input_scene();
     virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
     virtual std::shared_ptr<input::TouchVisualizer> the_touch_visualizer();
     virtual std::shared_ptr<input::InputRegion>    the_input_region();
@@ -359,6 +361,7 @@
     CachedPtr<graphics::NativePlatform>    graphics_native_platform;
     CachedPtr<graphics::BufferInitializer> buffer_initializer;
     CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
+    CachedPtr<graphics::BufferWriter> buffer_writer;
     CachedPtr<graphics::Display>      display;
     CachedPtr<graphics::Cursor>       cursor;
     CachedPtr<graphics::CursorImage>  default_cursor_image;

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2014-07-21 03:35:31 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2014-10-10 13:43:10 +0000
@@ -40,6 +40,8 @@
 
     virtual void session_next_buffer_called(std::string const& app_name) = 0;
 
+    virtual void session_exchange_buffer_called(std::string const& app_name) = 0;
+
     virtual void session_release_surface_called(std::string const& app_name) = 0;
 
     virtual void session_disconnect_called(std::string const& app_name) = 0;

=== removed directory 'include/server/mir/graphics'
=== removed directory 'include/server/mir/input/android'
=== modified file 'include/server/mir/input/cursor_listener.h'
--- include/server/mir/input/cursor_listener.h	2013-04-30 20:44:31 +0000
+++ include/server/mir/input/cursor_listener.h	2014-10-10 13:43:10 +0000
@@ -35,8 +35,8 @@
 
 protected:
     CursorListener() = default;
-    CursorListener(const CursorListener&) = delete;
-    CursorListener& operator=(const CursorListener&) = delete;
+    CursorListener(CursorListener const&) = delete;
+    CursorListener& operator=(CursorListener const&) = delete;
 };
 
 }

=== modified file 'include/server/mir/input/touch_visualizer.h'
--- include/server/mir/input/touch_visualizer.h	2014-08-08 17:01:17 +0000
+++ include/server/mir/input/touch_visualizer.h	2014-10-10 13:43:10 +0000
@@ -39,11 +39,15 @@
     {
         geometry::Point touch_location;
         
-        // If pressure is non-zero, it indicates a press at the spot, as
-        // opposed to a hover.
+        // If pressure is zero, the touch-point can be interpreted as a hover.
         float pressure;
     };
     
+    // Toggle visualization of touches
+    virtual void enable() = 0;
+    virtual void disable() = 0;
+    
+    // Visualize a given set of touches statelessly.
     virtual void visualize_touches(std::vector<Spot> const& touches) = 0;
 
 protected:

=== removed directory 'include/server/mir/logging'
=== removed directory 'include/server/mir/report'
=== removed directory 'include/server/mir/report/logging'
=== modified file 'include/server/mir/scene/observer.h'
--- include/server/mir/scene/observer.h	2014-06-02 17:07:02 +0000
+++ include/server/mir/scene/observer.h	2014-10-10 13:43:10 +0000
@@ -36,6 +36,10 @@
     virtual void surface_added(Surface* surface) = 0;
     virtual void surface_removed(Surface* surface) = 0;
     virtual void surfaces_reordered() = 0;
+    
+    // Used to indicate the scene has changed in some way beyond the present surfaces
+    // and will require full recomposition.
+    virtual void scene_changed() = 0;
 
     // Called at observer registration to notify of already existing surfaces.
     virtual void surface_exists(Surface* surface) = 0;

=== removed directory 'include/server/mir/thread'
=== removed file 'include/server/mir/thread/basic_thread_pool.h'
--- include/server/mir/thread/basic_thread_pool.h	2014-09-09 18:14:19 +0000
+++ include/server/mir/thread/basic_thread_pool.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright © 2014 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alberto Aguirre <[e-mail]>
- */
-
-#ifndef MIR_THREAD_BASIC_THREAD_POOL_H_
-#define MIR_THREAD_BASIC_THREAD_POOL_H_
-
-#include <functional>
-#include <future>
-#include <vector>
-#include <memory>
-#include <mutex>
-
-namespace mir
-{
-namespace thread
-{
-
-class WorkerThread;
-class BasicThreadPool
-{
-public:
-    BasicThreadPool(int min_threads);
-    ~BasicThreadPool();
-
-    std::future<void> run(std::function<void()> const& task);
-
-    typedef void const* TaskId;
-    std::future<void> run(std::function<void()> const& task, TaskId id);
-
-    void shrink();
-
-private:
-    BasicThreadPool(BasicThreadPool const&) = delete;
-    BasicThreadPool& operator=(BasicThreadPool const&) = delete;
-
-    std::future<void> run(WorkerThread* t, std::function<void()> const& task, TaskId id);
-    WorkerThread *find_thread_by(TaskId id);
-    WorkerThread *find_idle_thread();
-
-    std::mutex mutex;
-    int const min_threads;
-    std::vector<std::unique_ptr<WorkerThread>> threads;
-};
-
-}
-}
-
-#endif

=== removed directory 'include/shared/mir/frontend'
=== removed directory 'include/shared/mir/graphics/android'
=== removed directory 'include/shared/mir/input/android'
=== removed directory 'include/shared/mir/logging'
=== removed directory 'include/shared/mir/protobuf'
=== removed directory 'include/shared/mir/raii'
=== removed directory 'include/shared/mir/report'
=== removed directory 'include/shared/mir/report/lttng'
=== removed directory 'include/shared/mir/udev'
=== removed file 'include/test/mir_test_framework/input_testing_client_configuration.h'
--- include/test/mir_test_framework/input_testing_client_configuration.h	2014-05-27 10:35:07 +0000
+++ include/test/mir_test_framework/input_testing_client_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright © 2013 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>n
- */
-
-#ifndef MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION
-#define MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION
-
-#include "mir_test_framework/testing_client_configuration.h"
-#include "mir_test/barrier.h"
-
-#include <mir_toolkit/event.h>
-
-#include <gmock/gmock.h>
-
-#include <string>
-
-namespace mir { namespace test  { class WaitCondition; } }
-namespace mir_test_framework
-{
-
-/// A fixture to be used with InputTestingServerConfiguration for input acceptance testing scenarios.
-/// By default, the client will connect and a surface will be created.
-/// The framework ensures the server will not send events before client is ready through CrossProcessSync.
-class InputTestingClientConfiguration : public TestingClientConfiguration
-{
-public:
-    InputTestingClientConfiguration(std::string const& client_name, mir::test::Barrier& input_cb_setup_fence);
-    virtual ~InputTestingClientConfiguration() = default;
-
-    void exec();
-
-    struct MockInputHandler
-    {
-        MOCK_METHOD1(handle_input, void(MirEvent const*));
-    };
-    // This function will be called at an appropriate time for input expectations to be set.
-    // on handler. It is expected that mt::WakeUp(all_events_received) will be triggered by
-    // the last expectation, as this is what triggers the verification of the Mock and 
-    // termination of the testing client.
-    virtual void expect_input(MockInputHandler &handler, mir::test::WaitCondition& all_events_received) = 0;
-
-    // This fixture is intended to be used with InputTestingServer
-    // which allows for setting surface sizes as part of the
-    // input-testing shell.
-    static int const surface_width = 100;
-    static int const surface_height = 100;
-
-    std::string connect_string;
-private:
-    std::string const client_name;
-    mir::test::Barrier& input_cb_setup_fence;
-};
-
-}
-#endif /* MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION */

=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-08-27 19:35:36 +0000
+++ platform-ABI-sha1sums	2014-10-10 13:43:10 +0000
@@ -1,89 +1,46 @@
+3329ada91412ded2f127aee9a92f065e57b81cb2  include/common/mir/cached_ptr.h
+82ff9499ef62739379616e02164dc98f9914c329  include/common/mir/fd.h
+b399dc08514751c86e23824612a52378dd9b1e23  include/common/mir/geometry/dimensions.h
+d954464ef2d20c2876db68c94512a443186da09b  include/common/mir/geometry/point.h
+dc7c62d3916eec025e8e7deaf57e06077ce38928  include/common/mir/geometry/rectangle.h
[phone]e3ca4f5fa4e7db025d0978d2bbef06  include/common/mir/geometry/rectangles.h
+42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
+e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
+dcf8b8982f138bdde39a241825c610e955cd5e33  include/common/mir/input/input_platform.h
+208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
+be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613  include/common/mir/time/clock.h
+9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
+183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
+fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
+bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
+99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a  include/platform/mir/abnormal_exit.h
-498d728ea1052cb6cadb9de7828ae48eb5a201df  include/platform/mir/emergency_cleanup_registry.h
 8f47feb6d983aa5c9ebd58e9d1524361c9f5e651  include/platform/mir/fatal.h
 e9e97ba2db4c6aeb269630547bf5a558da17d896  include/platform/mir/graphics/basic_platform.h
 05c154bbfa81e16795c18f27000711741d5592e0  include/platform/mir/graphics/buffer_basic.h
 54328767ca330ba166160a486bd0688406ab0222  include/platform/mir/graphics/buffer.h
 5875f13f5b029a4b5291e9baec3ae434b72be27c  include/platform/mir/graphics/buffer_id.h
-827cbc0ecbcea21dd794ab4b8119a5710bb266d3  include/platform/mir/graphics/buffer_initializer.h
-d7507a326f8cfcc4707c1eb28cf7b666420f92fb  include/platform/mir/graphics/buffer_ipc_packer.h
 748f5c2aab11189aa02c4a89ab900561548e7304  include/platform/mir/graphics/buffer_properties.h
 ffa857f624f1c8cbd50a190107137346fc3204d6  include/platform/mir/graphics/cursor.h
 fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578  include/platform/mir/graphics/cursor_image.h
 986f5d0d8ea2c6a42cc320f468e682f81fec46ae  include/platform/mir/graphics/display_buffer.h
-4a55160c58cb4f82316ec9f5892fa99a00587963  include/platform/mir/graphics/display_configuration.h
+f53a0020b8f1bd4a941a201eb26271cffee0a7dd  include/platform/mir/graphics/display_configuration.h
 6fe08da318c920b0d20ea8b8f560f5ac7ed389fe  include/platform/mir/graphics/display_configuration_policy.h
 41ea906d208b761e3d5d5056095de9de2d4ffa17  include/platform/mir/graphics/display.h
-5b2618fba338ea028c27df77d05b033dd8a57818  include/platform/mir/graphics/display_report.h
-fc9b3cfa80a1ac57dedb4e8d180c62ae15c0ace8  include/platform/mir/graphics/drm_authenticator.h
-9fe4e4b1572cec5fda7660480979b13aaf37f901  include/platform/mir/graphics/egl_extensions.h
-17bfa016a2a9d6672bfd335a4c1b147c2ddca5b5  include/platform/mir/graphics/egl_resources.h
 815405c5aee8000bc18c1c9480bac620a451b416  include/platform/mir/graphics/event_handler_register.h
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
-b8ceb6c770340f63e0114496d4ad102d787fa6f5  include/platform/mir/graphics/gl_primitive.h
-06c153f3e867812a42f41d0fe288524d91d183a6  include/platform/mir/graphics/gl_program_factory.h
-f62525771ca2612959ff88498883630458513235  include/platform/mir/graphics/gl_program.h
-7e0da0260a80a1b074b994293d5808c7330638da  include/platform/mir/graphics/gl_texture_cache.h
-6c1d54bc0a77a1e67c6beff097dc4f1527010e67  include/platform/mir/graphics/gl_texture.h
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
 f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
-222160aa8176a111ce05711d90a372c38591ccdb  include/platform/mir/graphics/native_platform.h
-590572a9d86a9481b4531ad44414c6f76352fe7a  include/platform/mir/graphics/nested_context.h
-27807b8ba288590f3749cfb32512eda4d0de6c7d  include/platform/mir/graphics/overlapping_output_grouping.h
-32c70ee44b8dc9372dec0c54471aa8d831adcb1c  include/platform/mir/graphics/pixel_format_utils.h
-656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
+b4aaa941df9c0a6f9342629b26542700876f3aaa  include/platform/mir/graphics/native_platform.h
+f47dac961f060eb29a44ed3c8c18a49a3d353bb1  include/platform/mir/graphics/platform.h
+1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
 9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
-15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-4b640ec72b04cc2de7671afd7c78942fb9e775a7  include/platform/mir/graphics/tessellation_helpers.h
-8f172d1449f9aa7bbcb1eebb463b0cab4cab38fe  include/platform/mir/options/configuration.h
-3a961c5e85b0b9d20eadddd938677776288c06c6  include/platform/mir/options/default_configuration.h
+84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
+f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
+47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
-1133726e66a246bd3988616e205e186278a64731  include/platform/mir/options/program_option.h
-5d0213652adc4821a2a180ced74808ca0bbf2c45  include/platform/mir/shared_library_loader.h
-6ad1f35928df9ffd917fbf17cbcdd533a8b5b27d  include/shared/mir/basic_observers.h
-3329ada91412ded2f127aee9a92f065e57b81cb2  include/shared/mir/cached_ptr.h
-691278e8b89265fa7f11db78dc8a9b530cef6e99  include/shared/mir/default_configuration.h
-82ff9499ef62739379616e02164dc98f9914c329  include/shared/mir/fd.h
-15dd88e8de39d195c3a4e7c166678cd9b6951994  include/shared/mir/frontend/client_constants.h
-b399dc08514751c86e23824612a52378dd9b1e23  include/shared/mir/geometry/dimensions.h
-7031270546292995d38e6de165600db21ff51c68  include/shared/mir/geometry/displacement.h
-283cb0ecf9d544300681fc2ab86bec568e2d20ff  include/shared/mir/geometry/forward.h
-bfd87d9fb800c1c1b528c00185570abac569caf2  include/shared/mir/geometry/length.h
-d954464ef2d20c2876db68c94512a443186da09b  include/shared/mir/geometry/point.h
-65148c6d432950fb07589b6348afc4aab8b5079a  include/shared/mir/geometry/rectangle.h
-1b6632a6ee0a8758201739fb16c4eb1ce196344a  include/shared/mir/geometry/rectangles.h
-7d3ede2c85e9febc1c4951a342939e3a6dacb99e  include/shared/mir/geometry/size.h
-76d576231de039e25f4cf30829504552dcb9fc53  include/shared/mir/graphics/android/android_driver_interpreter.h
-c02a1e68d5a8ccfd8710440e166c9e32bc974f1e  include/shared/mir/graphics/android/android_native_buffer.h
-05e7b043ccf49582a78e880967b3bc1f3512e010  include/shared/mir/graphics/android/fence.h
-0168b68dea12355c22cd39fbfc50bca0e21fd6e5  include/shared/mir/graphics/android/mir_native_window.h
-8f6d9dc681f3e0d212e6a74f9170ea7b3eb2607f  include/shared/mir/graphics/android/native_buffer.h
-424d1ff5b9bc299fc43f0afe961c4dafc3227992  include/shared/mir/graphics/android/sync_fence.h
-e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/shared/mir/graphics/native_buffer.h
-ec29bd74becf1c4f1004797e71d4e49d376dbfc8  include/shared/mir/input/android/android_input_lexicon.h
-dcf8b8982f138bdde39a241825c610e955cd5e33  include/shared/mir/input/input_platform.h
-de92c0e3f7a1cf204330cd29847e7524a3af00cd  include/shared/mir/input/input_receiver_report.h
-208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/shared/mir/input/input_receiver_thread.h
-3829a4722360d794658ed4db4af005c79f6504c5  include/shared/mir/input/null_input_receiver_report.h
-2801f1a4fa975a1d8f9388192da2408d2bb472f4  include/shared/mir/input/xkb_mapper.h
-be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/shared/mir/int_wrapper.h
-2319b60bf87801a93af636d3bbfbae420f6776a4  include/shared/mir/logging/dumb_console_logger.h
-52cb642982f7f4fa623cf041b11eca126a3df0f4  include/shared/mir/logging/input_timestamp.h
-72e20902d70588af73bea7a524337264b853bf0a  include/shared/mir/logging/logger.h
-f199066a30882b22be901de0c4e6aa62e320e593  include/shared/mir/protobuf/google_protobuf_guard.h
-4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2  include/shared/mir/raii.h
-bb27ec04b2861d128f420698491941f71e1aefc0  include/shared/mir/recursive_read_write_mutex.h
-903210453b98267e47c03ab2920c1db047ba0457  include/shared/mir/report/lttng/mir_tracepoint.h
-52b6b60543a361e91dbeaa2549114239f57b6b4e  include/shared/mir/report/lttng/tracepoint_provider.h
-dc80f8a57f133276dd5a72f4d0360a7b71154d16  include/shared/mir/shared_library.h
-b4e96264b9a57a1f2ceceb700c5379658905ded7  include/shared/mir/thread_name.h
-9907751d046e4aea81881cf19e5df52c7a6a813e  include/shared/mir_toolkit/client_types.h
-183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/shared/mir_toolkit/common.h
-fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/shared/mir_toolkit/cursors.h
-bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/shared/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/shared/mir_toolkit/mesa/native_display.h
-101017c17714a57db57d79b7b5e7df40a3568236  include/shared/mir_toolkit/mir_native_buffer.h
-9f646fa12eaca5fc3b7a8fde6208673c071c8ef3  include/shared/mir/udev/wrapper.h
-9fd77ab693cc4c9a200e44804f5493733528a674  include/shared/mir/variable_length_array.h
+3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h

=== added directory 'playground'
=== added file 'playground/CMakeLists.txt'
--- playground/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ playground/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -0,0 +1,26 @@
+
+include_directories(
+  ${PROJECT_SOURCE_DIR}/src/include/server
+  ${PROJECT_SOURCE_DIR}/src/include/platform
+  ${PROJECT_SOURCE_DIR}/include/client
+  ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/examples/
+)
+
+set(RENDER_SURFACES_SOURCES
+    render_surfaces.cpp
+    buffer_render_target.cpp
+    image_renderer.cpp
+)
+add_executable(mir_demo_standalone_render_surfaces ${RENDER_SURFACES_SOURCES})
+target_link_libraries(mir_demo_standalone_render_surfaces
+    mirserver
+    exampleserverconfig
+    ${Boost_LIBRARIES}
+)
+
+install(TARGETS mir_demo_standalone_render_surfaces RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+add_subdirectory(demo-shell/)
+add_subdirectory(demo-inprocess-surface-client/)

=== added file 'playground/README'
--- playground/README	1970-01-01 00:00:00 +0000
+++ playground/README	2014-10-10 13:43:10 +0000
@@ -0,0 +1,6 @@
+The Playground
+
+These are mir demos that excercise private in-flux mir functionality.
+As such functionality matures, related headers become public and the playground
+code may become an example of how to use such feature.
+

=== renamed file 'examples/buffer_render_target.cpp' => 'playground/buffer_render_target.cpp'
=== renamed file 'examples/buffer_render_target.h' => 'playground/buffer_render_target.h'
=== renamed directory 'examples/demo-inprocess-surface-client' => 'playground/demo-inprocess-surface-client'
=== modified file 'playground/demo-inprocess-surface-client/CMakeLists.txt'
--- examples/demo-inprocess-surface-client/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ playground/demo-inprocess-surface-client/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -1,14 +1,12 @@
-include_directories(..)
-
 add_executable(mir_demo_standalone_inprocess_egl
   demo_inprocess_surface_client.cpp
   inprocess_egl_client.cpp
   example_egl_helper.cpp
-  ../server_configuration.cpp
 )
 
 target_link_libraries(mir_demo_standalone_inprocess_egl
   mirserver
   mirdraw
+  exampleserverconfig
 )
 # TODO Install this demo?

=== modified file 'playground/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp'
--- examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp	2014-03-06 06:05:17 +0000
+++ playground/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp	2014-10-10 13:43:10 +0000
@@ -19,7 +19,7 @@
 #include "inprocess_egl_client.h"
 
 #include "mir/run_mir.h"
-#include "../server_configuration.h"
+#include "server_configuration.h"
 
 #include "mir/report_exception.h"
 

=== renamed directory 'examples/demo-shell' => 'playground/demo-shell'
=== modified file 'playground/demo-shell/CMakeLists.txt'
--- examples/demo-shell/CMakeLists.txt	2014-08-26 14:39:46 +0000
+++ playground/demo-shell/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -3,7 +3,6 @@
   demo_renderer.cpp
   fullscreen_placement_strategy.cpp
   window_manager.cpp
-  ../server_configuration.cpp
 )
 
 add_executable(mir_demo_server_shell
@@ -13,6 +12,7 @@
 target_link_libraries(mir_demo_server_shell
   demo-shell
   mirserver
+  exampleserverconfig
 )
 
 install(TARGETS mir_demo_server_shell RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== modified file 'playground/demo-shell/demo_compositor.cpp'
--- examples/demo-shell/demo_compositor.cpp	2014-08-29 13:16:11 +0000
+++ playground/demo-shell/demo_compositor.cpp	2014-10-10 13:43:10 +0000
@@ -66,6 +66,8 @@
     //the elements should be notified if they are rendered or not
     bool nonrenderlist_elements{false};
     mg::RenderableList renderable_list;
+    std::unordered_set<mg::Renderable::ID> decoration_skip_list;
+
     auto elements = scene->scene_elements_for(this);
     for(auto const& it : elements)
     {
@@ -73,6 +75,9 @@
         auto const& view_area = display_buffer.view_area();
         auto embellished = renderer.would_embellish(*renderable, view_area);
         auto any_part_drawn = (view_area.overlaps(renderable->screen_position()) || embellished);
+        
+        if (!it->is_a_surface())
+            decoration_skip_list.insert(renderable->id());
         if (renderable->visible() && any_part_drawn)
         {
             renderable_list.push_back(renderable);
@@ -96,7 +101,7 @@
         display_buffer.make_current();
 
         renderer.set_rotation(display_buffer.orientation());
-        renderer.begin();
+        renderer.begin(std::move(decoration_skip_list));
         renderer.render(renderable_list);
         display_buffer.post_update();
         renderer.end();

=== modified file 'playground/demo-shell/demo_renderer.cpp'
--- examples/demo-shell/demo_renderer.cpp	2014-08-26 14:48:55 +0000
+++ playground/demo-shell/demo_renderer.cpp	2014-10-10 13:43:10 +0000
@@ -171,27 +171,29 @@
     glDeleteTextures(1, &titlebar_corner_tex);
 }
 
-void DemoRenderer::begin() const
+void DemoRenderer::begin(std::unordered_set<graphics::Renderable::ID> decoration_skip_list_) const
 {
     bool const opaque = destination_alpha() == compositor::DestinationAlpha::opaque;
-    if (opaque)
-        glClearColor(0.2f, 0.2f, 0.2f, 1.0f);
-    else
-        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.2f, 0.2f, 0.2f, 1.0f);
 
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
     glClear(GL_COLOR_BUFFER_BIT);
 
     if (opaque)
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+    
+    decoration_skip_list = decoration_skip_list_;
 }
 
 void DemoRenderer::tessellate(std::vector<graphics::GLPrimitive>& primitives,
                               graphics::Renderable const& renderable) const
 {
     GLRenderer::tessellate(primitives, renderable);
-    tessellate_shadow(primitives, renderable, shadow_radius);
-    tessellate_frame(primitives, renderable, titlebar_height);
+    if (decoration_skip_list.find(renderable.id()) == decoration_skip_list.end())
+    {
+        tessellate_shadow(primitives, renderable, shadow_radius);
+        tessellate_frame(primitives, renderable, titlebar_height);
+    }
 }
 
 void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,

=== modified file 'playground/demo-shell/demo_renderer.h'
--- examples/demo-shell/demo_renderer.h	2014-08-26 14:39:46 +0000
+++ playground/demo-shell/demo_renderer.h	2014-10-10 13:43:10 +0000
@@ -21,6 +21,8 @@
 
 #include "mir/compositor/gl_renderer.h"
 
+#include <unordered_set>
+
 namespace mir
 {
 namespace examples
@@ -37,7 +39,9 @@
         float const shadow_radius);
     ~DemoRenderer();
 
-    void begin() const override;
+    void begin() const override { GLRenderer::begin(); }
+    void begin(std::unordered_set<graphics::Renderable::ID> renderables_not_to_decorate) const;
+    
     void tessellate(
         std::vector<graphics::GLPrimitive>& primitives,
         graphics::Renderable const& renderable) const override;
@@ -59,6 +63,8 @@
     float const corner_radius;
     GLuint shadow_corner_tex;
     GLuint titlebar_corner_tex;
+    
+    mutable std::unordered_set<graphics::Renderable::ID> decoration_skip_list;
 };
 
 } // namespace examples

=== modified file 'playground/demo-shell/demo_shell.cpp'
--- examples/demo-shell/demo_shell.cpp	2014-07-23 20:59:29 +0000
+++ playground/demo-shell/demo_shell.cpp	2014-10-10 13:43:10 +0000
@@ -21,7 +21,7 @@
 #include "demo_compositor.h"
 #include "window_manager.h"
 #include "fullscreen_placement_strategy.h"
-#include "../server_configuration.h"
+#include "server_configuration.h"
 
 #include "mir/options/default_configuration.h"
 #include "mir/run_mir.h"

=== modified file 'playground/demo-shell/window_manager.cpp'
--- examples/demo-shell/window_manager.cpp	2014-07-21 03:35:31 +0000
+++ playground/demo-shell/window_manager.cpp	2014-10-10 13:43:10 +0000
@@ -27,7 +27,6 @@
 #include "mir/compositor/compositor.h"
 
 #include <linux/input.h>
-#include <android/keycodes.h>  // TODO remove this dependency
 
 #include <cassert>
 #include <cstdlib>
@@ -124,6 +123,7 @@
     assert(compositor);
 
     bool handled = false;
+    static int const ANDROID_KEYCODE_POWER = 26;
 
     if (event.key.type == mir_event_type_key &&
         event.key.action == mir_key_action_down)
@@ -136,7 +136,7 @@
         }
         else if ((event.key.modifiers & mir_key_modifier_alt &&
                   event.key.scan_code == KEY_P) ||
-                 (event.key.key_code == AKEYCODE_POWER))
+                 (event.key.key_code == ANDROID_KEYCODE_POWER))
         {
             compositor->stop();
             auto conf = display->configuration();

=== renamed file 'examples/image_renderer.cpp' => 'playground/image_renderer.cpp'
=== renamed file 'examples/image_renderer.h' => 'playground/image_renderer.h'
=== renamed file 'examples/render_surfaces.cpp' => 'playground/render_surfaces.cpp'
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-08-27 19:35:36 +0000
+++ server-ABI-sha1sums	2014-10-10 13:43:10 +0000
@@ -1,78 +1,62 @@
+3329ada91412ded2f127aee9a92f065e57b81cb2  include/common/mir/cached_ptr.h
+82ff9499ef62739379616e02164dc98f9914c329  include/common/mir/fd.h
+b399dc08514751c86e23824612a52378dd9b1e23  include/common/mir/geometry/dimensions.h
+d954464ef2d20c2876db68c94512a443186da09b  include/common/mir/geometry/point.h
+dc7c62d3916eec025e8e7deaf57e06077ce38928  include/common/mir/geometry/rectangle.h
[phone]e3ca4f5fa4e7db025d0978d2bbef06  include/common/mir/geometry/rectangles.h
+42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
+e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
+dcf8b8982f138bdde39a241825c610e955cd5e33  include/common/mir/input/input_platform.h
+208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/common/mir/input/input_receiver_thread.h
+be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613  include/common/mir/time/clock.h
+9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
+183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
+fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
+bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
+99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a  include/platform/mir/abnormal_exit.h
-498d728ea1052cb6cadb9de7828ae48eb5a201df  include/platform/mir/emergency_cleanup_registry.h
 8f47feb6d983aa5c9ebd58e9d1524361c9f5e651  include/platform/mir/fatal.h
 e9e97ba2db4c6aeb269630547bf5a558da17d896  include/platform/mir/graphics/basic_platform.h
 05c154bbfa81e16795c18f27000711741d5592e0  include/platform/mir/graphics/buffer_basic.h
 54328767ca330ba166160a486bd0688406ab0222  include/platform/mir/graphics/buffer.h
 5875f13f5b029a4b5291e9baec3ae434b72be27c  include/platform/mir/graphics/buffer_id.h
-827cbc0ecbcea21dd794ab4b8119a5710bb266d3  include/platform/mir/graphics/buffer_initializer.h
-d7507a326f8cfcc4707c1eb28cf7b666420f92fb  include/platform/mir/graphics/buffer_ipc_packer.h
 748f5c2aab11189aa02c4a89ab900561548e7304  include/platform/mir/graphics/buffer_properties.h
 ffa857f624f1c8cbd50a190107137346fc3204d6  include/platform/mir/graphics/cursor.h
 fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578  include/platform/mir/graphics/cursor_image.h
 986f5d0d8ea2c6a42cc320f468e682f81fec46ae  include/platform/mir/graphics/display_buffer.h
-4a55160c58cb4f82316ec9f5892fa99a00587963  include/platform/mir/graphics/display_configuration.h
+f53a0020b8f1bd4a941a201eb26271cffee0a7dd  include/platform/mir/graphics/display_configuration.h
 6fe08da318c920b0d20ea8b8f560f5ac7ed389fe  include/platform/mir/graphics/display_configuration_policy.h
 41ea906d208b761e3d5d5056095de9de2d4ffa17  include/platform/mir/graphics/display.h
-5b2618fba338ea028c27df77d05b033dd8a57818  include/platform/mir/graphics/display_report.h
-fc9b3cfa80a1ac57dedb4e8d180c62ae15c0ace8  include/platform/mir/graphics/drm_authenticator.h
-9fe4e4b1572cec5fda7660480979b13aaf37f901  include/platform/mir/graphics/egl_extensions.h
-17bfa016a2a9d6672bfd335a4c1b147c2ddca5b5  include/platform/mir/graphics/egl_resources.h
 815405c5aee8000bc18c1c9480bac620a451b416  include/platform/mir/graphics/event_handler_register.h
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
-b8ceb6c770340f63e0114496d4ad102d787fa6f5  include/platform/mir/graphics/gl_primitive.h
-06c153f3e867812a42f41d0fe288524d91d183a6  include/platform/mir/graphics/gl_program_factory.h
-f62525771ca2612959ff88498883630458513235  include/platform/mir/graphics/gl_program.h
-7e0da0260a80a1b074b994293d5808c7330638da  include/platform/mir/graphics/gl_texture_cache.h
-6c1d54bc0a77a1e67c6beff097dc4f1527010e67  include/platform/mir/graphics/gl_texture.h
 979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
 f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
 c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
-222160aa8176a111ce05711d90a372c38591ccdb  include/platform/mir/graphics/native_platform.h
-590572a9d86a9481b4531ad44414c6f76352fe7a  include/platform/mir/graphics/nested_context.h
-27807b8ba288590f3749cfb32512eda4d0de6c7d  include/platform/mir/graphics/overlapping_output_grouping.h
-32c70ee44b8dc9372dec0c54471aa8d831adcb1c  include/platform/mir/graphics/pixel_format_utils.h
-656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
+b4aaa941df9c0a6f9342629b26542700876f3aaa  include/platform/mir/graphics/native_platform.h
+f47dac961f060eb29a44ed3c8c18a49a3d353bb1  include/platform/mir/graphics/platform.h
+1fbe488b4581486fd01e2f03e504f31b72c09040  include/platform/mir/graphics/platform_ipc_operations.h
 9c7712af84b6fde1970ff802ad2ea78f892c7b7e  include/platform/mir/graphics/platform_ipc_package.h
-15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-4b640ec72b04cc2de7671afd7c78942fb9e775a7  include/platform/mir/graphics/tessellation_helpers.h
-8f172d1449f9aa7bbcb1eebb463b0cab4cab38fe  include/platform/mir/options/configuration.h
-3a961c5e85b0b9d20eadddd938677776288c06c6  include/platform/mir/options/default_configuration.h
+84c063346b3bd51b4624d9f940008d4c3f8be066  include/platform/mir/graphics/renderable.h
+f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
+47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
-1133726e66a246bd3988616e205e186278a64731  include/platform/mir/options/program_option.h
-5d0213652adc4821a2a180ced74808ca0bbf2c45  include/platform/mir/shared_library_loader.h
-505444aeb61d0f55893a7ba0998b25c2041f76c4  include/server/mir/asio_main_loop.h
-a4c8f0b0c30784ea6930a8ee6651f1d6efa47231  include/server/mir/compositor/buffer_stream.h
+3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
 f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
 a9f284ba4b05d58fd3eeb628d1f56fe4ac188526  include/server/mir/compositor/compositor_id.h
-a3e8658107c0c13d41eaf2ca6a1be71d1dc59df6  include/server/mir/compositor/compositor_report.h
-eebcdfaf8894b387d1a5acd22c2f1bc09b3c2b95  include/server/mir/compositor/destination_alpha.h
-98fe6bde01fb8b25b1bacafcdf572f24c3ade3c3  include/server/mir/compositor/display_buffer_compositor_factory.h
-c7328ef5ea4531c0fa981b3e15a69ea5c8162d09  include/server/mir/compositor/display_buffer_compositor.h
-561e7fdc22c48cf39a19e6f7c2db5e8c1feee772  include/server/mir/compositor/frame_dropping_policy_factory.h
-e787879afa46d9c8257ff1f4ae8c7900d4b5f1a4  include/server/mir/compositor/frame_dropping_policy.h
-e2e3e914a331a7611032860e3c64274aa42339aa  include/server/mir/compositor/gl_renderer.h
-4088fb037aa1bbae897145caca99314ea6cc2aa6  include/server/mir/compositor/recently_used_cache.h
-e0860c43bf5196a792ffd7216826925e16275d07  include/server/mir/compositor/renderer_factory.h
-51391bd29f7499f8cbb89e4ba33acf2b72d93592  include/server/mir/compositor/renderer.h
-686a839fd0cd5fa469344dc49190ff9d578efc25  include/server/mir/compositor/scene_element.h
+5205e30c5fdb5b5d8803064fc1abd102db59c4e7  include/server/mir/compositor/scene_element.h
 4fcf34e424128b87ddc76733594e32e09ebbd486  include/server/mir/compositor/scene.h
-f102d38fd8afd63b636d76005f9b80f3adda0858  include/server/mir/default_server_configuration.h
-bbb15c910dbc8d7c9a4cc982890486b7e16197e4  include/server/mir/default_server_status_listener.h
-215f6cf88826381cd3ec37a6d2179a70093c0bc5  include/server/mir/display_changer.h
+ef0b6f26fb40a72e4a4744e4d9c4bd044142de47  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 a35c5495d8fd28fc0e375b17495fc5caab51b329  include/server/mir/emergency_cleanup.h
-fc7f9b93d6c12c6866a8752a1558c6dd19369864  include/server/mir/frontend/connection_context.h
 65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
 e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
-24e0ff92e7deb204f68a82de973f51c0ae07c935  include/server/mir/frontend/connector.h
-d21356fe32066c1d6146730c198683d1ad5786bd  include/server/mir/frontend/connector_report.h
 938de641cb0e01e1098b007b39b151a7dfe4adc1  include/server/mir/frontend/display_changer.h
 46b9a4c7794c29b4bd7822671f9626fc8fc33333  include/server/mir/frontend/event_sink.h
 bdb89184f400bb04625db5835d38576f99f52684  include/server/mir/frontend/fd_sets.h
 4f1303065e300d26acb148c3dd9f7183dc3c4443  include/server/mir/frontend/message_processor.h
-e43a044d70ad48fd41d74a176223e3e75b9b53b8  include/server/mir/frontend/message_processor_report.h
 59d6703def2a0ff840e5eb75390a5af76fd93f58  include/server/mir/frontend/prompt_session.h
 cb1f73934d150f21e60d4d8de3f15918d993dd98  include/server/mir/frontend/protobuf_connection_creator.h
 7fc88a2e39f6b87ecbd89a264612138e8fcfb10a  include/server/mir/frontend/protobuf_message_sender.h
@@ -80,51 +64,33 @@
 b729a7710c37d9f1fba56a6f8e8eae1c2559f57a  include/server/mir/frontend/session_authorizer.h
 34ce482df448fd2fc5f0c4ae5ac8b7fecbd228c9  include/server/mir/frontend/session_credentials.h
 e5ea465ed7e05f0e1d6a837d0d6b3a04c2d7fc19  include/server/mir/frontend/session.h
-0452fd9e7ccf081baf7635d8f699de47c52372ea  include/server/mir/frontend/session_mediator_report.h
+d754e5bb057f3018d7228170cf9a0c66d75d8cc2  include/server/mir/frontend/session_mediator_report.h
 68468aa2298c4e2cdc1bbb7cb5f250a914ae16c9  include/server/mir/frontend/shell.h
 f67b9788943a4b9121b3891dfbe979d57922ea78  include/server/mir/frontend/surface.h
 618b43a84cce0ad671ed68fe2ba796fbc7b79e31  include/server/mir/frontend/surface_id.h
 5aa4c4db5468d9b9fe8e98a64444538aadd6e17b  include/server/mir/frontend/template_protobuf_message_processor.h
-ba79552edce545fafc9a4f401411c44d0cb3b2cf  include/server/mir/graphics/gl_extensions_base.h
-2489a0e7922b6c7abe383726a30e17edbee51048  include/server/mir/graphics/surfaceless_egl_context.h
-36ad5c3d722a5c8f252eb7538a5fb2bff46d2189  include/server/mir/input/android/default_android_input_configuration.h
 f95c2bddf13d15993ef5d6a0ad7b9106ae550b87  include/server/mir/input/composite_event_filter.h
 67719acb03b35d383dfefd65e8dfb872c42bcc11  include/server/mir/input/cursor_images.h
-c1e96c372d7856d59947f3145d273b1285b569bc  include/server/mir/input/cursor_listener.h
+cef18b7215fbe00550d18c0aa0f79b641cff494e  include/server/mir/input/cursor_listener.h
 2331fc402686e862809bf24714a8746cdde97cb1  include/server/mir/input/event_filter.h
-75d676ad8b49f6883317373b90cb22ebf407a977  include/server/mir/input/input_channel_factory.h
 78862dda41d56c6b937a1ed197982e5fa37f50df  include/server/mir/input/input_channel.h
 574c11e234ba26924ccae8e005fb6f3db921441d  include/server/mir/input/input_configuration.h
 6f1d9cf83bbb1256f0b4d1ba1d94d95af98c52f0  include/server/mir/input/input_dispatcher.h
 443aa3f7ab31409f4cc4496aff344f8b9978aca6  include/server/mir/input/input_manager.h
 b2ec497c6bec1b3a67c991f31cc7b7c51050ecbb  include/server/mir/input/input_reception_mode.h
-901b7ef0889385e88c77e9b4f6724c3c56ecdb7a  include/server/mir/input/input_region.h
-b703ac51f94b6f9c9edcd6a4587e33d6e2d54269  include/server/mir/input/input_report.h
-3918c61bb2404b1fe8ba3d4a0573deb67065f8c0  include/server/mir/input/input_sender.h
-51cda18e314f1e36177a7ebfab0d1dd12867cdf0  include/server/mir/input/input_send_observer.h
-59e757018c337db25df0c68556664eb7536e4321  include/server/mir/input/input_targets.h
 15119bf95b4512c8b91df7c20edf56a3c0734957  include/server/mir/input/surface.h
-d647ce6beffdc31a597769587bb3ab17ec679491  include/server/mir/input/touch_visualizer.h
-204089f848c4d63ade96f92a0b8cfc1c33f1ce63  include/server/mir/input/vt_filter.h
-5ba863e9bb4dc9802aa74a7864f576df25142c2d  include/server/mir/logging/glog_logger.h
+036f3967757873751fcacaa768ca11a52001c225  include/server/mir/input/touch_visualizer.h
 964069b241f1e8211386bb8735ee0f752b666949  include/server/mir/main_loop.h
 edd5a0a6be0be57ef64c5af89fc5a65dc558648c  include/server/mir/report_exception.h
-11ce453c51c4276c18062750976e9f2e86da7f9d  include/server/mir/report/legacy_input_report.h
 8192727cf5fa0b2b5798b2211c2c8a4ad65c9f60  include/server/mir/run_mir.h
-a94e06b5746f6b12ef4cc13249bb041852babf18  include/server/mir/scene/buffer_stream_factory.h
 71d9082681aa39d652c88ad3b54665695b521d24  include/server/mir/scene/depth_id.h
-8a409388cfaf6b8f960303a9e5d0e31e4fbac097  include/server/mir/scene/legacy_scene_change_notification.h
-f7b42034a65b5a3b2bf9349b97f7d95515029f40  include/server/mir/scene/null_observer.h
-dc5b52c9631f91ca08487737aef808e087a17c97  include/server/mir/scene/null_prompt_session_listener.h
-cacb23805002e87fc6c4cb3e28bc77e800854cf1  include/server/mir/scene/null_session_listener.h
 4e4e563ab429a13ddca7eead16f2b6cefb8edff6  include/server/mir/scene/null_surface_observer.h
-08f2e4f35cc9649004f2f118ebe85a8d3f1f1ae8  include/server/mir/scene/observer.h
+d5273f3363b0b776427d5e3f1af99f0f2bcf3fa6  include/server/mir/scene/observer.h
 10db25fbaefcabb3b191177ed70f5972df7f05f0  include/server/mir/scene/placement_strategy.h
 74f7f66ffc3e15c428082fb961e748cb4f39dafc  include/server/mir/scene/prompt_session_creation_parameters.h
 4e8269c822ad2daddd92115cbe5332caaa9ef4cc  include/server/mir/scene/prompt_session.h
 79adf11e2b1778897ed97d1713ba4c3d34eb1f31  include/server/mir/scene/prompt_session_listener.h
 27f614f98ad7c249d9b12dcca30a324220cdd25b  include/server/mir/scene/prompt_session_manager.h
-6729761e5f7abaae52cbc23f67bf6d6774f4256a  include/server/mir/scene/scene_report.h
 5edf446380070f567500069e422d293e88468ee5  include/server/mir/scene/session_coordinator.h
 f148a69caa39756d43cfaf7cc868ad681bda9ef6  include/server/mir/scene/session.h
 ee94083f10f890e24c0e0bbdb94842e2dd788deb  include/server/mir/scene/session_listener.h
@@ -133,8 +99,6 @@
 bbc9e2e2bb71634cd6f1c5c0430093e10e74fa23  include/server/mir/scene/surface_configurator.h
 e5e4dd7bcaf186810043fa0f05be42d7e49b0843  include/server/mir/scene/surface_coordinator.h
 dd8f054f786b9746d9e513f2656e931234b5283a  include/server/mir/scene/surface_creation_parameters.h
-d84b0cb897519c4e6dfd2a447bfef3a5147f9c61  include/server/mir/scene/surface_event_source.h
-e343cef9f90a0a01f660936b890084ffce02710b  include/server/mir/scene/surface_factory.h
 791624081fa86523f51f444d2b28d7ab32dde1a4  include/server/mir/scene/surface.h
 993e9f458ffc4288d304413f3fa0b1dcc95a093d  include/server/mir/scene/surface_observer.h
 7ef3e99901168cda296d74d05a979f47bf9c3ff1  include/server/mir/server_action_queue.h
@@ -148,51 +112,4 @@
 82bc93ea53f03399cb143b9ce936bb51d4366be6  include/server/mir/shell/session_coordinator_wrapper.h
 18e869c5b87ab8be4bc185d2cd55a93d699cde72  include/server/mir/shell/surface_coordinator_wrapper.h
 c3fdfa84a3ae97a0d1057635c5bfcedcf29d007c  include/server/mir/time/alarm.h
-bfacab3544a6b1339e6f45353033bdab3c226db7  include/server/mir/time/clock.h
-3476f05e60e00fd637b36fb1e4417762082e0486  include/server/mir/time/high_resolution_clock.h
 a134c7b86e9c3b191f1004abe7bbdceed8ac42ee  include/server/mir/time/timer.h
-6ad1f35928df9ffd917fbf17cbcdd533a8b5b27d  include/shared/mir/basic_observers.h
-3329ada91412ded2f127aee9a92f065e57b81cb2  include/shared/mir/cached_ptr.h
-691278e8b89265fa7f11db78dc8a9b530cef6e99  include/shared/mir/default_configuration.h
-82ff9499ef62739379616e02164dc98f9914c329  include/shared/mir/fd.h
-15dd88e8de39d195c3a4e7c166678cd9b6951994  include/shared/mir/frontend/client_constants.h
-b399dc08514751c86e23824612a52378dd9b1e23  include/shared/mir/geometry/dimensions.h
-7031270546292995d38e6de165600db21ff51c68  include/shared/mir/geometry/displacement.h
-283cb0ecf9d544300681fc2ab86bec568e2d20ff  include/shared/mir/geometry/forward.h
-bfd87d9fb800c1c1b528c00185570abac569caf2  include/shared/mir/geometry/length.h
-d954464ef2d20c2876db68c94512a443186da09b  include/shared/mir/geometry/point.h
-65148c6d432950fb07589b6348afc4aab8b5079a  include/shared/mir/geometry/rectangle.h
-1b6632a6ee0a8758201739fb16c4eb1ce196344a  include/shared/mir/geometry/rectangles.h
-7d3ede2c85e9febc1c4951a342939e3a6dacb99e  include/shared/mir/geometry/size.h
-76d576231de039e25f4cf30829504552dcb9fc53  include/shared/mir/graphics/android/android_driver_interpreter.h
-c02a1e68d5a8ccfd8710440e166c9e32bc974f1e  include/shared/mir/graphics/android/android_native_buffer.h
-05e7b043ccf49582a78e880967b3bc1f3512e010  include/shared/mir/graphics/android/fence.h
-0168b68dea12355c22cd39fbfc50bca0e21fd6e5  include/shared/mir/graphics/android/mir_native_window.h
-8f6d9dc681f3e0d212e6a74f9170ea7b3eb2607f  include/shared/mir/graphics/android/native_buffer.h
-424d1ff5b9bc299fc43f0afe961c4dafc3227992  include/shared/mir/graphics/android/sync_fence.h
-e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/shared/mir/graphics/native_buffer.h
-ec29bd74becf1c4f1004797e71d4e49d376dbfc8  include/shared/mir/input/android/android_input_lexicon.h
-dcf8b8982f138bdde39a241825c610e955cd5e33  include/shared/mir/input/input_platform.h
-de92c0e3f7a1cf204330cd29847e7524a3af00cd  include/shared/mir/input/input_receiver_report.h
-208cd6aed5ef5f8f39b3eb86604e4133cb840485  include/shared/mir/input/input_receiver_thread.h
-3829a4722360d794658ed4db4af005c79f6504c5  include/shared/mir/input/null_input_receiver_report.h
-2801f1a4fa975a1d8f9388192da2408d2bb472f4  include/shared/mir/input/xkb_mapper.h
-be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/shared/mir/int_wrapper.h
-2319b60bf87801a93af636d3bbfbae420f6776a4  include/shared/mir/logging/dumb_console_logger.h
-52cb642982f7f4fa623cf041b11eca126a3df0f4  include/shared/mir/logging/input_timestamp.h
-72e20902d70588af73bea7a524337264b853bf0a  include/shared/mir/logging/logger.h
-f199066a30882b22be901de0c4e6aa62e320e593  include/shared/mir/protobuf/google_protobuf_guard.h
-4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2  include/shared/mir/raii.h
-bb27ec04b2861d128f420698491941f71e1aefc0  include/shared/mir/recursive_read_write_mutex.h
-903210453b98267e47c03ab2920c1db047ba0457  include/shared/mir/report/lttng/mir_tracepoint.h
-52b6b60543a361e91dbeaa2549114239f57b6b4e  include/shared/mir/report/lttng/tracepoint_provider.h
-dc80f8a57f133276dd5a72f4d0360a7b71154d16  include/shared/mir/shared_library.h
-b4e96264b9a57a1f2ceceb700c5379658905ded7  include/shared/mir/thread_name.h
-9907751d046e4aea81881cf19e5df52c7a6a813e  include/shared/mir_toolkit/client_types.h
-183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/shared/mir_toolkit/common.h
-fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/shared/mir_toolkit/cursors.h
-bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/shared/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/shared/mir_toolkit/mesa/native_display.h
-101017c17714a57db57d79b7b5e7df40a3568236  include/shared/mir_toolkit/mir_native_buffer.h
-9f646fa12eaca5fc3b7a8fde6208673c071c8ef3  include/shared/mir/udev/wrapper.h
-9fd77ab693cc4c9a200e44804f5493733528a674  include/shared/mir/variable_length_array.h

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-27 19:44:04 +0000
+++ src/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -1,5 +1,5 @@
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
-add_subdirectory(shared/)
+add_subdirectory(common/)
 include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
 
 add_subdirectory(platform/)

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-08-05 14:03:25 +0000
+++ src/client/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -1,3 +1,10 @@
+set(MIRCLIENT_ABI 8)
+set(CLIENT_DRIVER client${MIRCLIENT_ABI}driver)
+set(MIR_CLIENT_DRIVER mir${CLIENT_DRIVER})
+set(MIR_CLIENT_DRIVER_BINARY lib${MIR_CLIENT_DRIVER}.so
+    CACHE STRING "File name of Mir client drivers")
+add_definitions(-DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}")
+
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -44,6 +51,7 @@
   mir_surface_api.cpp
   logging/rpc_report.cpp
   logging/input_receiver_report.cpp
+  logging/perf_report.cpp
   default_connection_configuration.cpp
   surface_map.cpp
   lifecycle_control.cpp
@@ -54,6 +62,7 @@
   mir_prompt_session.cpp
   mir_prompt_session_api.cpp
   mir_event_distributor.cpp
+  periodic_perf_report.cpp
 )
 
 add_library(
@@ -62,7 +71,6 @@
   $<TARGET_OBJECTS:mirclientobjects>
 )
 
-set(MIRCLIENT_ABI 8)
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-08-27 19:44:04 +0000
+++ src/client/android/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -23,7 +23,7 @@
 
 set_target_properties(
   mirclientplatformandroid PROPERTIES
-  OUTPUT_NAME mirclientplatform
+  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
@@ -35,19 +35,19 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
+install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/android)
 
 if (MIR_TEST_PLATFORM STREQUAL "android")
   add_custom_command(TARGET mirclientplatformandroid
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
+    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
+    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> ${MIR_CLIENT_DRIVER_BINARY}
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
 
   install(CODE
     "execute_process(
-       COMMAND ln -sf mir/clientplatform/android/libmirclientplatform.so
+       COMMAND ln -sf mir/${CLIENT_DRIVER}/android/${MIR_CLIENT_DRIVER_BINARY}
        WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
      )"
   )

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-09-12 07:56:37 +0000
+++ src/client/default_connection_configuration.cpp	2014-10-10 13:43:10 +0000
@@ -26,13 +26,17 @@
 #include "mir/input/null_input_receiver_report.h"
 #include "logging/rpc_report.h"
 #include "logging/input_receiver_report.h"
+#include "mir/logging/shared_library_prober_report.h"
+#include "mir/logging/null_shared_library_prober_report.h"
 #include "lttng/rpc_report.h"
 #include "lttng/input_receiver_report.h"
+#include "lttng/shared_library_prober_report.h"
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
 #include "mir/shared_library.h"
 #include "client_platform_factory.h"
 #include "mir_event_distributor.h"
+#include "mir/shared_library_prober.h"
 
 #include <dlfcn.h>
 
@@ -43,7 +47,7 @@
 std::string const off_opt_val{"off"};
 std::string const log_opt_val{"log"};
 std::string const lttng_opt_val{"lttng"};
-std::string const default_platform_lib{"libmirclientplatform.so"};
+std::string const default_platform_lib{MIR_CLIENT_DRIVER_BINARY};
 
 // Hack around the way Qt loads mir:
 // qtmir and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -200,6 +204,22 @@
         });
 }
 
+std::shared_ptr<mir::SharedLibraryProberReport> mir::client::DefaultConnectionConfiguration::the_shared_library_prober_report()
+{
+    return shared_library_prober_report(
+        [this] () -> std::shared_ptr<mir::SharedLibraryProberReport>
+        {
+            auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT");
+            std::string const val{val_raw ? val_raw : off_opt_val};
+            if (val == log_opt_val)
+                return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger());
+            else if (val == lttng_opt_val)
+                return std::make_shared<mcl::lttng::SharedLibraryProberReport>();
+            else
+                return std::make_shared<mir::logging::NullSharedLibraryProberReport>();
+        });
+}
+
 std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library()
 {
     if (!platform_library)
@@ -209,6 +229,5 @@
         std::string const libname{val_raw ? val_raw : default_platform_lib};
         platform_library = std::make_shared<mir::SharedLibrary>(libname);
     }
-
     return platform_library;
 }

=== modified file 'src/client/default_connection_configuration.h'
--- src/client/default_connection_configuration.h	2014-08-29 13:12:16 +0000
+++ src/client/default_connection_configuration.h	2014-10-10 13:43:10 +0000
@@ -27,6 +27,8 @@
 
 namespace mir
 {
+class SharedLibraryProberReport;
+
 namespace input
 {
 namespace receiver
@@ -57,6 +59,7 @@
     std::shared_ptr<LifecycleControl> the_lifecycle_control();
     std::shared_ptr<EventSink> the_event_sink();
     std::shared_ptr<EventHandlerRegister> the_event_handler_register();
+    std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report();
     std::shared_ptr<SharedLibrary> the_platform_library() override;
 
     virtual std::string the_socket_file();
@@ -78,6 +81,7 @@
 
     CachedPtr<rpc::RpcReport> rpc_report;
     CachedPtr<input::receiver::InputReceiverReport> input_receiver_report;
+    CachedPtr<mir::SharedLibraryProberReport>  shared_library_prober_report;
 
 private:
     std::string const socket_file;

=== added file 'src/client/logging/perf_report.cpp'
--- src/client/logging/perf_report.cpp	1970-01-01 00:00:00 +0000
+++ src/client/logging/perf_report.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#include "perf_report.h"
+#include "mir/logging/logger.h"
+#include "mir/time/high_resolution_clock.h"
+
+using namespace mir::client;
+
+namespace
+{
+const char * const component = "perf"; // Note context is already within client
+} // namespace
+
+logging::PerfReport::PerfReport(
+        std::shared_ptr<mir::logging::Logger> const& logger)
+    : PeriodicPerfReport(std::chrono::seconds(1),
+                         std::make_shared<mir::time::HighResolutionClock>())
+    , logger(logger)
+{
+}
+
+void logging::PerfReport::display(const char *name, long fps100,
+                                  long rendertime_usec, long lag_usec,
+                                  int nbuffers) const
+{
+    char msg[256];
+    snprintf(msg, sizeof msg,
+             "%s: %2ld.%02ld FPS, render time %ld.%02ldms, buffer lag %ld.%02ldms (%d buffers)",
+             name,
+             fps100 / 100, fps100 % 100,
+             rendertime_usec / 1000, (rendertime_usec / 10) % 100,
+             lag_usec / 1000, (lag_usec / 10) % 100,
+             nbuffers
+             );
+
+    logger->log(mir::logging::Logger::informational, msg, component);
+}

=== added file 'src/client/logging/perf_report.h'
--- src/client/logging/perf_report.h	1970-01-01 00:00:00 +0000
+++ src/client/logging/perf_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_LOGGING_PERF_REPORT_H_
+#define MIR_CLIENT_LOGGING_PERF_REPORT_H_
+
+#include "../periodic_perf_report.h"
+#include <memory>
+
+namespace mir
+{
+namespace logging { class Logger; }
+
+namespace client
+{
+namespace logging
+{
+
+class PerfReport : public PeriodicPerfReport
+{
+public:
+    PerfReport(std::shared_ptr<mir::logging::Logger> const& logger);
+    void display(const char *name, long fps100, long rendertime_usec,
+                 long lag_usec, int nbuffers) const override;
+private:
+    std::shared_ptr<mir::logging::Logger> const logger;
+};
+
+} // namespace logging
+} // namespace client
+} // namespace mir
+
+#endif // MIR_CLIENT_LOGGING_PERF_REPORT_H_

=== modified file 'src/client/logging/rpc_report.cpp'
--- src/client/logging/rpc_report.cpp	2014-07-21 03:35:31 +0000
+++ src/client/logging/rpc_report.cpp	2014-10-10 13:43:10 +0000
@@ -147,7 +147,7 @@
 
 void mcll::RpcReport::file_descriptors_received(
     google::protobuf::Message const& /*response*/,
-    std::vector<int32_t> const& fds)
+    std::vector<Fd> const& fds)
 {
     std::stringstream ss;
     ss << "File descriptors received: ";

=== modified file 'src/client/logging/rpc_report.h'
--- src/client/logging/rpc_report.h	2014-07-21 03:35:31 +0000
+++ src/client/logging/rpc_report.h	2014-10-10 13:43:10 +0000
@@ -60,7 +60,7 @@
                                   std::exception const& ex) override;
 
     void file_descriptors_received(google::protobuf::Message const& response,
-                                   std::vector<int32_t> const& fds) override;
+                                   std::vector<Fd> const& fds) override;
 
     void connection_failure(std::exception const& ex) override;
 

=== modified file 'src/client/lttng/CMakeLists.txt'
--- src/client/lttng/CMakeLists.txt	2014-08-26 14:56:48 +0000
+++ src/client/lttng/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -6,6 +6,7 @@
   client_tracepoint_provider.cpp
   rpc_report.cpp
   input_receiver_report.cpp
+  shared_library_prober_report.cpp
 )
 
 add_library(mirclientlttng SHARED tracepoints.c)

=== modified file 'src/client/lttng/input_receiver_report_tp.h'
--- src/client/lttng/input_receiver_report_tp.h	2014-03-26 05:48:59 +0000
+++ src/client/lttng/input_receiver_report_tp.h	2014-10-10 13:43:10 +0000
@@ -28,16 +28,6 @@
 #include <lttng/tracepoint.h>
 #include <stdint.h>
 
-#ifdef __clang__
-/*
- * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
- * these functions are unused and so generate fatal warnings.
- * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
- */
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wunused-function"
-#endif
-
 TRACEPOINT_EVENT(
     mir_client_input_receiver,
     key_event,
@@ -88,10 +78,6 @@
     )
 )
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 #endif /* MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_ */
 
 #include <lttng/tracepoint-event.h>

=== modified file 'src/client/lttng/rpc_report.cpp'
--- src/client/lttng/rpc_report.cpp	2014-07-21 03:35:31 +0000
+++ src/client/lttng/rpc_report.cpp	2014-10-10 13:43:10 +0000
@@ -94,10 +94,15 @@
 
 void mcl::lttng::RpcReport::file_descriptors_received(
     google::protobuf::Message const& /*response*/,
-    std::vector<int32_t> const& fds)
+    std::vector<Fd> const& fds)
 {
+    std::unique_ptr<int[]> handles{new int[fds.size()]};
+    for (unsigned i = 0 ; i < fds.size() ; ++i)
+    {
+        handles[i] = fds[i];
+    }
     mir_tracepoint(mir_client_rpc, file_descriptors_received,
-                   fds.data(), fds.size());
+                   handles.get(), fds.size());
 }
 
 void mcl::lttng::RpcReport::connection_failure(std::exception const& /*ex*/)

=== modified file 'src/client/lttng/rpc_report.h'
--- src/client/lttng/rpc_report.h	2014-07-21 03:35:31 +0000
+++ src/client/lttng/rpc_report.h	2014-10-10 13:43:10 +0000
@@ -51,7 +51,7 @@
                                   std::exception const& ex) override;
 
     void file_descriptors_received(google::protobuf::Message const& response,
-                                   std::vector<int32_t> const& fds) override;
+                                   std::vector<Fd> const& fds) override;
 
     void connection_failure(std::exception const& ex) override;
 

=== modified file 'src/client/lttng/rpc_report_tp.h'
--- src/client/lttng/rpc_report_tp.h	2014-03-26 05:48:59 +0000
+++ src/client/lttng/rpc_report_tp.h	2014-10-10 13:43:10 +0000
@@ -28,16 +28,6 @@
 #include <lttng/tracepoint.h>
 #include <stdint.h>
 
-#ifdef __clang__
-/*
- * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
- * these functions are unused and so generate fatal warnings.
- * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
- */
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wunused-function"
-#endif
-
 TRACEPOINT_EVENT(
     mir_client_rpc,
     invocation_requested,
@@ -94,10 +84,6 @@
     )
 )
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 #endif /* MIR_CLIENT_LTTNG_RPC_REPORT_TP_H_ */
 
 #include <lttng/tracepoint-event.h>

=== added file 'src/client/lttng/shared_library_prober_report.cpp'
--- src/client/lttng/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
+++ src/client/lttng/shared_library_prober_report.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "shared_library_prober_report.h"
+#include "mir/report/lttng/mir_tracepoint.h"
+
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "shared_library_prober_report_tp.h"
+
+namespace mcl = mir::client;
+
+void mcl::lttng::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path)
+{
+    mir_tracepoint(mir_client_shared_library_prober, probing_path,
+                   path.string().c_str());
+}
+
+void mcl::lttng::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error)
+{
+    mir_tracepoint(mir_client_shared_library_prober, probing_failed,
+                   path.string().c_str(), error.what());
+}
+
+void mcl::lttng::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename)
+{
+    mir_tracepoint(mir_client_shared_library_prober, loading_library,
+                   filename.string().c_str());
+}
+
+void mcl::lttng::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error)
+{
+    mir_tracepoint(mir_client_shared_library_prober, loading_failed,
+                   filename.string().c_str(), error.what());
+}

=== added file 'src/client/lttng/shared_library_prober_report.h'
--- src/client/lttng/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/client/lttng/shared_library_prober_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include "mir/shared_library_prober_report.h"
+#include "client_tracepoint_provider.h"
+
+namespace mir
+{
+namespace client
+{
+namespace lttng
+{
+
+class SharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& path) override;
+    void probing_failed(boost::filesystem::path const& path, std::exception const& error) override;
+    void loading_library(boost::filesystem::path const& filename) override;
+    void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override;
+
+private:
+    ClientTracepointProvider tp_provider;
+};
+
+}
+}
+}
+
+#endif /* MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ */
+
+
+#ifndef SHARED_LIBRARY_PROBER_REPORT_H
+#define SHARED_LIBRARY_PROBER_REPORT_H
+
+
+#endif // SHARED_LIBRARY_PROBER_REPORT_H

=== added file 'src/client/lttng/shared_library_prober_report_tp.h'
--- src/client/lttng/shared_library_prober_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/client/lttng/shared_library_prober_report_tp.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_client_shared_library_prober
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h"
+
+#if !defined(MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_
+
+#include <lttng/tracepoint.h>
+#include <stdint.h>
+
+#ifdef __clang__
+/*
+ * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
+ * these functions are unused and so generate fatal warnings.
+ * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
+ */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wunused-function"
+#endif
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    probing_path,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    probing_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    loading_library,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    loading_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif /* MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>

=== modified file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	2014-08-27 19:44:04 +0000
+++ src/client/mesa/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -25,7 +25,7 @@
 
 set_target_properties(
   mirclientplatformmesa PROPERTIES
-  OUTPUT_NAME mirclientplatform
+  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
@@ -36,19 +36,19 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
+install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/mesa)
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa")
   add_custom_command(TARGET mirclientplatformmesa
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
+    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
+    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> ${MIR_CLIENT_DRIVER_BINARY}
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
 
   install(CODE
     "execute_process(
-       COMMAND ln -sf mir/clientplatform/mesa/libmirclientplatform.so
+       COMMAND ln -sf mir/${CLIENT_DRIVER}/mesa/${MIR_CLIENT_DRIVER_BINARY}
        WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
      )"
   )

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2014-08-29 13:12:16 +0000
+++ src/client/mir_connection.cpp	2014-10-10 13:43:10 +0000
@@ -227,7 +227,7 @@
          * is dispatched to the process even if it's blocked in the current
          * thread.
          */
-        kill(getpid(), SIGTERM);
+        kill(getpid(), SIGHUP);
     }
 }
 }
@@ -527,3 +527,8 @@
 {
     return server;
 }
+
+std::shared_ptr<mir::logging::Logger> const& MirConnection::the_logger() const
+{
+    return logger;
+}

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2014-08-29 13:12:16 +0000
+++ src/client/mir_connection.h	2014-10-10 13:43:10 +0000
@@ -134,6 +134,7 @@
     }
 
     mir::protobuf::DisplayServer& display_server();
+    std::shared_ptr<mir::logging::Logger> const& the_logger() const;
 
 private:
     // MUST be first data member so it is destroyed last.

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2014-08-04 16:58:57 +0000
+++ src/client/mir_surface.cpp	2014-10-10 13:43:10 +0000
@@ -24,6 +24,8 @@
 #include "mir_connection.h"
 #include "mir/input/input_receiver_thread.h"
 #include "mir/input/input_platform.h"
+#include "perf_report.h"
+#include "logging/perf_report.h"
 
 #include <cassert>
 #include <unistd.h>
@@ -54,6 +56,18 @@
       buffer_depository(std::make_shared<mcl::ClientBufferDepository>(factory, mir::frontend::client_buffer_cache_size)),
       input_platform(input_platform)
 {
+    const char* report_target = getenv("MIR_CLIENT_PERF_REPORT");
+    if (report_target && !strcmp(report_target, "log"))
+    {
+        auto& logger = connection->the_logger();
+        perf_report = std::make_shared<mir::client::logging::PerfReport>(logger);
+    }
+    else
+    {
+        perf_report = std::make_shared<mir::client::NullPerfReport>();
+    }
+    perf_report->name_surface(params.name);
+
     for (int i = 0; i < mir_surface_attribs; i++)
         attrib_cache[i] = -1;
 
@@ -159,6 +173,7 @@
     release_cpu_region();
     auto const id = &surface.id();
     auto const mutable_buffer = surface.mutable_buffer();
+    perf_report->end_frame(mutable_buffer->buffer_id());
     lock.unlock();
 
     next_buffer_wait_handle.expect_result();
@@ -209,6 +224,7 @@
         buffer_depository->deposit_package(std::move(ipc_package),
                                            buffer.buffer_id(),
                                            surface_size, surface_pf);
+        perf_report->begin_frame(buffer.buffer_id());
     }
     catch (const std::runtime_error& err)
     {

=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2014-07-21 03:35:31 +0000
+++ src/client/mir_surface.h	2014-10-10 13:43:10 +0000
@@ -47,6 +47,7 @@
 namespace client
 {
 class ClientBuffer;
+class PerfReport;
 
 struct MemoryRegion;
 }
@@ -139,6 +140,7 @@
 
     std::function<void(MirEvent const*)> handle_event_callback;
     std::shared_ptr<mir::input::receiver::InputReceiverThread> input_thread;
+    std::shared_ptr<mir::client::PerfReport> perf_report;
 };
 
 #endif /* MIR_CLIENT_PRIVATE_MIR_WAIT_HANDLE_H_ */

=== added file 'src/client/perf_report.h'
--- src/client/perf_report.h	1970-01-01 00:00:00 +0000
+++ src/client/perf_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_PERF_REPORT_H_
+#define MIR_CLIENT_PERF_REPORT_H_
+
+namespace mir
+{
+namespace client
+{
+
+class PerfReport
+{
+public:
+    virtual ~PerfReport() = default;
+    virtual void name_surface(char const*) = 0;
+    virtual void begin_frame(int buffer_id) = 0;
+    virtual void end_frame(int buffer_id) = 0;
+};
+
+class NullPerfReport : public PerfReport
+{
+public:
+    virtual void name_surface(char const*) {}
+    void begin_frame(int) override {}
+    void end_frame(int) override {}
+};
+
+} // namespace client
+} // namespace mir
+
+#endif // MIR_CLIENT_PERF_REPORT_H_

=== added file 'src/client/periodic_perf_report.cpp'
--- src/client/periodic_perf_report.cpp	1970-01-01 00:00:00 +0000
+++ src/client/periodic_perf_report.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#include "periodic_perf_report.h"
+
+using namespace mir::client;
+
+PeriodicPerfReport::PeriodicPerfReport(mir::time::Duration period,
+              std::shared_ptr<mir::time::Clock> const& clock)
+    : clock(clock)
+    , report_interval(period)
+    , last_report_time(current_time())
+{
+}
+
+PeriodicPerfReport::Timestamp PeriodicPerfReport::current_time() const
+{
+    return clock->sample();
+}
+
+void PeriodicPerfReport::name_surface(char const* s)
+{
+    name = s ? s : "?";
+}
+
+void PeriodicPerfReport::begin_frame(int buffer_id)
+{
+    frame_begin_time = current_time();
+
+    if (buffer_end_time.find(buffer_id) != buffer_end_time.end())
+    {
+        // Estimate page flip (composition finished) time as the time we
+        // eventually get the same buffer back.
+        auto estimated_page_flip_time = frame_begin_time;
+        auto buffer_queue_latency = estimated_page_flip_time -
+                                    buffer_end_time[buffer_id];
+        buffer_queue_latency_sum += buffer_queue_latency;
+    }
+}
+
+void PeriodicPerfReport::end_frame(int buffer_id)
+{
+    auto now = buffer_end_time[buffer_id] = current_time();
+    auto render_time = now - frame_begin_time;
+    render_time_sum += render_time;
+    ++frame_count;
+
+    auto interval = now - last_report_time;
+
+    if (interval >= report_interval)
+    {   // Precision matters. Don't use floats.
+        using namespace std::chrono;
+
+        // FPS x 100, remembering to keep millisecond accuracy.
+        long fps_100 = frame_count * 100000L /
+                       duration_cast<milliseconds>(interval).count();
+
+        auto render_time_avg = render_time_sum / frame_count;
+        auto queue_lag_avg = buffer_queue_latency_sum / frame_count;
+
+        // Remove history of old buffer ids
+        auto i = buffer_end_time.begin();
+        while (i != buffer_end_time.end())
+        {
+            if ((now - i->second) >= report_interval)
+                i = buffer_end_time.erase(i);
+            else
+                ++i;
+        }
+        int nbuffers = buffer_end_time.size();
+
+        display(name.c_str(), fps_100,
+                duration_cast<microseconds>(render_time_avg).count(),
+                duration_cast<microseconds>(queue_lag_avg).count(),
+                nbuffers);
+
+        last_report_time = now;
+        frame_count = 0;
+        render_time_sum = render_time_sum.zero();
+        buffer_queue_latency_sum = buffer_queue_latency_sum.zero();
+    }
+}
+

=== added file 'src/client/periodic_perf_report.h'
--- src/client/periodic_perf_report.h	1970-01-01 00:00:00 +0000
+++ src/client/periodic_perf_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_PERIODIC_PERF_REPORT_H_
+#define MIR_CLIENT_PERIODIC_PERF_REPORT_H_
+
+#include "perf_report.h"
+#include "mir/time/clock.h"
+#include <chrono>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+namespace mir
+{
+namespace client
+{
+
+class PeriodicPerfReport : public PerfReport
+{
+public:
+    PeriodicPerfReport(mir::time::Duration period,
+                       std::shared_ptr<mir::time::Clock> const& clock);
+    void name_surface(char const*) override;
+    void begin_frame(int buffer_id) override;
+    void end_frame(int buffer_id) override;
+    virtual void display(const char *name, long fps100,
+                         long rendertime_usec, long lag_usec,
+                         int nbuffers) const = 0;
+private:
+    typedef mir::time::Duration Duration;
+    typedef mir::time::Timestamp Timestamp;
+    Timestamp current_time() const;
+    std::shared_ptr<mir::time::Clock> const clock;
+    Duration const report_interval;
+    std::string name;
+    Timestamp last_report_time;
+    Timestamp frame_begin_time;
+    Timestamp frame_end_time;
+    Duration render_time_sum = Duration::zero();
+    Duration buffer_queue_latency_sum = Duration::zero();
+    int frame_count = 0;
+    std::unordered_map<int,Timestamp> buffer_end_time;
+};
+
+} // namespace client
+} // namespace mir
+
+#endif // MIR_CLIENT_PERIODIC_PERF_REPORT_H_

=== modified file 'src/client/rpc/make_socket_rpc_channel.cpp'
--- src/client/rpc/make_socket_rpc_channel.cpp	2014-07-21 03:35:31 +0000
+++ src/client/rpc/make_socket_rpc_channel.cpp	2014-10-10 13:43:10 +0000
@@ -52,7 +52,7 @@
     if (fd_prefix.is_start_of(name))
     {
         auto const fd = atoi(name.c_str()+fd_prefix.size);
-        transport = std::unique_ptr<mclr::StreamTransport>{new mclr::StreamSocketTransport{fd}};
+        transport = std::unique_ptr<mclr::StreamTransport>{new mclr::StreamSocketTransport{mir::Fd{fd}}};
     }
     else
     {

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2014-07-23 20:59:29 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2014-10-10 13:43:10 +0000
@@ -93,7 +93,7 @@
 
         if (response->fds_on_side_channel() > 0)
         {
-            std::vector<int32_t> fds(response->fds_on_side_channel());
+            std::vector<mir::Fd> fds(response->fds_on_side_channel());
             transport->receive_data(dummy.data(), dummy.size(), fds);
             for (auto &fd: fds)
                 response->add_fd(fd);

=== modified file 'src/client/rpc/null_rpc_report.cpp'
--- src/client/rpc/null_rpc_report.cpp	2014-07-21 03:35:31 +0000
+++ src/client/rpc/null_rpc_report.cpp	2014-10-10 13:43:10 +0000
@@ -81,7 +81,7 @@
 
 void mclr::NullRpcReport::file_descriptors_received(
     google::protobuf::Message const& /*response*/,
-    std::vector<int32_t> const& /*fds*/)
+    std::vector<mir::Fd> const& /*fds*/)
 {
 }
 

=== modified file 'src/client/rpc/null_rpc_report.h'
--- src/client/rpc/null_rpc_report.h	2014-07-21 03:35:31 +0000
+++ src/client/rpc/null_rpc_report.h	2014-10-10 13:43:10 +0000
@@ -50,7 +50,7 @@
                                   std::exception const& ex) override;
 
     void file_descriptors_received(google::protobuf::Message const& response,
-                                   std::vector<int32_t> const& fds) override;
+                                   std::vector<Fd> const& fds) override;
 
     void connection_failure(std::exception const& ex) override;
 };

=== modified file 'src/client/rpc/rpc_report.h'
--- src/client/rpc/rpc_report.h	2014-07-21 03:35:31 +0000
+++ src/client/rpc/rpc_report.h	2014-10-10 13:43:10 +0000
@@ -19,9 +19,10 @@
 #ifndef MIR_CLIENT_RPC_RPC_REPORT_H_
 #define MIR_CLIENT_RPC_RPC_REPORT_H_
 
-#include <mir_toolkit/event.h>
+#include "mir_toolkit/event.h"
 #include <boost/system/error_code.hpp>
 #include <google/protobuf/message.h>
+#include "mir/fd.h"
 
 namespace mir
 {
@@ -64,7 +65,7 @@
                                           std::exception const& ex) = 0;
 
     virtual void file_descriptors_received(google::protobuf::Message const& response,
-                                           std::vector<int32_t> const& fds) = 0;
+                                           std::vector<mir::Fd> const& fds) = 0;
 
     virtual void connection_failure(std::exception const& ex) = 0;
 

=== modified file 'src/client/rpc/stream_socket_transport.cpp'
--- src/client/rpc/stream_socket_transport.cpp	2014-07-17 08:06:31 +0000
+++ src/client/rpc/stream_socket_transport.cpp	2014-10-10 13:43:10 +0000
@@ -19,6 +19,7 @@
 #include "stream_socket_transport.h"
 #include "mir/variable_length_array.h"
 #include "mir/thread_name.h"
+#include "mir/fd_socket_transmission.h"
 
 #include <system_error>
 
@@ -32,41 +33,9 @@
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
 
-
-
 namespace mclr = mir::client::rpc;
 
-namespace {
-class socket_error : public std::system_error
-{
-public:
-    socket_error(std::string const& message)
-        : std::system_error(errno, std::system_category(), message)
-    {
-    }
-};
-
-
-class socket_disconnected_error : public std::system_error
-{
-public:
-    socket_disconnected_error(std::string const& message)
-        : std::system_error(errno, std::system_category(), message)
-    {
-    }
-};
-
-class fd_reception_error : public std::runtime_error
-{
-public:
-    fd_reception_error()
-        : std::runtime_error("Invalid control message for receiving file descriptors")
-    {
-    }
-};
-}
-
-mclr::StreamSocketTransport::StreamSocketTransport(int fd)
+mclr::StreamSocketTransport::StreamSocketTransport(mir::Fd const& fd)
     : socket_fd{fd}
 {
     init();
@@ -94,11 +63,6 @@
     observers.push_back(observer);
 }
 
-static bool socket_error_is_transient(int error_code)
-{
-    return (error_code == EINTR);
-}
-
 void mclr::StreamSocketTransport::receive_data(void* buffer, size_t bytes_requested)
 {
     /*
@@ -165,91 +129,15 @@
     }
 }
 
-void mclr::StreamSocketTransport::receive_data(void* buffer, size_t bytes_requested, std::vector<int>& fds)
-{
-    if (bytes_requested == 0)
-    {
-        BOOST_THROW_EXCEPTION(std::logic_error("Attempted to receive 0 bytes"));
-    }
-    size_t bytes_read{0};
-    unsigned fds_read{0};
-    while (bytes_read < bytes_requested)
-    {
-        // Store the data in the buffer requested
-        struct iovec iov;
-        iov.iov_base = static_cast<uint8_t*>(buffer) + bytes_read;
-        iov.iov_len = bytes_requested - bytes_read;
-        
-        // Allocate space for control message
-        static auto const builtin_n_fds = 5;
-        static auto const builtin_cmsg_space = CMSG_SPACE(builtin_n_fds * sizeof(int));
-        auto const fds_bytes = (fds.size() - fds_read) * sizeof(int);
-        mir::VariableLengthArray<builtin_cmsg_space> control{CMSG_SPACE(fds_bytes)};
-        
-        // Message to read
-        struct msghdr header;
-        header.msg_name = NULL;
-        header.msg_namelen = 0;
-        header.msg_iov = &iov;
-        header.msg_iovlen = 1;
-        header.msg_controllen = control.size();
-        header.msg_control = control.data();
-        header.msg_flags = 0;
-        
-        ssize_t const result = recvmsg(socket_fd, &header, MSG_NOSIGNAL | MSG_WAITALL);
-        if (result == 0)
-        {
-            notify_disconnected();
-            BOOST_THROW_EXCEPTION(std::runtime_error("Failed to read message from server: server has shutdown"));
-        }
-        if (result < 0)
-        {
-            if (socket_error_is_transient(errno))
-            {
-                continue;
-            }
-            if (errno == EPIPE)
-            {
-                notify_disconnected();
-                BOOST_THROW_EXCEPTION(
-                            boost::enable_error_info(socket_disconnected_error("Failed to read message from server"))
-                            << boost::errinfo_errno(errno));
-            }
-            BOOST_THROW_EXCEPTION(
-                        boost::enable_error_info(socket_error("Failed to read message from server"))
-                        << boost::errinfo_errno(errno));
-        }
-
-        bytes_read += result;
-        
-        // If we get a proper control message, copy the received
-        // file descriptors back to the caller
-        struct cmsghdr const* const cmsg = CMSG_FIRSTHDR(&header);
-        if (cmsg)
-        {
-            // NOTE: This relies on the file descriptor cmsg being read
-            // (and written) atomically.
-            if (cmsg->cmsg_len > CMSG_LEN(fds_bytes) || (header.msg_flags & MSG_CTRUNC))
-            {
-                BOOST_THROW_EXCEPTION(std::runtime_error("Received more fds than expected"));
-            }
-            if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
-            {
-                BOOST_THROW_EXCEPTION(fd_reception_error());
-            }
-            int const* const data = reinterpret_cast<int const*>CMSG_DATA(cmsg);
-            ptrdiff_t const header_size = reinterpret_cast<char const*>(data) - reinterpret_cast<char const*>(cmsg);
-            int const nfds = (cmsg->cmsg_len - header_size) / sizeof(int);
-            for (int i = 0; i < nfds; i++)
-                fds[fds_read + i] = data[i];
-
-            fds_read += nfds;
-        }
-    }
-    if (fds_read < fds.size())
-    {
-        BOOST_THROW_EXCEPTION(std::runtime_error("Receieved fewer fds than expected"));
-    }
+void mclr::StreamSocketTransport::receive_data(void* buffer, size_t bytes_requested, std::vector<mir::Fd>& fds)
+try
+{
+    mir::receive_data(socket_fd, buffer, bytes_requested, fds);
+}
+catch (socket_disconnected_error &e)
+{
+    notify_disconnected();
+    throw e;
 }
 
 void mclr::StreamSocketTransport::send_data(const std::vector<uint8_t>& buffer)
@@ -289,9 +177,9 @@
     // EPIPE behaviour; we don't want SIGPIPE when the IO loop terminates.
     int socket_fds[2];
     socketpair(AF_UNIX, SOCK_STREAM, 0, socket_fds);
-    this->shutdown_fd = socket_fds[1];
+    this->shutdown_fd = mir::Fd{socket_fds[1]};
 
-    auto shutdown_fd = socket_fds[0];
+    auto shutdown_fd = mir::Fd{socket_fds[0]};
     io_service_thread = std::thread([this, shutdown_fd]
     {
         // Our IO threads must not receive any signals
@@ -385,13 +273,11 @@
                 shutdown_requested = true;
             }
         }
-        ::close(shutdown_fd);
-        ::close(socket_fd);
         ::close(epoll_fd);
     });
 }
 
-int mclr::StreamSocketTransport::open_socket(std::string const& path)
+mir::Fd mclr::StreamSocketTransport::open_socket(std::string const& path)
 {
     struct sockaddr_un socket_address;
     // Appease the almighty valgrind
@@ -401,7 +287,7 @@
     // Must be memcpy rather than strcpy, as abstract socket paths start with '\0'
     memcpy(socket_address.sun_path, path.data(), path.size());
 
-    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    mir::Fd fd{socket(AF_UNIX, SOCK_STREAM, 0)};
     if (connect(fd, reinterpret_cast<sockaddr*>(&socket_address), sizeof(socket_address)) < 0)
     {
         BOOST_THROW_EXCEPTION(

=== modified file 'src/client/rpc/stream_socket_transport.h'
--- src/client/rpc/stream_socket_transport.h	2014-07-17 04:11:07 +0000
+++ src/client/rpc/stream_socket_transport.h	2014-10-10 13:43:10 +0000
@@ -21,6 +21,7 @@
 #define STREAM_SOCKET_TRANSPORT_H_
 
 #include "stream_transport.h"
+#include "mir/fd.h"
 
 #include <thread>
 #include <mutex>
@@ -35,24 +36,24 @@
 class StreamSocketTransport : public StreamTransport
 {
 public:
-    StreamSocketTransport(int fd);
+    StreamSocketTransport(Fd const& fd);
     StreamSocketTransport(std::string const& socket_path);
     ~StreamSocketTransport() override;
 
     void register_observer(std::shared_ptr<Observer> const& observer) override;
     void receive_data(void* buffer, size_t bytes_requested) override;
-    void receive_data(void* buffer, size_t bytes_requested, std::vector<int>& fds) override;
+    void receive_data(void* buffer, size_t bytes_requested, std::vector<Fd>& fds) override;
     void send_data(const std::vector<uint8_t> &buffer) override;
 
 private:
     void init();
-    int open_socket(std::string const& path);
+    Fd open_socket(std::string const& path);
     void notify_data_available();
     void notify_disconnected();
 
     std::thread io_service_thread;
-    int const socket_fd;
-    int shutdown_fd;
+    Fd const socket_fd;
+    Fd shutdown_fd;
 
     std::mutex observer_mutex;
     std::vector<std::shared_ptr<Observer>> observers;

=== modified file 'src/client/rpc/stream_transport.h'
--- src/client/rpc/stream_transport.h	2014-07-17 04:11:07 +0000
+++ src/client/rpc/stream_transport.h	2014-10-10 13:43:10 +0000
@@ -24,6 +24,8 @@
 #include <memory>
 #include <stdint.h>
 
+#include "mir/fd.h"
+
 namespace mir
 {
 namespace client
@@ -133,7 +135,7 @@
      *
      * \note This provides stream semantics - message boundaries are not preserved.
      */
-    virtual void receive_data(void* buffer, size_t bytes_requested, std::vector<int>& fds) = 0;
+    virtual void receive_data(void* buffer, size_t bytes_requested, std::vector<Fd>& fds) = 0;
 
     /**
      * \brief Write data to the server

=== renamed directory 'src/shared' => 'src/common'
=== modified file 'src/common/CMakeLists.txt'
--- src/shared/CMakeLists.txt	2014-08-27 19:44:04 +0000
+++ src/common/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -15,6 +15,8 @@
 add_subdirectory(env)
 add_subdirectory(sharedlibrary)
 add_subdirectory(thread)
+add_subdirectory(time)
+list(APPEND MIR_COMMON_SOURCES $<TARGET_OBJECTS:mirtime>)
 
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -40,7 +42,7 @@
 )
 
 # TODO we need a place to manage ABI and related versioning but use this as placeholder
-set(MIRCOMMON_ABI 1)
+set(MIRCOMMON_ABI 2)
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(mircommon
@@ -53,7 +55,7 @@
 install(TARGETS mircommon LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(
-  DIRECTORY ${CMAKE_SOURCE_DIR}/include/shared/mir ${CMAKE_SOURCE_DIR}/include/shared/mir_toolkit
+  DIRECTORY ${CMAKE_SOURCE_DIR}/include/common/mir ${CMAKE_SOURCE_DIR}/include/common/mir_toolkit
   DESTINATION "include/mircommon"
 )
 

=== modified file 'src/common/fd/CMakeLists.txt'
--- src/shared/fd/CMakeLists.txt	2014-07-24 11:41:11 +0000
+++ src/common/fd/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -16,10 +16,11 @@
 
 add_library(mirsharedfd OBJECT
   fd.cpp
+  fd_socket_transmission.cpp
 )
 
 list(APPEND MIR_COMMON_SOURCES
   $<TARGET_OBJECTS:mirsharedfd>
 )
 
-set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
\ No newline at end of file
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)

=== added file 'src/common/fd/fd_socket_transmission.cpp'
--- src/common/fd/fd_socket_transmission.cpp	1970-01-01 00:00:00 +0000
+++ src/common/fd/fd_socket_transmission.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#include "mir/fd_socket_transmission.h"
+#include "mir/variable_length_array.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <string.h>
+#include <boost/throw_exception.hpp>
+#include <boost/exception/errinfo_errno.hpp>
+#include <stdexcept>
+
+mir::socket_error::socket_error(std::string const& message) :
+    std::system_error(errno, std::system_category(), message)
+{
+}
+
+mir::socket_disconnected_error::socket_disconnected_error(std::string const& message) :
+    std::system_error(errno, std::system_category(), message)
+{
+}
+
+mir::fd_reception_error::fd_reception_error() :
+    std::runtime_error("Invalid control message for receiving file descriptors")
+{
+}
+
+void mir::send_fds(
+    mir::Fd const& socket,
+    std::vector<mir::Fd> const& fds)
+{
+    if (fds.size() > 0)
+    {
+        // We send dummy data
+        struct iovec iov;
+        char dummy_iov_data = 'M';
+        iov.iov_base = &dummy_iov_data;
+        iov.iov_len = 1;
+
+        // Allocate space for control message
+        static auto const builtin_n_fds = 5;
+        static auto const builtin_cmsg_space = CMSG_SPACE(builtin_n_fds * sizeof(int));
+        auto const fds_bytes = fds.size() * sizeof(int);
+        mir::VariableLengthArray<builtin_cmsg_space> control{CMSG_SPACE(fds_bytes)};
+        // Silence valgrind uninitialized memory complaint
+        memset(control.data(), 0, control.size());
+
+        // Message to send
+        struct msghdr header;
+        header.msg_name = NULL;
+        header.msg_namelen = 0;
+        header.msg_iov = &iov;
+        header.msg_iovlen = 1;
+        header.msg_controllen = control.size();
+        header.msg_control = control.data();
+        header.msg_flags = 0;
+
+        // Control message contains file descriptors
+        struct cmsghdr *message = CMSG_FIRSTHDR(&header);
+        message->cmsg_len = CMSG_LEN(fds_bytes);
+        message->cmsg_level = SOL_SOCKET;
+        message->cmsg_type = SCM_RIGHTS;
+
+        int* const data = reinterpret_cast<int*>(CMSG_DATA(message));
+        int i = 0;
+        for (auto& fd : fds)
+            data[i++] = fd;
+
+        auto const sent = sendmsg(socket, &header, 0);
+        if (sent < 0)
+            BOOST_THROW_EXCEPTION(std::runtime_error("Failed to send fds: " + std::string(strerror(errno))));
+    }
+}
+
+bool mir::socket_error_is_transient(int error_code)
+{
+    return (error_code == EINTR);
+}
+
+void mir::receive_data(mir::Fd const& socket, void* buffer, size_t bytes_requested, std::vector<mir::Fd>& fds)
+{
+    if (bytes_requested == 0)
+        BOOST_THROW_EXCEPTION(std::logic_error("Attempted to receive 0 bytes"));
+
+    size_t bytes_read{0};
+    unsigned fds_read{0};
+    while (bytes_read < bytes_requested)
+    {
+        // Store the data in the buffer requested
+        struct iovec iov;
+        iov.iov_base = static_cast<uint8_t*>(buffer) + bytes_read;
+        iov.iov_len = bytes_requested - bytes_read;
+        
+        // Allocate space for control message
+        static auto const builtin_n_fds = 5;
+        static auto const builtin_cmsg_space = CMSG_SPACE(builtin_n_fds * sizeof(int));
+        auto const fds_bytes = (fds.size() - fds_read) * sizeof(int);
+        mir::VariableLengthArray<builtin_cmsg_space> control{CMSG_SPACE(fds_bytes)};
+        
+        // Message to read
+        struct msghdr header;
+        header.msg_name = NULL;
+        header.msg_namelen = 0;
+        header.msg_iov = &iov;
+        header.msg_iovlen = 1;
+        header.msg_controllen = control.size();
+        header.msg_control = control.data();
+        header.msg_flags = 0;
+        
+        ssize_t const result = recvmsg(socket, &header, MSG_NOSIGNAL | MSG_WAITALL);
+        if (result == 0)
+            BOOST_THROW_EXCEPTION(socket_disconnected_error("Failed to read message from server: server has shutdown"));
+        if (result < 0)
+        {
+            if (socket_error_is_transient(errno))
+                continue;
+            if (errno == EPIPE)
+                BOOST_THROW_EXCEPTION(
+                    boost::enable_error_info(socket_disconnected_error("Failed to read message from server"))
+                << boost::errinfo_errno(errno));
+
+            BOOST_THROW_EXCEPTION(
+                        boost::enable_error_info(socket_error("Failed to read message from server"))
+                        << boost::errinfo_errno(errno));
+        }
+
+        bytes_read += result;
+        
+        // If we get a proper control message, copy the received
+        // file descriptors back to the caller
+        struct cmsghdr const* const cmsg = CMSG_FIRSTHDR(&header);
+        if (cmsg)
+        {
+            // NOTE: This relies on the file descriptor cmsg being read
+            // (and written) atomically.
+            if (cmsg->cmsg_len > CMSG_LEN(fds_bytes) || (header.msg_flags & MSG_CTRUNC))
+            {
+                BOOST_THROW_EXCEPTION(std::runtime_error("Received more fds than expected"));
+            }
+            if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
+            {
+                BOOST_THROW_EXCEPTION(fd_reception_error());
+            }
+            int const* const data = reinterpret_cast<int const*>CMSG_DATA(cmsg);
+            ptrdiff_t const header_size = reinterpret_cast<char const*>(data) - reinterpret_cast<char const*>(cmsg);
+            int const nfds = (cmsg->cmsg_len - header_size) / sizeof(int);
+
+            // We can't properly pass mir::Fds through google::protobuf::Message,
+            // which is where these get shoved.
+            //
+            // When we have our own RPC generator plugin and aren't using deprecated
+            // Protobuf features this can go away.
+            for (int i = 0; i < nfds; i++)
+                fds[fds_read + i] = mir::Fd{mir::IntOwnedFd{data[i]}};
+
+            fds_read += nfds;
+        }
+    }
+
+    if (fds_read < fds.size())
+        BOOST_THROW_EXCEPTION(std::runtime_error("Receieved fewer fds than expected"));
+}

=== modified file 'src/common/input/android/android_input_receiver.cpp'
--- src/shared/input/android/android_input_receiver.cpp	2014-08-29 13:25:18 +0000
+++ src/common/input/android/android_input_receiver.cpp	2014-10-10 13:43:10 +0000
@@ -90,18 +90,26 @@
      *   consumeBatches = true, so as to ensure the "cooked" event rate that
      *      clients experience is at least the minimum of event_rate_hz
      *      and the raw device event rate.
-     *   frame_time = A regular interval of 60Hz. This provides a virtual frame
+     *   frame_time = A regular interval. This provides a virtual frame
      *      interval during which InputConsumer will collect raw events,
-     *      resample them and emit a "cooked" event back to us at least every
+     *      resample them and emit a "cooked" event back to us at roughly every
      *      60th of a second. "cooked" events are both smoothed and
      *      extrapolated/predicted into the future (for tool=finger) giving the
      *      appearance of lower latency. Getting a real frame time from the
      *      graphics logic (which is messy) does not appear to be necessary to
      *      gain significant benefit.
+     *
+     * Note event_rate_hz is only 55Hz. This allows rendering to catch up and
+     * overtake the event rate every ~12th frame (200ms) on a 60Hz display.
+     * Thus on every 12th+1 frame, there will be zero buffer lag in responding
+     * to the cooked input event we have given the client.
+     * This phase control is useful as it eliminates the one frame of lag you
+     * would otherwise never catch up to if the event rate was exactly the same
+     * as the display refresh rate.
      */
 
     nsecs_t const now = android_clock(SYSTEM_TIME_MONOTONIC);
-    int const event_rate_hz = 60;
+    int const event_rate_hz = 55;
     nsecs_t const one_frame = 1000000000ULL / event_rate_hz;
     nsecs_t frame_time = (now / one_frame) * one_frame;
 
@@ -141,15 +149,11 @@
     }
     else if (input_consumer->hasPendingBatch())
     {
-        /*
-         * A batch is pending and must be completed or else the client could
-         * be starved of events. But don't hurry. A continuous motion gesture
-         * will wake us up much sooner than 50ms. This timeout is only reached
-         * in the case that motion has ended (fingers lifted).
-         */
-        std::chrono::milliseconds const motion_idle_timeout(50);
-        if (timeout.count() < 0 || timeout > motion_idle_timeout)
-            reduced_timeout = motion_idle_timeout;
+        // When in constant motion we will usually "hasPendingBatch".
+        // But the batch won't get flushed until the next frame interval,
+        // so be sure to use a non-zero sleep time to avoid spinning the CPU
+        // for the whole interval...
+        reduced_timeout = std::chrono::milliseconds(1);
     }
 
     auto result = looper->pollOnce(reduced_timeout.count());

=== modified file 'src/common/logging/CMakeLists.txt'
--- src/shared/logging/CMakeLists.txt	2014-07-24 11:30:35 +0000
+++ src/common/logging/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -17,6 +17,7 @@
 add_library(mirsharedlogging OBJECT
   dumb_console_logger.cpp
   input_timestamp.cpp
+  shared_library_prober_report.cpp
 )
 
 list(APPEND MIR_COMMON_SOURCES

=== added file 'src/common/logging/shared_library_prober_report.cpp'
--- src/common/logging/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
+++ src/common/logging/shared_library_prober_report.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/logging/shared_library_prober_report.h"
+#include "mir/logging/logger.h"
+
+namespace ml = mir::logging;
+
+ml::SharedLibraryProberReport::SharedLibraryProberReport(std::shared_ptr<Logger> const& logger)
+    : logger{logger}
+{
+}
+
+void ml::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path)
+{
+    logger->log(ml::Logger::Severity::informational,
+                std::string("Loading modules from: ") + path.string(),
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error)
+{
+    logger->log(ml::Logger::Severity::error,
+                std::string("Failed to load libraries from path: ") + path.string() +
+                " (error was:" + error.what() + ")",
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename)
+{
+    logger->log(ml::Logger::Severity::informational,
+                std::string("Loading module: ") + filename.string(),
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error)
+{
+    logger->log(ml::Logger::Severity::warning,
+                std::string("Failed to load module: ") + filename.string() +
+                " (error was:" + error.what() + ")",
+                "Loader");
+}

=== modified file 'src/common/protobuf/mir_protobuf.proto'
--- src/shared/protobuf/mir_protobuf.proto	2014-07-21 03:35:31 +0000
+++ src/common/protobuf/mir_protobuf.proto	2014-10-10 13:43:10 +0000
@@ -25,6 +25,11 @@
   required int32 value = 1;
 };
 
+message BufferRequest {
+  optional SurfaceId id = 1;
+  optional Buffer buffer = 2;
+};
+
 message Buffer {
   optional int32 buffer_id = 1;
   repeated sint32 fd = 2;
@@ -221,4 +226,5 @@
 
   rpc start_prompt_session(PromptSessionParameters) returns (Void);
   rpc stop_prompt_session(Void) returns (Void);
+  rpc exchange_buffer(BufferRequest) returns (Buffer);
 }

=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
--- src/shared/sharedlibrary/CMakeLists.txt	2014-07-24 11:30:35 +0000
+++ src/common/sharedlibrary/CMakeLists.txt	2014-10-10 13:43:10 +0000
@@ -16,6 +16,7 @@
 
 add_library(mirsharedsharedlibrary OBJECT
   shared_library.cpp
+  shared_library_prober.cpp
 )
 
 list(APPEND MIR_COMMON_SOURCES

=== modified file 'src/common/sharedlibrary/shared_library.cpp'
--- src/shared/sharedlibrary/shared_library.cpp	2014-03-06 06:05:17 +0000
+++ src/common/sharedlibrary/shared_library.cpp	2014-10-10 13:43:10 +0000
@@ -53,3 +53,15 @@
         BOOST_THROW_EXCEPTION(std::runtime_error(dlerror()));
     }
 }
+
+void* mir::SharedLibrary::load_symbol(char const* function_name, char const* version) const
+{
+    if (void* result = dlvsym(so, function_name, version))
+    {
+        return result;
+    }
+    else
+    {
+        BOOST_THROW_EXCEPTION(std::runtime_error(dlerror()));
+    }
+}

=== added file 'src/common/sharedlibrary/shared_library_prober.cpp'
--- src/common/sharedlibrary/shared_library_prober.cpp	1970-01-01 00:00:00 +0000
+++ src/common/sharedlibrary/shared_library_prober.cpp	2014-10-10 13:43:10 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/shared_library_prober.h"
+#include "mir/shared_library.h"
+
+#include <system_error>
+#include <boost/filesystem.hpp>
+
+namespace
+{
+std::error_code boost_to_std_error(boost::system::error_code const& ec)
+{
+    if (ec)
+    {
+        if (ec.category() != boost::system::system_category())
+        {
+            throw std::logic_error{"Boost error from unexpected category: " +
+                                   ec.message()};
+        }
+        return std::error_code{ec.value(), std::system_category()};
+    }
+    return std::error_code{};
+}
+}
+
+std::vector<std::shared_ptr<mir::SharedLibrary>>
+mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
+{
+    report.probing_path(path);
+    // We use the error_code overload because we want to throw a std::system_error
+    boost::system::error_code ec;
+
+    boost::filesystem::directory_iterator iterator{path, ec};
+    if (ec)
+    {
+        std::system_error error{boost_to_std_error(ec)};
+        report.probing_failed(path, error);
+        throw error;
+    }
+
+    std::vector<std::shared_ptr<mir::SharedLibrary>> libraries;
+    for (; iterator != boost::filesystem::directory_iterator() ; ++iterator)
+    {
+        if (iterator->path().extension().string() == ".so")
+        {
+            try
+            {
+                report.loading_library(iterator->path());
+                libraries.emplace_back(std::make_shared<mir::SharedLibrary>(iterator->path().string()));
+            }
+            catch (std::runtime_error const& err)
+            {
+                report.loading_failed(iterator->path(), err);
+            }
+        }
+    }
+    return libraries;
+}

=== modified file 'src/common/symbols.map'
--- src/shared/symbols.map	2014-08-26 15:02:57 +0000
+++ src/common/symbols.map	2014-10-10 13:43:10 +0000
@@ -1,8 +1,8 @@
-MIR_COMMON_1 {
+MIR_COMMON_2 {
  global:
   extern "C++" {
 # The following symbols come from running a script over the generated docs. Vis:
-# ../tools/process_doygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: /    /" | sort  
+# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: /    /" | sort  
     mir_arrow_cursor_name*;
     mir_busy_cursor_name*;
     mir_caret_cursor_name*;
@@ -130,12 +130,19 @@
     mir::input::receiver::XKBMapper::update_state_and_map_event*;
     mir::input::receiver::XKBMapper::?XKBMapper*;
     mir::input::receiver::XKBMapper::XKBMapper*;
+    mir::libraries_for_path*;
     mir::logging::DumbConsoleLogger::log*;
     mir::logging::input_timestamp*;
     mir::logging::Logger::log*;
     mir::logging::Logger::?Logger*;
     mir::logging::Logger::Logger*;
     mir::logging::Logger::operator*;
+    mir::logging::SharedLibraryProberReport::?SharedLibraryProberReport*;
+    mir::logging::SharedLibraryProberReport::SharedLibraryProberReport*;
+    mir::logging::SharedLibraryProberReport::probing_path*;
+    mir::logging::SharedLibraryProberReport::probing_failed*;
+    mir::logging::SharedLibraryProberReport::loading_library*;
+    mir::logging::SharedLibraryProberReport::loading_failed*;
     mir_omnidirectional_resize_cursor_name*;
     mir_open_hand_cursor_name*;
     mir_pointing_hand_cursor_name*;
@@ -160,6 +167,23 @@
     mir::protobuf::Buffer::MergeFrom*;
     mir::protobuf::Buffer::MergePartialFromCodedStream*;
     mir::protobuf::Buffer::New*;
+    mir::protobuf::BufferRequest::?BufferRequest*;
+    mir::protobuf::BufferRequest::BufferRequest*;
+    mir::protobuf::BufferRequest::ByteSize*;
+    mir::protobuf::BufferRequest::Clear*;
+    mir::protobuf::BufferRequest::CopyFrom*;
+    mir::protobuf::BufferRequest::default_instance*;
+    mir::protobuf::BufferRequest::descriptor*;
+    mir::protobuf::BufferRequest::GetMetadata*;
+    mir::protobuf::BufferRequest::IsInitialized*;
+    mir::protobuf::BufferRequest::kBufferFieldNumber*;
+    mir::protobuf::BufferRequest::kIdFieldNumber*;
+    mir::protobuf::BufferRequest::MergeFrom*;
+    mir::protobuf::BufferRequest::MergePartialFromCodedStream*;
+    mir::protobuf::BufferRequest::New*;
+    mir::protobuf::BufferRequest::SerializeWithCachedSizes*;
+    mir::protobuf::BufferRequest::SerializeWithCachedSizesToArray*;
+    mir::protobuf::BufferRequest::Swap*;
     mir::protobuf::Buffer::SerializeWithCachedSizes*;
     mir::protobuf::Buffer::SerializeWithCachedSizesToArray*;
     mir::protobuf::Buffer::Swap*;
@@ -330,6 +354,7 @@
     mir::protobuf::DisplayServer::disconnect*;
     mir::protobuf::DisplayServer::?DisplayServer*;
     mir::protobuf::DisplayServer::drm_auth_magic*;
+    mir::protobuf::DisplayServer::exchange_buffer*;
     mir::protobuf::DisplayServer::GetDescriptor*;
     mir::protobuf::DisplayServer::GetRequestPrototype*;
     mir::protobuf::DisplayServer::GetResponsePrototype*;
@@ -350,6 +375,7 @@
     mir::protobuf::DisplayServer_Stub::?DisplayServer_Stub*;
     mir::protobuf::DisplayServer_Stub::DisplayServer_Stub*;
     mir::protobuf::DisplayServer_Stub::drm_auth_magic*;
+    mir::protobuf::DisplayServer_Stub::exchange_buffer*;
     mir::protobuf::DisplayServer_Stub::new_fds_for_prompt_providers*;
     mir::protobuf::DisplayServer_Stub::next_buffer*;
     mir::protobuf::DisplayServer_Stub::release_screencast*;
@@ -807,6 +833,7 @@
     typeinfo?for?MirKeyEvent;
     typeinfo?for?mir::logging::DumbConsoleLogger;
     typeinfo?for?mir::logging::Logger;
+    typeinfo?for?mir::logging::SharedLibraryProberReport;
     typeinfo?for?MirMesaEGLNativeDisplay;
     typeinfo?for?MirMesaEGLNativeSurface;
     typeinfo?for?MirMotionEvent;
@@ -899,6 +926,7 @@
     vtable?for?MirKeyEvent;
     vtable?for?mir::logging::DumbConsoleLogger;
     vtable?for?mir::logging::Logger;
+    vtable?for?mir::logging::SharedLibraryProberReport;
     vtable?for?MirMesaEGLNativeDisplay;
     vtable?for?MirMesaEGLNativeSurface;
     vtable?for?MirMotionEvent;
@@ -954,6 +982,41 @@
     vtable?for?mir::udev::Enumerator;
     vtable?for?mir::udev::Enumerator::iterator;
     vtable?for?mir::udev::Monitor;
+
+    mir::time::Clock::?Clock*;
+    mir::time::Clock::Clock*;
+    mir::time::Clock::sample*;
+    non-virtual?thunk?to?mir::time::Clock::?Clock*;
+    typeinfo?for?mir::time::Clock;
+    vtable?for?mir::time::Clock;
+
+    mir::time::HighResolutionClock::sample*;
+    non-virtual?thunk?to?mir::time::HighResolutionClock::sample*;
+    typeinfo?for?mir::time::HighResolutionClock;
+    vtable?for?mir::time::HighResolutionClock;
+  };
+ local: *;
+};
+
+MIR_COMMON_2.1 {
+ global:
+  extern "C++" {
+    mir::send_fds*;
+  };
+ local: *;
+};
+
+MIR_COMMON_2.2 {
+ global:
+  extern "C++" {
+    mir::fd_reception_error::fd_reception_error*;
+    mir::receive_data*;
+    mir::socket_error::socket_error*;
+    mir::socket_error_is_transient*;
+    mir::socket_disconnected_error*;
+    typeinfo?for?mir::fd_reception_error;
+    typeinfo?for?mir::socket_error;
+    typeinfo?for?mir::socket_disconnected_error;
   };
  local: *;
 };

=== renamed directory 'src/server/time' => 'src/common/time'
=== modified file 'src/common/time/high_resolution_clock.cpp'
--- src/server/time/high_resolution_clock.cpp	2013-04-24 05:22:20 +0000
+++ src/common/time/high_resolution_clock.cpp	2014-10-10 13:43:10 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013 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,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Alan Griffiths <[e-mail]>

=== added directory 'src/include'
=== added directory 'src/include/common'
=== added directory 'src/include/common/mir'
=== renamed file 'include/shared/mir/basic_observers.h' => 'src/include/common/mir/basic_observers.h'
--- include/shared/mir/basic_observers.h	2014-07-11 14:59:41 +0000
+++ src/include/common/mir/basic_observers.h	2014-10-10 13:43:10 +0000
@@ -95,7 +95,7 @@
         !current_item->next.compare_exchange_weak(expected, new_item);
         expected = nullptr)
     {
-        current_item = expected;
+        if (expected) current_item = expected;
     }
 }
 

=== renamed file 'include/shared/mir/default_configuration.h' => 'src/include/common/mir/default_configuration.h'
=== added file 'src/include/common/mir/fd_socket_transmission.h'
--- src/include/common/mir/fd_socket_transmission.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/fd_socket_transmission.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_FD_SOCKET_TRANSMISSION_H_
+#define MIR_FD_SOCKET_TRANSMISSION_H_
+#include "mir/fd.h"
+#include <vector>
+#include <system_error>
+#include <stdexcept>
+
+namespace mir
+{
+struct socket_error : std::system_error
+{
+    socket_error(std::string const& message);
+};
+
+struct socket_disconnected_error : std::system_error
+{
+    socket_disconnected_error(std::string const& message);
+};
+
+struct fd_reception_error : std::runtime_error
+{
+    fd_reception_error();
+};
+
+bool socket_error_is_transient(int error_code);
+void send_fds(mir::Fd const& socket, std::vector<mir::Fd> const& fd);
+void receive_data(mir::Fd const& socket, void* buffer, size_t bytes_requested, std::vector<mir::Fd>& fds);
+}
+#endif /* MIR_FD_SOCKET_TRANSMISSION_H_ */

=== added directory 'src/include/common/mir/frontend'
=== renamed file 'include/shared/mir/frontend/client_constants.h' => 'src/include/common/mir/frontend/client_constants.h'
=== added directory 'src/include/common/mir/geometry'
=== renamed file 'include/shared/mir/geometry/displacement.h' => 'src/include/common/mir/geometry/displacement.h'
--- include/shared/mir/geometry/displacement.h	2014-03-06 06:05:17 +0000
+++ src/include/common/mir/geometry/displacement.h	2014-10-10 13:43:10 +0000
@@ -19,8 +19,8 @@
 #ifndef MIR_GEOMETRY_DISPLACEMENT_H_
 #define MIR_GEOMETRY_DISPLACEMENT_H_
 
-#include "dimensions.h"
-#include "point.h"
+#include "mir/geometry/dimensions.h"
+#include "mir/geometry/point.h"
 
 #include <iosfwd>
 

=== renamed file 'include/shared/mir/geometry/forward.h' => 'src/include/common/mir/geometry/forward.h'
=== renamed file 'include/shared/mir/geometry/length.h' => 'src/include/common/mir/geometry/length.h'
=== added directory 'src/include/common/mir/graphics'
=== added directory 'src/include/common/mir/graphics/android'
=== renamed file 'include/shared/mir/graphics/android/android_driver_interpreter.h' => 'src/include/common/mir/graphics/android/android_driver_interpreter.h'
=== renamed file 'include/shared/mir/graphics/android/android_native_buffer.h' => 'src/include/common/mir/graphics/android/android_native_buffer.h'
=== renamed file 'include/shared/mir/graphics/android/fence.h' => 'src/include/common/mir/graphics/android/fence.h'
=== renamed file 'include/shared/mir/graphics/android/mir_native_window.h' => 'src/include/common/mir/graphics/android/mir_native_window.h'
=== renamed file 'include/shared/mir/graphics/android/native_buffer.h' => 'src/include/common/mir/graphics/android/native_buffer.h'
=== renamed file 'include/shared/mir/graphics/android/sync_fence.h' => 'src/include/common/mir/graphics/android/sync_fence.h'
=== added directory 'src/include/common/mir/input'
=== added directory 'src/include/common/mir/input/android'
=== renamed file 'include/shared/mir/input/android/android_input_lexicon.h' => 'src/include/common/mir/input/android/android_input_lexicon.h'
=== renamed file 'include/shared/mir/input/input_receiver_report.h' => 'src/include/common/mir/input/input_receiver_report.h'
=== renamed file 'include/shared/mir/input/null_input_receiver_report.h' => 'src/include/common/mir/input/null_input_receiver_report.h'
=== renamed file 'include/shared/mir/input/xkb_mapper.h' => 'src/include/common/mir/input/xkb_mapper.h'
=== added directory 'src/include/common/mir/logging'
=== renamed file 'include/shared/mir/logging/dumb_console_logger.h' => 'src/include/common/mir/logging/dumb_console_logger.h'
=== renamed file 'include/shared/mir/logging/input_timestamp.h' => 'src/include/common/mir/logging/input_timestamp.h'
=== renamed file 'include/shared/mir/logging/logger.h' => 'src/include/common/mir/logging/logger.h'
=== added file 'src/include/common/mir/logging/null_shared_library_prober_report.h'
--- src/include/common/mir/logging/null_shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/logging/null_shared_library_prober_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include "mir/shared_library_prober_report.h"
+
+namespace mir
+{
+namespace logging
+{
+
+class NullSharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& /*path*/) override
+    {
+    }
+    void probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) override
+    {
+    }
+    void loading_library(boost::filesystem::path const& /*filename*/) override
+    {
+    }
+    void loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) override
+    {
+    }
+};
+
+}
+}
+
+#endif /* MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ */

=== added file 'src/include/common/mir/logging/shared_library_prober_report.h'
--- src/include/common/mir/logging/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/logging/shared_library_prober_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include "mir/shared_library_prober_report.h"
+#include <memory>
+
+namespace mir
+{
+namespace logging
+{
+class Logger;
+
+class SharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    SharedLibraryProberReport(std::shared_ptr<Logger> const& logger);
+
+    void probing_path(boost::filesystem::path const& path) override;
+    void probing_failed(boost::filesystem::path const& path, std::exception const& error) override;
+    void loading_library(boost::filesystem::path const& filename) override;
+    void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override;
+
+private:
+    std::shared_ptr<Logger> const logger;
+};
+
+}
+}
+
+#endif /* MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_ */

=== added directory 'src/include/common/mir/protobuf'
=== renamed file 'include/shared/mir/protobuf/google_protobuf_guard.h' => 'src/include/common/mir/protobuf/google_protobuf_guard.h'
=== renamed file 'include/shared/mir/raii.h' => 'src/include/common/mir/raii.h'
=== renamed file 'include/shared/mir/recursive_read_write_mutex.h' => 'src/include/common/mir/recursive_read_write_mutex.h'
=== added directory 'src/include/common/mir/report'
=== added directory 'src/include/common/mir/report/lttng'
=== renamed file 'include/shared/mir/report/lttng/mir_tracepoint.h' => 'src/include/common/mir/report/lttng/mir_tracepoint.h'
--- include/shared/mir/report/lttng/mir_tracepoint.h	2014-03-06 06:05:17 +0000
+++ src/include/common/mir/report/lttng/mir_tracepoint.h	2014-10-10 13:43:10 +0000
@@ -19,23 +19,6 @@
 #ifndef MIR_LTTNG_MIR_TRACEPOINT_H_
 #define MIR_LTTNG_MIR_TRACEPOINT_H_
 
-/*
- * The STAP_PROBEV() macro from sdt.h (SystemTap) used by
- * the tracepoint() macro from lttng/tracepoint.h fails to
- * build with clang at the moment. Disable tracepoints
- * when building with clang until this is resolved.
- *
- * See: http://sourceware.org/bugzilla/show_bug.cgi?id=13974
- */
-#ifdef __clang__
-namespace mir_systemtap_bug_13974
-{
-inline void mir_tracepoint_consume_args(int, ...) {}
-}
-#define mir_tracepoint(c, e, ...) ::mir_systemtap_bug_13974::mir_tracepoint_consume_args(0, __VA_ARGS__)
-#pragma message "Building with clang: Disabling LTTng tracepoints."
-#else
 #define mir_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)
-#endif
 
 #endif /* MIR_LTTNG_MIR_TRACEPOINT_H_ */

=== renamed file 'include/shared/mir/report/lttng/tracepoint_provider.h' => 'src/include/common/mir/report/lttng/tracepoint_provider.h'
=== renamed file 'include/shared/mir/shared_library.h' => 'src/include/common/mir/shared_library.h'
--- include/shared/mir/shared_library.h	2014-03-26 05:48:59 +0000
+++ src/include/common/mir/shared_library.h	2014-10-10 13:43:10 +0000
@@ -43,9 +43,18 @@
     {
         return load_function<FunctionPtr>(function_name.c_str());
     }
+
+    template<typename FunctionPtr>
+    FunctionPtr load_function(std::string const& function_name, std::string const& version) const
+    {
+        FunctionPtr result{};
+        (void*&)result = load_symbol(function_name.c_str(), version.c_str());
+        return result;
+    }
 private:
     void* const so;
     void* load_symbol(char const* function_name) const;
+    void* load_symbol(char const* function_name, char const* version) const;
     SharedLibrary(SharedLibrary const&) = delete;
     SharedLibrary& operator=(SharedLibrary const&) = delete;
 };

=== added file 'src/include/common/mir/shared_library_prober.h'
--- src/include/common/mir/shared_library_prober.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/shared_library_prober.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_SHARED_LIBRARY_PROBER_H_
+#define MIR_SHARED_LIBRARY_PROBER_H_
+
+#include "shared_library_prober_report.h"
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace mir
+{
+class SharedLibrary;
+
+std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report);
+}
+
+
+#endif /* MIR_SHARED_LIBRARY_PROBER_H_ */

=== added file 'src/include/common/mir/shared_library_prober_report.h'
--- src/include/common/mir/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/shared_library_prober_report.h	2014-10-10 13:43:10 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include <boost/filesystem.hpp>
+
+namespace mir
+{
+class SharedLibraryProberReport
+{
+public:
+    virtual ~SharedLibraryProberReport() = default;
+
+    virtual void probing_path(boost::filesystem::path const& path) = 0;
+    virtual void probing_failed(boost::filesystem::path const& path, std::exception const& error) = 0;
+    virtual void loading_library(boost::filesystem::path const& filename) = 0;
+    virtual void loading_failed(boost::filesystem::path const& filename, std::exception const& error) = 0;
+
+protected:
+    SharedLibraryProberReport() = default;
+    SharedLibraryProberReport(SharedLibraryProberReport const&) = delete;
+    SharedLibraryProberReport& operator=(SharedLibraryProberReport const&) = delete;
+};
+}
+
+
+#endif /* MIR_SHARED_LIBRARY_PROBER_REPORT_H_ */

=== renamed file 'include/shared/mir/thread_name.h' => 'src/include/common/mir/thread_name.h'
=== added directory 'src/include/common/mir/time'
=== renamed file 'include/server/mir/time/high_resolution_clock.h' => 'src/include/common/mir/time/high_resolution_clock.h'
--- include/server/mir/time/high_resolution_clock.h	2014-03-06 06:05:17 +0000
+++ src/include/common/mir/time/high_resolution_clock.h	2014-10-10 13:43:10 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013 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,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Alan Griffiths <[e-mail]>

=== added directory 'src/include/common/mir/udev'
=== renamed file 'include/shared/mir/udev/wrapper.h' => 'src/include/common/mir/udev/wrapper.h'
=== renamed file 'include/shared/mir/variable_length_array.h' => 'src/include/common/mir/variable_length_array.h'
=== added directory 'src/include/platform'
=== added directory 'src/include/platform/mir'
=== renamed file 'include/platform/mir/emergency_cleanup_registry.h' => 'src/include/platform/mir/emergency_cleanup_registry.h'
=== added directory 'src/include/platform/mir/graphics'