Prioritizing input and compositor tasks in the blink scheduler.

Source/platform/scheduler/SchedulerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "platform/scheduler/Scheduler.h"
 
 #include "platform/TestingPlatformSupport.h"
 #include "platform/TraceLocation.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <string>
+#include <vector>
 
 using blink::Scheduler;
+using namespace std;
 
 namespace {
 
 class TestMainThread : public blink::WebThread {
 public:
     // blink::WebThread implementation.
     virtual void postTask(Task* task) OVERRIDE
     {
         m_pendingTasks.append(adoptPtr(task));
     }
@@ skipping 98 matching lines @@
     ~SchedulerTest()
     {
         Scheduler::shutdown();
     }
 
     void runPendingTasks()
     {
         m_platformSupport.runPendingTasks();
     }
 
+    void appendToVector(string value)
+    {
+        m_order.push_back(value);
+    }
+
+    void appendToVectorReentrant(int count)
+    {
+        m_reentrantOrder.push_back(count);
+
+        if (count < 4)
+            m_scheduler->postTask(FROM_HERE, bind(&SchedulerTest::appendToVectorReentrant, this, count + 1));
+    }
+
 protected:
     SchedulerTestingPlatformSupport m_platformSupport;
     Scheduler* m_scheduler;
+    std::vector<string> m_order;
+    std::vector<int> m_reentrantOrder;
 };
 
 void orderedTestTask(int value, int* result)
 {
     *result = (*result << 4) | value;
 }
 
 void unorderedTestTask(int value, int* result)
 {
     *result += value;
@@ skipping 19 matching lines @@
 {
     int result = 0;
     m_scheduler->postTask(FROM_HERE, bind(&unorderedTestTask, 1, &result));
     m_scheduler->postInputTask(FROM_HERE, bind(&unorderedTestTask, 2, &result));
     m_scheduler->postCompositorTask(FROM_HERE, bind(&unorderedTestTask, 4, &result));
     m_scheduler->postTask(FROM_HERE, bind(&unorderedTestTask, 8, &result));
     runPendingTasks();
     EXPECT_EQ(15, result);
 }
 
+TEST_F(SchedulerTest, TestTasksExecutedOnShutdown)
+{
+    int result = 0;
+    m_scheduler->postTask(FROM_HERE, bind(&unorderedTestTask, 1, &result));
+    m_scheduler->postInputTask(FROM_HERE, bind(&unorderedTestTask, 2, &result));
+    m_scheduler->postCompositorTask(FROM_HERE, bind(&unorderedTestTask, 4, &result));
+    m_scheduler->postTask(FROM_HERE, bind(&unorderedTestTask, 8, &result));
+    Scheduler::shutdown();

[Sami, 2014/08/07 15:51:27]

Thanks for adding this test. Can you add a re-entrant one here too since those
are the tricky ones?

[alexclarke, 2014/08/07 16:01:30]

Done.

+    EXPECT_EQ(15, result);
+}
+
 int s_sharedTimerTickCount;
 void sharedTimerFunction()
 {
     s_sharedTimerTickCount++;
 }
 
 TEST_F(SchedulerTest, TestSharedTimer)
 {
     s_sharedTimerTickCount = 0;
     m_scheduler->setSharedTimerFiredFunction(&sharedTimerFunction);
@@ skipping 16 matching lines @@
     // TODO: Check task allottedTime when implemented in the scheduler.
     int result = 0;
     m_scheduler->postIdleTask(bind<double>(&idleTestTask, 1, &result));
     m_scheduler->postIdleTask(bind<double>(&idleTestTask, 1, &result));
     m_scheduler->postIdleTask(bind<double>(&idleTestTask, 1, &result));
     m_scheduler->postIdleTask(bind<double>(&idleTestTask, 1, &result));
     runPendingTasks();
     EXPECT_EQ(4, result);
 }
 
+TEST_F(SchedulerTest, TestTaskPrioritization)
+{
+    m_scheduler->postTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("L1")));
+    m_scheduler->postTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("L2")));
+    m_scheduler->postInputTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("I1")));
+    m_scheduler->postInputTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("I2")));
+    m_scheduler->postCompositorTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("C1")));
+    m_scheduler->postCompositorTask(FROM_HERE, bind(&SchedulerTest::appendToVector, this, string("C2")));
+
+    runPendingTasks();
+    EXPECT_THAT(m_order, testing::ElementsAre(
+        string("I1"), string("I2"), string("C1"), string("C2"), string("L1"), string("L2")));
+}
+
+TEST_F(SchedulerTest, TestRentrantTask)
+{
+    m_scheduler->postTask(FROM_HERE, bind(&SchedulerTest::appendToVectorReentrant, this, 0));
+    runPendingTasks();
+
+    EXPECT_THAT(m_reentrantOrder, testing::ElementsAre(0, 1, 2, 3, 4));
+}
+
+
 } // namespace