Merge lp:~kdub/mir/android-plumb-nbs-api-fences into lp:mir

[Kevin DuBois]

android: Plumb the fencing support that the NBS API needs. Specifically, add timeout-based fence waits.

Also change the public MirNativeFence* (which was a void**) to just a MirNativeFence (void*) to be easier to use/less misleading.

Last bit of wrapup for https://trello.com/c/HXHFDJdM, which is a card with a slightly dated title.

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

FAILED: Continuous integration, rev:3587
https://mir-jenkins.ubuntu.com/job/mir-ci/1269/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1487/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1530
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1530
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1530
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1502/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1502/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1502/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1502/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1502
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1502/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1502/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:3587
https://mir-jenkins.ubuntu.com/job/mir-ci/1297/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1522
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1575
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1566
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1566
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1566
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1537
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1537/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1537
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1537/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1537
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1537/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1537
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1537/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1537
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1537/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Nit:

 #define MIR_GRAPHICS_ANDROID_FENCE_H_

+#include <chrono>
namespace mir

missing whitespace before namespace

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Looks good

review: Approve

[Daniel van Vugt (vanvugt)]

Landed and then reverted so you'll need to resubmit under a new branch name, sorry.

It fails to build on a clean yakkety desktop; lots of errors around set_fence (!?)

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Still failing to build on updated yakkety today.

Also doesn't merge correctly with lp:mir any more due to the revert. Needs a new branch name :P

review: Needs Resubmitting

[Kevin DuBois (kdub)]

CI does run against mesa+yakkety, is there a problem there to be investigated?

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

FAILED: Continuous integration, rev:3589
https://mir-jenkins.ubuntu.com/job/mir-ci/1346/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1604/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1657
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1648
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1648
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1648
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1619
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1619/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1619/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1619
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1619/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1619
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1619/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1619/console

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

yakkety was ok:
https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1483/consoleFull

other failures were NestedServer* test suite failures, will retrigger.

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

PASSED: Continuous integration, rev:3589
https://mir-jenkins.ubuntu.com/job/mir-ci/1347/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1605
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1658
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1649
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1649
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1649
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1620
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1620/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1620
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1620/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1620
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1620/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1620
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1620/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1620
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1620/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Yes, build it on a yakkety desktop. Obviously CI missed whatever the problem is.

[Daniel van Vugt (vanvugt)]

Thanks for fixing the revert/merge/diff. But I just tried this branch again on yakkety and still several errors (only some listed below):

In file included from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer_factory.cpp:21:0:
/home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer.h:55:21: error: invalid covariant return type for ‘virtual void** mir::client::eglstream::ClientBuffer::get_fence() const’ [-Werror]
     MirNativeFence* get_fence() const;
                     ^
In file included from /home/dan/bzr/mir/tmp.plumb/src/platforms/common/client/mir/aging_buffer.h:22:0,
                 from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer.h:23,
                 from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer_factory.cpp:21:
/home/dan/bzr/mir/tmp.plumb/src/include/client/mir/client_buffer.h:73:28: note: overriding ‘virtual void* mir::client::ClientBuffer::get_fence() const’
     virtual MirNativeFence get_fence() const = 0;
                            ^
...

/usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression of abstract class type ‘mir::client::eglstream::ClientBuffer’
  { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
    ^
In file included from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer_factory.cpp:21:0:
/home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer.h:36:7: note: because the following virtual functions are pure within ‘mir::client::eglstream::ClientBuffer’:
 class ClientBuffer : public AgingBuffer
       ^
In file included from /home/dan/bzr/mir/tmp.plumb/src/platforms/common/client/mir/aging_buffer.h:22:0,
                 from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer.h:23,
                 from /home/dan/bzr/mir/tmp.plumb/src/platforms/eglstream-kms/client/client_buffer_factory.cpp:21:
/home/dan/bzr/mir/tmp.plumb/src/include/client/mir/client_buffer.h:72:18: note: virtual void mir::client::ClientBuffer::set_fence(MirNativeFence, MirBufferAccess)
     virtual void set_fence(MirNativeFence, MirBufferAccess) = 0;
                  ^

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

It would appear you and CI are both failing to build/test the eglstream-kms platform. That would be because CI follows the debian packaging rules instead of our CMake defaults.

[Daniel van Vugt (vanvugt)]

Try building the branch with just 'cmake .. ; make' to get all the platforms and you should hit the build failure.

[Daniel van Vugt (vanvugt)]

And no we can't just add 'eglstream-kms' into debian/rules to make sure it's built right now. Because we also have debhelper checking the build and it will notice you've built a binary but failed to put it in any deb (which is correct - it's not finished and we don't want to ship it yet).

[Kevin DuBois (kdub)]

Filed a bug for the CI hole, working on fixing.
https://bugs.launchpad.net/mir/+bug/1607358

[Kevin DuBois (kdub)]

> Filed a bug for the CI hole, working on fixing.
> https://bugs.launchpad.net/mir/+bug/1607358

To be more specific... I'm working on fixing this branch, not working on fixing the CI at the moment.

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

PASSED: Continuous integration, rev:3590
https://mir-jenkins.ubuntu.com/job/mir-ci/1366/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1632
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1685
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1676
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1676
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1676
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1647/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1647
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1647/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Cool, thanks.

review: Abstain

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/434/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1646/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/465/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1699
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1661
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1661/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1661
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1661/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1661
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1661/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1661
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1661/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1661/console

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

Failure was the NestedServerp* (we really should fix that suite), retriggering.

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/437/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1651
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/468/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/469/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1704
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1666
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1666/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1666
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1666/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1666
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1666/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1666
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1666/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1666
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1666/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'src/client/buffer.cpp'
--- src/client/buffer.cpp	2016-07-22 06:29:03 +0000
+++ src/client/buffer.cpp	2016-07-28 13:22:55 +0000
@@ -95,12 +95,12 @@
     return buffer->as_mir_native_buffer();
 }
 
-void mcl::Buffer::set_fence(MirNativeFence* native_fence, MirBufferAccess access)
+void mcl::Buffer::set_fence(MirNativeFence native_fence, MirBufferAccess access)
 {
     buffer->set_fence(native_fence, access);
 }
 
-MirNativeFence* mcl::Buffer::get_fence() const
+MirNativeFence mcl::Buffer::get_fence() const
 {
     return buffer->get_fence();
 }

=== modified file 'src/client/buffer.h'
--- src/client/buffer.h	2016-07-22 06:29:03 +0000
+++ src/client/buffer.h	2016-07-28 13:22:55 +0000
@@ -53,8 +53,8 @@
     std::shared_ptr<ClientBuffer> client_buffer() const override;
     MirGraphicsRegion map_region() override;
 
-    void set_fence(MirNativeFence*, MirBufferAccess) override;
-    MirNativeFence* get_fence() const override;
+    void set_fence(MirNativeFence, MirBufferAccess) override;
+    MirNativeFence get_fence() const override;
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override;
 
     MirBufferUsage buffer_usage() const override;

=== modified file 'src/client/error_buffer.cpp'
--- src/client/error_buffer.cpp	2016-07-22 06:29:03 +0000
+++ src/client/error_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -68,8 +68,8 @@
 MirNativeBuffer* mcl::ErrorBuffer::as_mir_native_buffer() const THROW_EXCEPTION
 std::shared_ptr<mcl::ClientBuffer> mcl::ErrorBuffer::client_buffer() const THROW_EXCEPTION
 MirGraphicsRegion mcl::ErrorBuffer::map_region() THROW_EXCEPTION
-void mcl::ErrorBuffer::set_fence(MirNativeFence*, MirBufferAccess) THROW_EXCEPTION
-MirNativeFence* mcl::ErrorBuffer::get_fence() const THROW_EXCEPTION
+void mcl::ErrorBuffer::set_fence(MirNativeFence, MirBufferAccess) THROW_EXCEPTION
+MirNativeFence mcl::ErrorBuffer::get_fence() const THROW_EXCEPTION
 bool mcl::ErrorBuffer::wait_fence(MirBufferAccess, std::chrono::nanoseconds) THROW_EXCEPTION
 MirBufferUsage mcl::ErrorBuffer::buffer_usage() const THROW_EXCEPTION
 MirPixelFormat mcl::ErrorBuffer::pixel_format() const THROW_EXCEPTION

=== modified file 'src/client/error_buffer.h'
--- src/client/error_buffer.h	2016-07-22 06:29:03 +0000
+++ src/client/error_buffer.h	2016-07-28 13:22:55 +0000
@@ -39,8 +39,8 @@
     MirNativeBuffer* as_mir_native_buffer() const override;
     std::shared_ptr<ClientBuffer> client_buffer() const override;
     MirGraphicsRegion map_region() override;
-    void set_fence(MirNativeFence*, MirBufferAccess) override;
-    MirNativeFence* get_fence() const override;
+    void set_fence(MirNativeFence, MirBufferAccess) override;
+    MirNativeFence get_fence() const override;
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override;
     MirBufferUsage buffer_usage() const override;
     MirPixelFormat pixel_format() const override;

=== modified file 'src/client/mir_buffer.h'
--- src/client/mir_buffer.h	2016-07-22 06:29:03 +0000
+++ src/client/mir_buffer.h	2016-07-28 13:22:55 +0000
@@ -43,8 +43,8 @@
     virtual std::shared_ptr<ClientBuffer> client_buffer() const = 0;
     virtual MirGraphicsRegion map_region() = 0;
 
-    virtual void set_fence(MirNativeFence*, MirBufferAccess) = 0;
-    virtual MirNativeFence* get_fence() const = 0;
+    virtual void set_fence(MirNativeFence, MirBufferAccess) = 0;
+    virtual MirNativeFence get_fence() const = 0;
     virtual bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) = 0;
 
     virtual MirBufferUsage buffer_usage() const = 0;

=== modified file 'src/client/mir_buffer_api.cpp'
--- src/client/mir_buffer_api.cpp	2016-07-22 06:29:03 +0000
+++ src/client/mir_buffer_api.cpp	2016-07-28 13:22:55 +0000
@@ -59,7 +59,7 @@
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
 }
 
-MirNativeFence* mir_buffer_get_fence(MirBuffer* b)
+MirNativeFence mir_buffer_get_fence(MirBuffer* b)
 try
 {
     mir::require(b);
@@ -72,7 +72,7 @@
     return nullptr;
 }
 
-void mir_buffer_associate_fence(MirBuffer* b, MirNativeFence* fence, MirBufferAccess access)
+void mir_buffer_associate_fence(MirBuffer* b, MirNativeFence fence, MirBufferAccess access)
 try
 {
     mir::require(b);
@@ -89,7 +89,8 @@
 {
     mir::require(b);
     auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
-    return buffer->wait_fence(access, std::chrono::nanoseconds(timeout));
+     
+    return buffer->wait_fence(access, std::chrono::nanoseconds(timeout)) ? 0 : -1;
 }
 catch (std::exception const& ex)
 {

=== modified file 'src/include/client/mir/client_buffer.h'
--- src/include/client/mir/client_buffer.h	2016-07-22 06:29:03 +0000
+++ src/include/client/mir/client_buffer.h	2016-07-28 13:22:55 +0000
@@ -69,8 +69,8 @@
     virtual void fill_update_msg(MirBufferPackage& message) = 0;
 
     virtual MirNativeBuffer* as_mir_native_buffer() const = 0;
-    virtual void set_fence(MirNativeFence*, MirBufferAccess) = 0;
-    virtual MirNativeFence* get_fence() const = 0;
+    virtual void set_fence(MirNativeFence, MirBufferAccess) = 0;
+    virtual MirNativeFence get_fence() const = 0;
     virtual bool wait_fence(MirBufferAccess, std::chrono::nanoseconds timeout) = 0;
 protected:
     ClientBuffer() = default;

=== modified file 'src/include/client/mir_toolkit/mir_buffer.h'
--- src/include/client/mir_toolkit/mir_buffer.h	2016-07-22 06:29:03 +0000
+++ src/include/client/mir_toolkit/mir_buffer.h	2016-07-28 13:22:55 +0000
@@ -123,7 +123,7 @@
  *   \return                The fence associated with buffer 
  *
  **/
-MirNativeFence* mir_buffer_get_fence(MirBuffer*);
+MirNativeFence mir_buffer_get_fence(MirBuffer*);
 
 /**
  * Protect the buffer's contents by associating a native fence with it.
@@ -138,7 +138,7 @@
  **/
 void mir_buffer_associate_fence(
     MirBuffer* buffer,
-    MirNativeFence* native_fence,
+    MirNativeFence native_fence,
     MirBufferAccess access);
 
 /** Wait for the fence associated with the buffer to signal. After returning,

=== modified file 'src/platforms/android/client/buffer.cpp'
--- src/platforms/android/client/buffer.cpp	2016-07-22 06:29:03 +0000
+++ src/platforms/android/client/buffer.cpp	2016-07-28 13:22:55 +0000
@@ -22,6 +22,7 @@
 #include "buffer_registrar.h"
 #include "buffer.h"
 #include <hardware/gralloc.h>
+#include <boost/throw_exception.hpp>
 
 namespace mcl=mir::client;
 namespace mcla=mir::client::android;
@@ -106,16 +107,36 @@
     return native_buffer->anwb();
 }
 
-void mcla::Buffer::set_fence(MirNativeFence*, MirBufferAccess)
-{
-}
-
-MirNativeFence* mcla::Buffer::get_fence() const
-{
-    return nullptr;
-}
-
-bool mcla::Buffer::wait_fence(MirBufferAccess, std::chrono::nanoseconds)
-{
-    return true;
+void mcla::Buffer::set_fence(MirNativeFence fence, MirBufferAccess access)
+{
+    if (!fence)
+        native_buffer->reset_fence();
+    else if (access == mir_read)
+        native_buffer->update_usage(*static_cast<mga::NativeFence*>(fence), mga::BufferAccess::read); 
+    else if (access == mir_read_write)
+        native_buffer->update_usage(*static_cast<mga::NativeFence*>(fence), mga::BufferAccess::write); 
+    else
+        BOOST_THROW_EXCEPTION(std::invalid_argument("invalid MirBufferAccess"));
+}
+
+MirNativeFence mcla::Buffer::get_fence() const
+{
+    api_user_fence = mir::Fd(native_buffer->copy_fence());
+    fd = api_user_fence;
+    return &fd; 
+}
+
+bool mcla::Buffer::wait_fence(MirBufferAccess access, std::chrono::nanoseconds ns)
+{
+    // could use std::chrono::floor once we're using C++17
+    auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(ns);
+    if (ms > ns)
+        ms = ms - std::chrono::milliseconds{1};
+
+    if (access == mir_read)
+        return native_buffer->ensure_available_for(mga::BufferAccess::read, ms); 
+    if (access == mir_read_write)
+        return native_buffer->ensure_available_for(mga::BufferAccess::write, ms); 
+
+    BOOST_THROW_EXCEPTION(std::invalid_argument("invalid MirBufferAccess"));
 }

=== modified file 'src/platforms/android/client/buffer.h'
--- src/platforms/android/client/buffer.h	2016-07-22 06:29:03 +0000
+++ src/platforms/android/client/buffer.h	2016-07-28 13:22:55 +0000
@@ -22,6 +22,7 @@
 
 #include "android_native_buffer.h"
 #include "mir/aging_buffer.h"
+#include "mir/fd.h"
 
 #include <system/window.h>
 #include <memory>
@@ -50,8 +51,8 @@
     void update_from(MirBufferPackage const& update_package) override;
     void fill_update_msg(MirBufferPackage& message) override;
     MirNativeBuffer* as_mir_native_buffer() const override;
-    void set_fence(MirNativeFence*, MirBufferAccess) override;
-    MirNativeFence* get_fence() const override;
+    void set_fence(MirNativeFence, MirBufferAccess) override;
+    MirNativeFence get_fence() const override;
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds timeout) override;
 
     Buffer(const Buffer&) = delete;
@@ -59,6 +60,9 @@
 private:
     void pack_native_window_buffer();
 
+    mir::Fd mutable api_user_fence;
+    int mutable fd;
+ 
     std::shared_ptr<BufferRegistrar> const buffer_registrar;
     std::shared_ptr<graphics::NativeBuffer> const native_buffer;
     MirPixelFormat const buffer_pf;

=== modified file 'src/platforms/android/common/android_native_buffer.cpp'
--- src/platforms/android/common/android_native_buffer.cpp	2016-07-22 06:29:03 +0000
+++ src/platforms/android/common/android_native_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -41,12 +41,25 @@
     fence->wait();
 }
 
+bool mga::AndroidNativeBuffer::ensure_available_for(BufferAccess intent, std::chrono::milliseconds ms)
+{
+    if ((access == mga::BufferAccess::read) && (intent == mga::BufferAccess::read))
+        return true;
+
+    return fence->wait_for(ms);
+}
+
 void mga::AndroidNativeBuffer::update_usage(NativeFence& merge_fd, BufferAccess updated_access)
 {
     fence->merge_with(merge_fd);
     access = updated_access;
 }
 
+void mga::AndroidNativeBuffer::reset_fence()
+{
+    fence->reset_fence();
+}
+
 ANativeWindowBuffer* mga::AndroidNativeBuffer::anwb() const
 {
     return native_window_buffer.get();

=== modified file 'src/platforms/android/common/syncfence.cpp'
--- src/platforms/android/common/syncfence.cpp	2016-07-22 06:29:03 +0000
+++ src/platforms/android/common/syncfence.cpp	2016-07-28 13:22:55 +0000
@@ -40,6 +40,23 @@
     }
 }
 
+bool mga::SyncFence::wait_for(std::chrono::milliseconds ms)
+{
+    int timed_out = 0;
+    if (fence_fd > 0)
+    {
+        int timeout = ms.count();
+        timed_out = ops->ioctl(fence_fd, SYNC_IOC_WAIT, &timeout);
+        fence_fd = mir::Fd(Fd::invalid);
+    }
+    return timed_out >= 0;
+}
+
+void mga::SyncFence::reset_fence()
+{
+   fence_fd = mir::Fd(mir::Fd::invalid);
+}
+
 void mga::SyncFence::merge_with(NativeFence& merge_fd)
 {
     if (merge_fd < 0)

=== modified file 'src/platforms/android/include/android_native_buffer.h'
--- src/platforms/android/include/android_native_buffer.h	2016-07-22 06:29:03 +0000
+++ src/platforms/android/include/android_native_buffer.h	2016-07-28 13:22:55 +0000
@@ -45,7 +45,9 @@
     NativeFence copy_fence() const;
 
     void ensure_available_for(BufferAccess);
+    bool ensure_available_for(android::BufferAccess intent, std::chrono::milliseconds timeout);
     void update_usage(NativeFence& merge_fd, BufferAccess);
+    void reset_fence();
 
     void lock_for_gpu();
     void wait_for_unlock_by_gpu();

=== modified file 'src/platforms/android/include/fence.h'
--- src/platforms/android/include/fence.h	2016-07-22 06:29:03 +0000
+++ src/platforms/android/include/fence.h	2016-07-28 13:22:55 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_FENCE_H_
 #define MIR_GRAPHICS_ANDROID_FENCE_H_
 
+#include <chrono>
 namespace mir
 {
 namespace graphics
@@ -35,6 +36,8 @@
     virtual ~Fence() = default;
 
     virtual void wait() = 0;
+    virtual bool wait_for(std::chrono::milliseconds) = 0;
+    virtual void reset_fence() = 0;
     //TODO: (kdub) use the Fd type instead of NativeFence
     virtual void merge_with(NativeFence& merge_fd) = 0;
     virtual NativeFence copy_native_handle() const = 0;

=== modified file 'src/platforms/android/include/native_buffer.h'
--- src/platforms/android/include/native_buffer.h	2016-07-22 06:29:03 +0000
+++ src/platforms/android/include/native_buffer.h	2016-07-28 13:22:55 +0000
@@ -51,7 +51,9 @@
     virtual android::NativeFence copy_fence() const = 0;
 
     virtual void ensure_available_for(android::BufferAccess intent) = 0;
+    virtual bool ensure_available_for(android::BufferAccess intent, std::chrono::milliseconds timeout) = 0;
     virtual void update_usage(android::NativeFence& fence, android::BufferAccess current_usage) = 0;
+    virtual void reset_fence() = 0;
 
     virtual void lock_for_gpu() = 0;
     virtual void wait_for_unlock_by_gpu() = 0;

=== modified file 'src/platforms/android/include/sync_fence.h'
--- src/platforms/android/include/sync_fence.h	2016-07-22 06:29:03 +0000
+++ src/platforms/android/include/sync_fence.h	2016-07-28 13:22:55 +0000
@@ -51,9 +51,11 @@
 public:
     explicit SyncFence(std::shared_ptr<SyncFileOps> const&, Fd fd);
 
-    void wait();
-    void merge_with(NativeFence& merge_fd);
-    NativeFence copy_native_handle() const;
+    void wait() override;
+    bool wait_for(std::chrono::milliseconds) override;
+    void reset_fence() override;
+    void merge_with(NativeFence& merge_fd) override;
+    NativeFence copy_native_handle() const override;
 
 private:
     SyncFence(SyncFence const&) = delete;

=== modified file 'src/platforms/eglstream-kms/client/client_buffer.cpp'
--- src/platforms/eglstream-kms/client/client_buffer.cpp	2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -144,11 +144,11 @@
     return native_buffer_handle().get();
 }
 
-void mcle::ClientBuffer::set_fence(MirNativeFence*, MirBufferAccess)
+void mcle::ClientBuffer::set_fence(MirNativeFence, MirBufferAccess)
 {
 }
 
-MirNativeFence* mcle::ClientBuffer::get_fence() const
+MirNativeFence mcle::ClientBuffer::get_fence() const
 {
     return nullptr;
 }

=== modified file 'src/platforms/eglstream-kms/client/client_buffer.h'
--- src/platforms/eglstream-kms/client/client_buffer.h	2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_buffer.h	2016-07-28 13:22:55 +0000
@@ -51,8 +51,8 @@
     void update_from(MirBufferPackage const&);
     void fill_update_msg(MirBufferPackage&);
     MirNativeBuffer* as_mir_native_buffer() const;
-    void set_fence(MirNativeFence*, MirBufferAccess);
-    MirNativeFence* get_fence() const;
+    void set_fence(MirNativeFence, MirBufferAccess);
+    MirNativeFence get_fence() const;
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds timeout);
 
 private:

=== modified file 'src/platforms/mesa/client/client_buffer.cpp'
--- src/platforms/mesa/client/client_buffer.cpp	2016-07-22 06:29:03 +0000
+++ src/platforms/mesa/client/client_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -148,11 +148,11 @@
     return native_buffer_handle().get();
 }
 
-void mclm::ClientBuffer::set_fence(MirNativeFence*, MirBufferAccess)
+void mclm::ClientBuffer::set_fence(MirNativeFence, MirBufferAccess)
 {
 }
 
-MirNativeFence* mclm::ClientBuffer::get_fence() const
+MirNativeFence mclm::ClientBuffer::get_fence() const
 {
     return nullptr;
 }

=== modified file 'src/platforms/mesa/client/client_buffer.h'
--- src/platforms/mesa/client/client_buffer.h	2016-07-22 06:29:03 +0000
+++ src/platforms/mesa/client/client_buffer.h	2016-07-28 13:22:55 +0000
@@ -53,8 +53,8 @@
     void update_from(MirBufferPackage const&);
     void fill_update_msg(MirBufferPackage&);
     MirNativeBuffer* as_mir_native_buffer() const;
-    void set_fence(MirNativeFence*, MirBufferAccess);
-    MirNativeFence* get_fence() const;
+    void set_fence(MirNativeFence, MirBufferAccess);
+    MirNativeFence get_fence() const;
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds timeout);
 
 private:

=== modified file 'tests/include/mir/test/doubles/mock_android_native_buffer.h'
--- tests/include/mir/test/doubles/mock_android_native_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/mock_android_native_buffer.h	2016-07-28 13:22:55 +0000
@@ -55,7 +55,9 @@
     MOCK_CONST_METHOD0(copy_fence, graphics::android::NativeFence());
 
     MOCK_METHOD1(ensure_available_for, void(graphics::android::BufferAccess));
+    MOCK_METHOD2(ensure_available_for, bool(graphics::android::BufferAccess, std::chrono::milliseconds));
     MOCK_METHOD2(update_usage, void(graphics::android::NativeFence&, graphics::android::BufferAccess));
+    MOCK_METHOD0(reset_fence, void());
 
     MOCK_METHOD0(lock_for_gpu, void());
     MOCK_METHOD0(wait_for_unlock_by_gpu, void());

=== modified file 'tests/include/mir/test/doubles/mock_client_buffer.h'
--- tests/include/mir/test/doubles/mock_client_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/mock_client_buffer.h	2016-07-28 13:22:55 +0000
@@ -44,8 +44,8 @@
     MOCK_METHOD1(fill_update_msg, void(MirBufferPackage&));
     MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<graphics::NativeBuffer>());
     MOCK_CONST_METHOD0(as_mir_native_buffer, MirNativeBuffer*());
-    MOCK_METHOD2(set_fence, void(MirNativeFence*, MirBufferAccess));
-    MOCK_CONST_METHOD0(get_fence, MirNativeFence*());
+    MOCK_METHOD2(set_fence, void(MirNativeFence, MirBufferAccess));
+    MOCK_CONST_METHOD0(get_fence, MirNativeFence());
     MOCK_METHOD2(wait_fence, bool(MirBufferAccess, std::chrono::nanoseconds));
     int age_{0};
 };

=== modified file 'tests/include/mir/test/doubles/mock_fence.h'
--- tests/include/mir/test/doubles/mock_fence.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/mock_fence.h	2016-07-28 13:22:55 +0000
@@ -33,6 +33,8 @@
 struct MockFence : public graphics::android::Fence
 {
     MOCK_METHOD0(wait, void());
+    MOCK_METHOD1(wait_for, bool(std::chrono::milliseconds));
+    MOCK_METHOD0(reset_fence, void());
     MOCK_METHOD1(merge_with, void(graphics::android::NativeFence&));
     MOCK_CONST_METHOD0(copy_native_handle, graphics::android::NativeFence());
 };

=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer.h'
--- tests/include/mir/test/doubles/mock_mir_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/mock_mir_buffer.h	2016-07-28 13:22:55 +0000
@@ -46,8 +46,8 @@
     MOCK_CONST_METHOD0(client_buffer, std::shared_ptr<client::ClientBuffer>());
     MOCK_METHOD0(map_region, MirGraphicsRegion());
 
-    MOCK_METHOD2(set_fence, void(MirNativeFence*, MirBufferAccess));
-    MOCK_CONST_METHOD0(get_fence, MirNativeFence*());
+    MOCK_METHOD2(set_fence, void(MirNativeFence, MirBufferAccess));
+    MOCK_CONST_METHOD0(get_fence, MirNativeFence());
     MOCK_METHOD2(wait_fence, bool(MirBufferAccess, std::chrono::nanoseconds));
 
     MOCK_CONST_METHOD0(buffer_usage, MirBufferUsage());

=== modified file 'tests/include/mir/test/doubles/null_client_buffer.h'
--- tests/include/mir/test/doubles/null_client_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/null_client_buffer.h	2016-07-28 13:22:55 +0000
@@ -54,8 +54,8 @@
     geometry::Size sz;
 
     MirNativeBuffer* as_mir_native_buffer() const { return nullptr; }
-    void set_fence(MirNativeFence*, MirBufferAccess) {}
-    MirNativeFence* get_fence() const { return nullptr; }
+    void set_fence(MirNativeFence, MirBufferAccess) {}
+    MirNativeFence get_fence() const { return nullptr; }
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) { return true; }
 };
 

=== modified file 'tests/include/mir/test/doubles/stub_android_native_buffer.h'
--- tests/include/mir/test/doubles/stub_android_native_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/stub_android_native_buffer.h	2016-07-28 13:22:55 +0000
@@ -45,7 +45,9 @@
     auto copy_fence() const -> graphics::android::NativeFence override { return -1; }
 
     void ensure_available_for(graphics::android::BufferAccess) {}
+    bool ensure_available_for(graphics::android::BufferAccess, std::chrono::milliseconds) { return true; }
     void update_usage(graphics::android::NativeFence&, graphics::android::BufferAccess) {}
+    void reset_fence() {}
 
     void lock_for_gpu() {};
     void wait_for_unlock_by_gpu() {};

=== modified file 'tests/include/mir/test/doubles/stub_client_buffer.h'
--- tests/include/mir/test/doubles/stub_client_buffer.h	2016-07-22 06:29:03 +0000
+++ tests/include/mir/test/doubles/stub_client_buffer.h	2016-07-28 13:22:55 +0000
@@ -75,8 +75,8 @@
     void fill_update_msg(MirBufferPackage&)  override{}
 
     MirNativeBuffer* as_mir_native_buffer() const { return nullptr; }
-    void set_fence(MirNativeFence*, MirBufferAccess) {}
-    MirNativeFence* get_fence() const { return nullptr; }
+    void set_fence(MirNativeFence, MirBufferAccess) {}
+    MirNativeFence get_fence() const { return nullptr; }
     bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) { return true; }
 
     std::shared_ptr<MirBufferPackage> const package;

=== modified file 'tests/unit-tests/client/android/test_buffer.cpp'
--- tests/unit-tests/client/android/test_buffer.cpp	2016-07-22 06:29:03 +0000
+++ tests/unit-tests/client/android/test_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -32,16 +32,17 @@
 namespace mg = mir::graphics;
 namespace mga = mir::graphics::android;
 namespace geom = mir::geometry;
+using namespace testing;
 
-struct AndroidClientBuffer : public ::testing::Test
+struct AndroidClientBuffer : Test
 {
     AndroidClientBuffer() :
-        mock_registrar{std::make_shared<testing::NiceMock<mtd::MockBufferRegistrar>>()},
+        mock_registrar{std::make_shared<NiceMock<mtd::MockBufferRegistrar>>()},
         native_handle{std::make_shared<native_handle_t>()},
         mock_native_buffer{std::make_shared<mtd::MockAndroidNativeBuffer>(size)}
     {
-        ON_CALL(*mock_registrar, register_buffer(testing::_, testing::_))
-            .WillByDefault(testing::Return(mock_native_buffer));
+        ON_CALL(*mock_registrar, register_buffer(_, _))
+            .WillByDefault(Return(mock_native_buffer));
         package.height = height.as_int();
         package.width = width.as_int();
         package.stride = stride.as_int();
@@ -60,8 +61,8 @@
 
 TEST_F(AndroidClientBuffer, registers_native_handle_with_correct_size)
 {
-    EXPECT_CALL(*mock_registrar, register_buffer(testing::_, testing::_))
-        .WillOnce(testing::Return(mock_native_buffer));
+    EXPECT_CALL(*mock_registrar, register_buffer(_, _))
+        .WillOnce(Return(mock_native_buffer));
 
     mcla::Buffer buffer(mock_registrar, package, pf);
     EXPECT_EQ(size, buffer.size());
@@ -132,3 +133,73 @@
     EXPECT_THAT(msg.data[0], Eq(static_cast<int>(BufferFlag::unfenced)));
     EXPECT_THAT(msg.fd_items, Eq(0));
 }
+
+TEST_F(AndroidClientBuffer, can_update_fences)
+{
+    int fake_fence = 8482;
+    MirNativeFence fence = &fake_fence;
+    Sequence seq;
+    EXPECT_CALL(*mock_native_buffer, update_usage(fake_fence, mga::BufferAccess::write))
+        .InSequence(seq);
+    EXPECT_CALL(*mock_native_buffer, update_usage(_, mga::BufferAccess::read))
+        .InSequence(seq);
+    mcla::Buffer buffer(mock_registrar, package, pf);
+    buffer.set_fence(fence, mir_read_write);
+    buffer.set_fence(fence, mir_read);
+}
+
+TEST_F(AndroidClientBuffer, updating_fences_with_null_resets_fence)
+{
+    EXPECT_CALL(*mock_native_buffer, reset_fence());
+    mcla::Buffer buffer(mock_registrar, package, pf);
+    buffer.set_fence(nullptr, mir_read_write);
+}
+
+TEST_F(AndroidClientBuffer, updating_fences_with_made_up_access_throws)
+{
+    int fence = 21;
+    mcla::Buffer buffer(mock_registrar, package, pf);
+    EXPECT_THROW({
+        buffer.set_fence(&fence, static_cast<MirBufferAccess>(111));
+    }, std::invalid_argument);
+}
+
+TEST_F(AndroidClientBuffer, can_retreive_fences)
+{
+    int fake_fence = 42;
+    EXPECT_CALL(*mock_native_buffer, copy_fence())
+        .WillOnce(Return(fake_fence));
+    
+    mcla::Buffer buffer(mock_registrar, package, pf);
+    auto fence = buffer.get_fence();
+    ASSERT_THAT(fence, Ne(nullptr));
+    EXPECT_THAT(*static_cast<decltype(fake_fence)*>(fence), Eq(fake_fence));
+}
+
+TEST_F(AndroidClientBuffer, can_wait_fence)
+{
+    using namespace std::literals::chrono_literals;
+    Sequence seq;
+    EXPECT_CALL(*mock_native_buffer, ensure_available_for(mga::BufferAccess::read, 0ms))
+        .InSequence(seq)
+        .WillOnce(Return(false));
+    EXPECT_CALL(*mock_native_buffer, ensure_available_for(mga::BufferAccess::write, 10ms))
+        .InSequence(seq)
+        .WillOnce(Return(true));
+    EXPECT_CALL(*mock_native_buffer, ensure_available_for(mga::BufferAccess::write, 10ms))
+        .InSequence(seq)
+        .WillOnce(Return(true));
+    EXPECT_CALL(*mock_native_buffer, ensure_available_for(mga::BufferAccess::write, 10ms))
+        .InSequence(seq)
+        .WillOnce(Return(true));
+    EXPECT_CALL(*mock_native_buffer, ensure_available_for(mga::BufferAccess::write, 11ms))
+        .InSequence(seq)
+        .WillOnce(Return(true));
+
+    mcla::Buffer buffer(mock_registrar, package, pf);
+    EXPECT_FALSE(buffer.wait_fence(mir_read, 150ns));
+    EXPECT_TRUE(buffer.wait_fence(mir_read_write, 10499999ns));
+    EXPECT_TRUE(buffer.wait_fence(mir_read_write, 10500001ns));
+    EXPECT_TRUE(buffer.wait_fence(mir_read_write, 10999999ns));
+    EXPECT_TRUE(buffer.wait_fence(mir_read_write, 11000001ns));
+}

=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
--- tests/unit-tests/client/test_aging_buffer.cpp	2016-07-22 06:29:03 +0000
+++ tests/unit-tests/client/test_aging_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -69,12 +69,12 @@
         exit(1);
     }
 
-    void set_fence(MirNativeFence*, MirBufferAccess)
+    void set_fence(MirNativeFence, MirBufferAccess)
     {
         exit(1);
     }
 
-    MirNativeFence* get_fence() const
+    MirNativeFence get_fence() const
     {
         exit(1);
     }

=== modified file 'tests/unit-tests/graphics/android/test_native_buffer.cpp'
--- tests/unit-tests/graphics/android/test_native_buffer.cpp	2016-07-22 06:29:03 +0000
+++ tests/unit-tests/graphics/android/test_native_buffer.cpp	2016-07-28 13:22:55 +0000
@@ -180,3 +180,22 @@
         .WillOnce(Return(false));
     buffer.wait_for_unlock_by_gpu();
 }
+
+TEST_F(NativeBuffer, resets_fence)
+{
+    EXPECT_CALL(*mock_fence, reset_fence());
+    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
+    buffer.reset_fence();
+}
+
+TEST_F(NativeBuffer, waits_with_timeout)
+{
+    using namespace std::literals::chrono_literals;
+    EXPECT_CALL(*mock_fence, wait_for(10ms))
+        .Times(2)
+        .WillOnce(Return(true))
+        .WillOnce(Return(false));
+    mga::AndroidNativeBuffer buffer(a_native_window_buffer, mock_cmdstream_sync, mock_fence, mga::BufferAccess::read);
+    EXPECT_TRUE(buffer.ensure_available_for(mga::BufferAccess::write, 10ms));
+    EXPECT_FALSE(buffer.ensure_available_for(mga::BufferAccess::write, 10ms));
+}

=== modified file 'tests/unit-tests/graphics/android/test_sync_fence.cpp'
--- tests/unit-tests/graphics/android/test_sync_fence.cpp	2016-07-22 06:29:03 +0000
+++ tests/unit-tests/graphics/android/test_sync_fence.cpp	2016-07-28 13:22:55 +0000
@@ -83,6 +83,29 @@
     fence2.wait();
 }
 
+//timeout is in msecs
+TEST_F(SyncSwTest, sync_wait_with_timeout_times_out)
+{
+    using namespace std::literals::chrono_literals;
+    auto timeout = 150ms;
+    EXPECT_CALL(*mock_fops, ioctl(dummy_fd_value, SYNC_IOC_WAIT, TimeoutMatches(timeout.count())))
+        .WillOnce(testing::Return(-1));
+
+    mga::SyncFence fence1(mock_fops, std::move(dummy_fd));
+    EXPECT_FALSE(fence1.wait_for(timeout));
+}
+
+TEST_F(SyncSwTest, sync_wait_with_timeout_clears)
+{
+    using namespace std::literals::chrono_literals;
+    auto timeout = 150ms;
+    EXPECT_CALL(*mock_fops, ioctl(dummy_fd_value, SYNC_IOC_WAIT, TimeoutMatches(timeout.count())))
+        .WillOnce(testing::Return(0));
+
+    mga::SyncFence fence1(mock_fops, std::move(dummy_fd));
+    EXPECT_TRUE(fence1.wait_for(timeout));
+}
+
 namespace
 {
 struct IoctlSetter