Merge lp:~alan-griffiths/mir/fix-fd-leak-thomi-reported into lp:~mir-team/mir/trunk

[Alan Griffiths]

client: close surface fds when finished with surface

client: close surface fds when finished with surface

"The mir_stress binary is now built as part of the regular trunk build process. However, the client API seems to be leaking FDs again.

"My plan is to make the stress tests run as part of every merge proposal, which will make regressions such as this impossible to land in the future. However, there's a bit of infrastructure we need to wrangle until that can happen, and I'm on holiday for the next few weeks.

"It would be great if someone familiar with the client API could run the mir-stress tests (run "mir_stress -n 10"), fix the FD leak, and possibly keep an eye on the situation until we manage to get this automated." - thomi

A better command is:

valgrind --track-fds=yes bin/mir_stress -n 10

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:726
http://jenkins.qa.ubuntu.com/job/mir-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/173/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2013-06-03 08:14:01 +0000
+++ src/client/mir_surface.cpp	2013-06-07 10:56:53 +0000
@@ -25,6 +25,7 @@
 #include "mir/input/input_platform.h"
 
 #include <cassert>
+#include <unistd.h>
 
 namespace geom = mir::geometry;
 namespace mcl = mir::client;
@@ -66,6 +67,10 @@
         input_thread->stop();
         input_thread->join();
     }
+
+    for (auto i = 0, end = surface.fd_size(); i != end; ++i)
+        close(surface.fd(i));
+
     release_cpu_region();
 }