Merge lp:~albaguirre/mir/cross-process-sync-retry-poll into lp:mir

[Alberto Aguirre]

tests: CrossProcessSync: retry poll after EINTR

tests: CrossProcessSync: retry poll after EINTR

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3149
http://jenkins.qa.ubuntu.com/job/mir-ci/5728/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5066
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/60/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5066
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5066/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7599
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25655
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/58/console

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'tests/mir_test/cross_process_sync.cpp'
--- tests/mir_test/cross_process_sync.cpp	2015-06-25 03:00:08 +0000
+++ tests/mir_test/cross_process_sync.cpp	2015-12-01 00:04:05 +0000
@@ -79,15 +79,20 @@
     pollfd poll_fd[1] = { { fds[write_fd], POLLOUT, empty_revents } };
     int rc = -1;
 
-    if ((rc = ::poll(poll_fd, 1, duration.count())) < 0)
-    {
-        BOOST_THROW_EXCEPTION(std::system_error(errno,
-                                                std::system_category(),
-                                                "Error while polling pipe to become writable"));
-    }
-    else if (rc == 0)
-    {
-        throw std::runtime_error("Poll on writefd for pipe timed out");
+    while ((rc = ::poll(poll_fd, 1, duration.count())) <= 0)
+    {
+        if (errno == EINTR)
+        {
+            continue;
+        }
+        if (rc == 0)
+        {
+            BOOST_THROW_EXCEPTION(std::runtime_error("Poll on writefd for pipe timed out"));
+        }
+        else
+        {
+            BOOST_THROW_EXCEPTION(std::system_error(errno, std::system_category(), "Error while polling pipe to become writable"));
+        }
     }
 
     int value = 1;
@@ -110,16 +115,22 @@
     pollfd poll_fd[1] = { { fds[read_fd], POLLIN, empty_revents } };
     int rc = -1;
 
-    if ((rc = ::poll(poll_fd, 1, duration.count())) < 0)
-    {
-        BOOST_THROW_EXCEPTION(std::system_error(errno,
-                                                std::system_category(),
-                                                "Error while polling pipe to become readable"));
-    }
-    else if (rc == 0)
-    {
-        BOOST_THROW_EXCEPTION(std::runtime_error("Poll on readfd for pipe timed out"));
-    }
+    while ((rc = ::poll(poll_fd, 1, duration.count())) <= 0)
+    {
+        if (errno == EINTR)
+        {
+            continue;
+        }
+        if (rc == 0)
+        {
+            BOOST_THROW_EXCEPTION(std::runtime_error("Poll on readfd for pipe timed out"));
+        }
+        else
+        {
+            BOOST_THROW_EXCEPTION(std::system_error(errno, std::system_category(), "Error while polling pipe to become readable"));
+        }
+    }
+
 
     int value;
     if (sizeof(value) != read(fds[read_fd], std::addressof(value), sizeof(value)))