Merge lp:~vanvugt/mir/better-scaling-test-2 into lp:mir

[Daniel van Vugt]

Simplify the new buffer queue scaling test. It was stupidly
overcomplicated.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2900
http://jenkins.qa.ubuntu.com/job/mir-ci/4762/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3778/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2689
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3728/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/911
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/911/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3728
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3728/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6463/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22941

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

=== modified file 'tests/unit-tests/compositor/test_buffer_queue.cpp'
--- tests/unit-tests/compositor/test_buffer_queue.cpp	2015-09-01 02:03:02 +0000
+++ tests/unit-tests/compositor/test_buffer_queue.cpp	2015-09-01 10:47:35 +0000
@@ -1638,12 +1638,14 @@
 
     int const nframes = 100;
 
-    for (int frame = 0; frame < nframes;)
+    std::shared_ptr<AcquireWaitHandle> client;
+
+    for (int frame = 0; frame < nframes; ++frame)
     {
-        std::shared_ptr<AcquireWaitHandle> client;
         do
         {
-            client = client_acquire_async(q);
+            if (!client)
+                client = client_acquire_async(q);
             if (client->has_acquired_buffer())
             {
                 if (frame > delay)
@@ -1653,19 +1655,7 @@
             }
         } while (!client);
 
-        while (q.buffers_ready_for_compositor(nullptr))
-        {
-            q.compositor_release(q.compositor_acquire(nullptr));
-            ++frame;
-        }
-
-        if (client->has_acquired_buffer())
-        {
-            if (frame > delay)
-                buffers_acquired.insert(client->buffer());
-            client->release_buffer();
-            client.reset();
-        }
+        q.compositor_release(q.compositor_acquire(nullptr));
     }
     // Expect double-buffers for fast clients
     EXPECT_THAT(buffers_acquired.size(), Eq(2));
@@ -1674,10 +1664,10 @@
     buffers_acquired.clear();
     for (int frame = 0; frame < nframes;)
     {
-        std::shared_ptr<AcquireWaitHandle> client;
         do
         {
-            client = client_acquire_async(q);
+            if (!client)
+                client = client_acquire_async(q);
             if (client->has_acquired_buffer())
             {
                 if (frame > delay)
@@ -1687,42 +1677,25 @@
             }
         } while (!client);
 
-        while (q.buffers_ready_for_compositor(nullptr))
-        {
-            q.compositor_release(q.compositor_acquire(nullptr));
-            ++frame;
-        }
-
-        if (client->has_acquired_buffer())
-        {
-            if (frame > delay)
-                buffers_acquired.insert(client->buffer());
-            client->release_buffer();
-            client.reset();
-        }
-
-        // Balance compositor consumption with client production:
-        while (q.buffers_ready_for_compositor(nullptr))
-        {
-            q.compositor_release(q.compositor_acquire(nullptr));
-            ++frame;
-        }
-
         // Imbalance: Compositor is now requesting more than the client does:
-        q.compositor_release(q.compositor_acquire(nullptr));
-        ++frame;
+        int nready = q.buffers_ready_for_compositor(nullptr);
+        for (int r = 0; r <= nready; ++r)
+        {
+            q.compositor_release(q.compositor_acquire(nullptr));
+            ++frame;
+        }
     }
     // Expect at least triple buffers for sluggish clients
     EXPECT_THAT(buffers_acquired.size(), Ge(3));
 
     // And what happens if the client becomes fast again?...
     buffers_acquired.clear();
-    for (int frame = 0; frame < nframes;)
+    for (int frame = 0; frame < nframes; ++frame)
     {
-        std::shared_ptr<AcquireWaitHandle> client;
         do
         {
-            client = client_acquire_async(q);
+            if (!client)
+                client = client_acquire_async(q);
             if (client->has_acquired_buffer())
             {
                 if (frame > delay)
@@ -1732,19 +1705,7 @@
             }
         } while (!client);
 
-        while (q.buffers_ready_for_compositor(nullptr))
-        {
-            q.compositor_release(q.compositor_acquire(nullptr));
-            ++frame;
-        }
-
-        if (client->has_acquired_buffer())
-        {
-            if (frame > delay)
-                buffers_acquired.insert(client->buffer());
-            client->release_buffer();
-            client.reset();
-        }
+        q.compositor_release(q.compositor_acquire(nullptr));
     }
     // Expect double-buffers for fast clients
     EXPECT_THAT(buffers_acquired.size(), Eq(2));