Prioritizing input and compositor tasks in the blink scheduler.

Source/platform/scheduler/Scheduler.cpp

Index: Source/platform/scheduler/Scheduler.cpp
diff --git a/Source/platform/scheduler/Scheduler.cpp b/Source/platform/scheduler/Scheduler.cpp
index 61ae7aef1d486bd618417a2d2d62c14c08db06bc..19d0e68663a780dfe767714d3289618b273d86bd 100644
--- a/Source/platform/scheduler/Scheduler.cpp
+++ b/Source/platform/scheduler/Scheduler.cpp
@@ -5,59 +5,99 @@
 #include "config.h"
 #include "platform/scheduler/Scheduler.h"
 
+#include "platform/PlatformThreadData.h"
 #include "platform/Task.h"
+#include "platform/ThreadTimers.h"
 #include "platform/TraceEvent.h"
-#include "platform/TraceLocation.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebThread.h"
+#include "wtf/ThreadingPrimitives.h"
 
 namespace blink {
 
 namespace {
 
-class MainThreadTaskAdapter : public blink::WebThread::Task {
+class MainThreadIdleTaskAdapter : public blink::WebThread::Task {
 public:
-    explicit MainThreadTaskAdapter(const TraceLocation& location, const Scheduler::Task& task)
-        : m_location(location)
-        , m_task(task)
+    MainThreadIdleTaskAdapter(const Scheduler::IdleTask& idleTask, double allottedTimeMs)
+        : m_idleTask(idleTask)
+        , m_allottedTimeMs(allottedTimeMs)
     {
     }
 
     // WebThread::Task implementation.
     virtual void run() OVERRIDE
     {
-        TRACE_EVENT2("blink", "MainThreadTaskAdapter::run",
-            "src_file", m_location.fileName(),
-            "src_func", m_location.functionName());
-        m_task();
+        TRACE_EVENT1("blink", "MainThreadIdleTaskAdapter::run", "allottedTime", m_allottedTimeMs);
+        m_idleTask(m_allottedTimeMs);
     }
 
 private:
-    const TraceLocation m_location;
-    Scheduler::Task m_task;
+    Scheduler::IdleTask m_idleTask;

[eseidel, 2014/08/08 17:31:06]

Why are idle tasks different from tasks?

[alexclarke, 2014/08/12 11:37:01]

Done.

+    double m_allottedTimeMs;

[eseidel, 2014/08/08 17:31:06]

Filed cbug.com/402027 about having real types for these.

[alexclarke, 2014/08/12 11:37:01]

Acknowledged.

 };
 
-class MainThreadIdleTaskAdapter : public blink::WebThread::Task {
+} // namespace
+
+class Scheduler::MainThreadPendingHighPriorityTaskRunner : public blink::WebThread::Task {

[eseidel, 2014/08/08 17:31:06]

Don't need blink::

[alexclarke, 2014/08/12 11:37:01]

Done.

 public:
-    MainThreadIdleTaskAdapter(const Scheduler::IdleTask& idleTask, double allottedTimeMs)
-        : m_idleTask(idleTask)
-        , m_allottedTimeMs(allottedTimeMs)
+    MainThreadPendingHighPriorityTaskRunner()
+    {
+        ASSERT(Scheduler::shared());
+        atomicIncrement(&Scheduler::shared()->m_mainThreadTaskRunnerCount);

[eseidel, 2014/08/08 17:31:06]

Why are we grabbing at a m_?  Instead of using a function?

[alexclarke, 2014/08/12 11:37:01]

Done.

+    }
+
+    ~MainThreadPendingHighPriorityTaskRunner()
     {
+        Scheduler* scheduler = Scheduler::shared();
+        if (!scheduler)
+            return;
+        atomicDecrement(&scheduler->m_mainThreadTaskRunnerCount);
     }
 
     // WebThread::Task implementation.
     virtual void run() OVERRIDE
     {
-        TRACE_EVENT1("blink", "MainThreadIdleTaskAdapter::run", "allottedTime", m_allottedTimeMs);
-        m_idleTask(m_allottedTimeMs);
+        Scheduler* scheduler = Scheduler::shared();
+        if (!scheduler)
+            return;
+        scheduler->runHighPriorityTasks();
     }
-
-private:
-    Scheduler::IdleTask m_idleTask;
-    double m_allottedTimeMs;
 };
 
-}
+class Scheduler::MainThreadPendingTaskRunner : public blink::WebThread::Task {
+public:
+    MainThreadPendingTaskRunner(
+        const Scheduler::Task& task, const TraceLocation& location)
+        : m_task(task)
+        , m_location(location)
+    {
+        ASSERT(Scheduler::shared());
+        atomicIncrement(&Scheduler::shared()->m_mainThreadTaskRunnerCount);
+    }
+
+    ~MainThreadPendingTaskRunner()
+    {
+        Scheduler* scheduler = Scheduler::shared();
+        if (!scheduler)
+            return;
+        atomicDecrement(&scheduler->m_mainThreadTaskRunnerCount);
+    }
+
+    // WebThread::Task implementation.
+    virtual void run() OVERRIDE
+    {
+        TRACE_EVENT2("blink", "MainThreadPendingTaskRunner::run",
+            "src_file", m_location.fileName(),
+            "src_func", m_location.functionName());
+        Scheduler* scheduler = Scheduler::shared();
+        if (scheduler)
+            Scheduler::shared()->runHighPriorityTasks();
+        m_task();
+    }
+
+    Scheduler::Task m_task;
+    TraceLocation m_location;
+};
 
 Scheduler* Scheduler::s_sharedScheduler = nullptr;
 
@@ -80,16 +120,15 @@ Scheduler* Scheduler::shared()
 Scheduler::Scheduler()
     : m_mainThread(blink::Platform::current()->currentThread())
     , m_sharedTimerFunction(nullptr)
+    , m_mainThreadTaskRunnerCount(0)
 {
 }
 
 Scheduler::~Scheduler()
 {
-}
-
-void Scheduler::scheduleTask(const TraceLocation& location, const Task& task)
-{
-    m_mainThread->postTask(new MainThreadTaskAdapter(location, task));
+    while (!m_pendingInputTasks.isEmpty() || !m_pendingCompositorTasks.isEmpty()) {
+        runHighPriorityTasks();
+    }
 }
 
 void Scheduler::scheduleIdleTask(const IdleTask& idleTask)
@@ -100,17 +139,19 @@ void Scheduler::scheduleIdleTask(const IdleTask& idleTask)
 
 void Scheduler::postTask(const TraceLocation& location, const Task& task)
 {
-    scheduleTask(location, task);
+    m_mainThread->postTask(new MainThreadPendingTaskRunner(task, location));
 }
 
 void Scheduler::postInputTask(const TraceLocation& location, const Task& task)
 {
-    scheduleTask(location, task);
+    m_pendingInputTasks.append(TracedTask(task, location));

[eseidel, 2014/08/08 17:31:06]

I really think we want all tasks to be traced.  Tracing gives us a huge
debuggability benifit.

[alexclarke, 2014/08/12 11:37:01]

Done.

+    maybePostMainThreadPendingHighPriorityTaskRunner();
 }
 
 void Scheduler::postCompositorTask(const TraceLocation& location, const Task& task)
 {
-    scheduleTask(location, task);
+    m_pendingCompositorTasks.append(TracedTask(task, location));
+    maybePostMainThreadPendingHighPriorityTaskRunner();
 }
 
 void Scheduler::postIdleTask(const IdleTask& idleTask)
@@ -121,7 +162,38 @@ void Scheduler::postIdleTask(const IdleTask& idleTask)
 void Scheduler::tickSharedTimer()
 {
     TRACE_EVENT0("blink", "Scheduler::tickSharedTimer");
+
+    runHighPriorityTasks();
     m_sharedTimerFunction();
+    runHighPriorityTasks();

[eseidel, 2014/08/08 17:31:06]

Why twice?  If the sharedTimer function has chosen to yield due to spending too
much time are we sure we want to run these now?

[alexclarke, 2014/08/12 11:37:01]

I've added some comments to explain this.

+}
+
+void Scheduler::runHighPriorityTasks()
+{
+    TRACE_EVENT0("blink", "Scheduler::runHighPriorityTasks");
+
+    WTF::Deque<TracedTask>& inputTasks = m_pendingInputTasks.swapBuffers();

[eseidel, 2014/08/08 17:31:06]

WTF:: should not be needed.

[alexclarke, 2014/08/12 11:37:02]

Done.

+    WTF::Deque<TracedTask>& compositorTasks = m_pendingCompositorTasks.swapBuffers();
+
+    for (;;) {
+        if (!inputTasks.isEmpty()) {
+            inputTasks.takeFirst().run();
+            continue;
+        }
+
+        if (compositorTasks.isEmpty())
+            break;
+        compositorTasks.takeFirst().run();
+    }
+}
+
+void Scheduler::maybePostMainThreadPendingHighPriorityTaskRunner()
+{
+    // Only post a task if there isn't a task already in flight.
+    if (acquireLoad(&m_mainThreadTaskRunnerCount))
+        return;
+
+    m_mainThread->postTask(new MainThreadPendingHighPriorityTaskRunner());
 }
 
 void Scheduler::sharedTimerAdapter()
@@ -147,7 +219,15 @@ void Scheduler::stopSharedTimer()
 
 bool Scheduler::shouldYieldForHighPriorityWork()
 {
-    return false;
+    return !m_pendingInputTasks.isEmpty() || !m_pendingCompositorTasks.isEmpty();
+}
+
+void Scheduler::TracedTask::run()
+{
+    TRACE_EVENT2("blink", "TracedTask::run",
+        "src_file", m_location.fileName(),
+        "src_func", m_location.functionName());
+    m_task();
 }
 
 } // namespace blink