Merge lp:~robert-ancell/mir/lp-1185183 into lp:~mir-team/mir/trunk

[Robert Ancell]

Close dmabuf file descriptor when the GBMBuffer is destroyed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:705
http://jenkins.qa.ubuntu.com/job/mir-ci/636/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/651
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/121/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:706
http://jenkins.qa.ubuntu.com/job/mir-ci/637/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/122
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/346

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

This will work safely for now, although it would be preferable to wrap the fd in a RAII wrapper, but not a blocker in this case.

review: Approve

[Alan Griffiths (alan-griffiths)]

> This will work safely for now, although it would be preferable to wrap the fd
> in a RAII wrapper, but not a blocker in this case.

We should probably write a fd wrapper class and use it throughout.

But that's beyond the scope of this fix.

review: Approve

=== modified file 'src/server/graphics/gbm/gbm_buffer.cpp'
--- src/server/graphics/gbm/gbm_buffer.cpp	2013-05-14 21:39:52 +0000
+++ src/server/graphics/gbm/gbm_buffer.cpp	2013-05-29 04:55:31 +0000
@@ -79,7 +79,7 @@
 
 mgg::GBMBuffer::GBMBuffer(std::shared_ptr<gbm_bo> const& handle,
                           std::unique_ptr<BufferTextureBinder> texture_binder)
-    : gbm_handle{handle}, texture_binder{std::move(texture_binder)}
+    : gbm_handle{handle}, texture_binder{std::move(texture_binder)}, prime_fd{-1}
 {
     auto device = gbm_bo_get_device(gbm_handle.get());
     auto gem_handle = gbm_bo_get_handle(gbm_handle.get()).u32;
@@ -96,6 +96,12 @@
     }
 }
 
+mgg::GBMBuffer::~GBMBuffer()
+{
+    if (prime_fd > 0)
+        close(prime_fd);
+}
+
 geom::Size mgg::GBMBuffer::size() const
 {
     return {geom::Width{gbm_bo_get_width(gbm_handle.get())},

=== modified file 'src/server/graphics/gbm/gbm_buffer.h'
--- src/server/graphics/gbm/gbm_buffer.h	2013-05-14 19:20:47 +0000
+++ src/server/graphics/gbm/gbm_buffer.h	2013-05-29 04:55:31 +0000
@@ -44,6 +44,7 @@
     GBMBuffer(std::shared_ptr<gbm_bo> const& handle,
               std::unique_ptr<BufferTextureBinder> texture_binder);
     GBMBuffer(const GBMBuffer&) = delete;
+    ~GBMBuffer();
 
     GBMBuffer& operator=(const GBMBuffer&) = delete;