Refactor TimeBase to post tasks. Workers to use real Idle tasks.

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8Initializer.h"
 #include "core/dom/Microtask.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/workers/DedicatedWorkerGlobalScope.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
-#include "platform/PlatformThreadData.h"
 #include "platform/Task.h"
-#include "platform/ThreadTimers.h"
 #include "platform/heap/SafePoint.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebWaitableEvent.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/WeakPtr.h"
 #include "wtf/text/WTFString.h"
 
 #include <utility>
 
 namespace blink {
 
 namespace {
-const int64_t kShortIdleHandlerDelayMs = 1000;
-const int64_t kLongIdleHandlerDelayMs = 10*1000;
 
 class MicrotaskRunner : public WebThread::TaskObserver {
 public:
     explicit MicrotaskRunner(WorkerThread* workerThread)
         : m_workerThread(workerThread)
     {
     }
 
     virtual void willProcessTask() override { }
     virtual void didProcessTask() override
@@ skipping 55 matching lines @@
         : m_closure(closure)
         , m_weakFactory(this)
         , m_taskCanceled(false)
     { }
 
     OwnPtr<Closure> m_closure;
     WeakPtrFactory<WorkerThreadCancelableTask> m_weakFactory;
     bool m_taskCanceled;
 };
 
-class WorkerSharedTimer : public SharedTimer {
-public:
-    explicit WorkerSharedTimer(WorkerThread* workerThread)
-        : m_workerThread(workerThread)
-        , m_running(false)
-    { }
-
-    typedef void (*SharedTimerFunction)();
-    virtual void setFiredFunction(SharedTimerFunction func)
-    {
-        m_sharedTimerFunction = func;
-    }
-
-    virtual void setFireInterval(double interval)
-    {
-        ASSERT(m_sharedTimerFunction);
-
-        // See BlinkPlatformImpl::setSharedTimerFireInterval for explanation of
-        // why ceil is used in the interval calculation.
-        int64_t delay = static_cast<int64_t>(ceil(interval * 1000));
-
-        if (delay < 0) {
-            delay = 0;
-        }
-
-        m_running = true;
-
-        if (m_lastQueuedTask.get())
-            m_lastQueuedTask->cancelTask();
-
-        // Now queue the task as a cancellable one.
-        OwnPtr<WorkerThreadCancelableTask> task = WorkerThreadCancelableTask::create(bind(&WorkerSharedTimer::OnTimeout, this));
-        m_lastQueuedTask = task->createWeakPtr();
-        m_workerThread->postDelayedTask(FROM_HERE, task.release(), delay);
-    }
-
-    virtual void stop()
-    {
-        m_running = false;
-        m_lastQueuedTask = nullptr;
-    }
-
-private:
-    void OnTimeout()
-    {
-        ASSERT(m_workerThread->workerGlobalScope());
-
-        m_lastQueuedTask = nullptr;
-
-        if (m_sharedTimerFunction && m_running && !m_workerThread->workerGlobalScope()->isClosing())
-            m_sharedTimerFunction();
-    }
-
-    WorkerThread* m_workerThread;
-    SharedTimerFunction m_sharedTimerFunction;
-    bool m_running;
-
-    // The task to run OnTimeout, if any. While OnTimeout resets
-    // m_lastQueuedTask, this must be a weak pointer because the
-    // worker runloop may delete the task as it is shutting down.
-    WeakPtr<WorkerThreadCancelableTask> m_lastQueuedTask;
-};
-
 class WorkerThreadTask : public blink::WebThread::Task {
     WTF_MAKE_NONCOPYABLE(WorkerThreadTask); WTF_MAKE_FAST_ALLOCATED(WorkerThreadTask);
 public:
     static PassOwnPtr<WorkerThreadTask> create(WorkerThread& workerThread, PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
     {
         return adoptPtr(new WorkerThreadTask(workerThread, task, isInstrumented));
     }
 
     virtual ~WorkerThreadTask() { }
 
@@ skipping 49 matching lines @@
 };
 
 WorkerThread::WorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
     : m_terminated(false)
     , m_workerLoaderProxy(workerLoaderProxy)
     , m_workerReportingProxy(workerReportingProxy)
     , m_startupData(startupData)
     , m_isolate(nullptr)
     , m_shutdownEvent(adoptPtr(blink::Platform::current()->createWaitableEvent()))
     , m_terminationEvent(adoptPtr(blink::Platform::current()->createWaitableEvent()))
+    , m_dontStartIdleTaskYet(false)
 {
     MutexLocker lock(threadSetMutex());
     workerThreads().add(this);
 }
 
 WorkerThread::~WorkerThread()
 {
     MutexLocker lock(threadSetMutex());
     ASSERT(workerThreads().contains(this));
     workerThreads().remove(this);
@@ skipping 15 matching lines @@
         m_workerInspectorController->interruptAndDispatchInspectorCommands();
 }
 
 PlatformThreadId WorkerThread::platformThreadId() const
 {
     if (!m_thread)
         return 0;
     return m_thread->platformThread().threadId();
 }
 
+class WorkerThreadWaitUntilIdleTask : public WebThread::Task, public WebThread::IdleTask  {

[Sami, 2015/04/02 10:59:19]

Maybe "wait until quiescence" would be a better term since idle is very
overloaded here.

[alex clarke (OOO till 29th), 2015/04/08 15:43:35]

Done.

+public:
+    explicit WorkerThreadWaitUntilIdleTask(WorkerThread* thread) : m_thread(thread) { }
+
+    ~WorkerThreadWaitUntilIdleTask() override
+    {
+    }
+
+    void run() override
+    {
+        m_thread->maybeStartIdleTask();
+    }
+
+    void run(double) override
+    {
+        m_thread->dontStartIdleTaskYet();
+    }
+
+private:
+    RawPtr<WorkerThread> m_thread;
+};
+
+class WorkerThreadIdleTask : public WebThread::IdleTask {
+public:
+    explicit WorkerThreadIdleTask(WorkerThread* thread)
+        : m_thread(thread) { }
+
+    ~WorkerThreadIdleTask() override { }
+
+    void run(double deadlineSeconds) override
+    {
+        m_thread->idleTask(deadlineSeconds);
+    }
+
+private:
+    RawPtr<WorkerThread> m_thread;
+};
+
+class WorkerThreadWakeupIdleTask : public WebThread::IdleTask {
+public:
+    explicit WorkerThreadWakeupIdleTask(WorkerThread* thread)
+        : m_thread(thread) { }
+
+    ~WorkerThreadWakeupIdleTask() override { }
+
+    void run(double) override
+    {
+        m_thread->dontStartIdleTaskYet();
+        m_thread->maybeStartIdleTask();
+    }
+
+private:
+    RawPtr<WorkerThread> m_thread;
+};
+
 void WorkerThread::initialize()
 {
     KURL scriptURL = m_startupData->m_scriptURL;
     String sourceCode = m_startupData->m_sourceCode;
     WorkerThreadStartMode startMode = m_startupData->m_startMode;
     OwnPtr<Vector<char>> cachedMetaData = m_startupData->m_cachedMetaData.release();
     V8CacheOptions v8CacheOptions = m_startupData->m_v8CacheOptions;
 
     {
         MutexLocker lock(m_threadCreationMutex);
 
         // The worker was terminated before the thread had a chance to run.
         if (m_terminated) {
             // Notify the proxy that the WorkerGlobalScope has been disposed of.
             // This can free this thread object, hence it must not be touched afterwards.
             m_workerReportingProxy.workerThreadTerminated();
             return;
         }
 
         m_microtaskRunner = adoptPtr(new MicrotaskRunner(this));
         m_thread->addTaskObserver(m_microtaskRunner.get());
         m_thread->attachGC();
 
         m_isolate = initializeIsolate();
         m_workerGlobalScope = createWorkerGlobalScope(m_startupData.release());
-
-        PlatformThreadData::current().threadTimers().setSharedTimer(adoptPtr(new WorkerSharedTimer(this)));
     }
 
     // The corresponding call to stopRunLoop() is in ~WorkerScriptController().
     didStartRunLoop();
 
     // Notify proxy that a new WorkerGlobalScope has been created and started.
     m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get());
 
     WorkerScriptController* script = m_workerGlobalScope->script();
     if (!script->isExecutionForbidden())
         script->initializeContextIfNeeded();
     if (startMode == PauseWorkerGlobalScopeOnStart)
         m_workerGlobalScope->workerInspectorController()->pauseOnStart();
 
     OwnPtr<CachedMetadataHandler> handler(workerGlobalScope()->createWorkerScriptCachedMetadataHandler(scriptURL, cachedMetaData.get()));
     bool success = script->evaluate(ScriptSourceCode(sourceCode, scriptURL), nullptr, handler.get(), v8CacheOptions);
     m_workerGlobalScope->didEvaluateWorkerScript();
     m_workerReportingProxy.didEvaluateWorkerScript(success);
 
     postInitialize();
 
-    postDelayedTask(FROM_HERE, createSameThreadTask(&WorkerThread::idleHandler, this), kShortIdleHandlerDelayMs);
+    dontStartIdleTaskYet();

[Sami, 2015/04/02 10:59:19]

endIdlePeriod() to match the chromium side terms?

[alex clarke (OOO till 29th), 2015/04/08 15:43:35]

I'm not really convinced those terms are helpful in blink.  They have well
defined meanings in chromium, but this business of not starting idle tasks is
pretty much a hack.  I'd like to see it go away since IMO only the scheduler
should know anything about idle periods.

Besides, surely dontStartIdleTaskYet accurately describes what it's doing?

+    maybeStartIdleTask();
 }
 
 PassOwnPtr<WebThreadSupportingGC> WorkerThread::createWebThreadSupportingGC()
 {
     return WebThreadSupportingGC::create("WebCore: Worker");
 }
 
 void WorkerThread::cleanup()
 {
     // This should be called before we start the shutdown procedure.
@@ skipping 12 matching lines @@
     destroyIsolate();
 
     m_thread->removeTaskObserver(m_microtaskRunner.get());
     m_microtaskRunner = nullptr;
 
     // Notify the proxy that the WorkerGlobalScope has been disposed of.
     // This can free this thread object, hence it must not be touched afterwards.
     workerReportingProxy().workerThreadTerminated();
 
     m_terminationEvent->signal();
-
-    // Clean up PlatformThreadData before WTF::WTFThreadData goes away!
-    PlatformThreadData::current().destroy();
 }
 
 class WorkerThreadShutdownFinishTask : public ExecutionContextTask {
 public:
     static PassOwnPtr<WorkerThreadShutdownFinishTask> create()
     {
         return adoptPtr(new WorkerThreadShutdownFinishTask());
     }
 
     virtual void performTask(ExecutionContext *context)
@@ skipping 14 matching lines @@
 public:
     static PassOwnPtr<WorkerThreadShutdownStartTask> create()
     {
         return adoptPtr(new WorkerThreadShutdownStartTask());
     }
 
     virtual void performTask(ExecutionContext *context)
     {
         WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
         workerGlobalScope->stopActiveDOMObjects();
-        PlatformThreadData::current().threadTimers().setSharedTimer(nullptr);
 
         // Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects,
         // which become dangling once Heap is destroyed.
         workerGlobalScope->removeAllEventListeners();
 
         // Stick a shutdown command at the end of the queue, so that we deal
         // with all the cleanup tasks the databases post first.
         workerGlobalScope->postTask(FROM_HERE, WorkerThreadShutdownFinishTask::create());
     }
 
@@ skipping 71 matching lines @@
 
     for (WorkerThread* thread : threads)
         thread->terminationEvent()->wait();
 }
 
 bool WorkerThread::isCurrentThread() const
 {
     return m_thread && m_thread->isCurrentThread();
 }
 
-void WorkerThread::idleHandler()
+void WorkerThread::dontStartIdleTaskYet()
+{
+    m_dontStartIdleTaskYet = true;
+}
+
+void WorkerThread::maybeStartIdleTask()
+{
+    if (m_dontStartIdleTaskYet) {
+        // We don't want to be too quick to enter idle mode (where we start doing more GC) because
+        // that might cause the worker thread to be unresponsive to messages.  To avoid this we
+        // check every 300ms if any tasks have been run.  If they havent we can start doing idle GCs.
+        // NOTE we use the IdleTaskAfterWakeup call to work out if something has run.  It's execution
+        // only happens if some other task gets posted.
+        m_thread->postDelayedTask(FROM_HERE, new WorkerThreadWaitUntilIdleTask(this), 300ul);
+        m_thread->postIdleTaskAfterWakeup(FROM_HERE, new WorkerThreadWaitUntilIdleTask(this));
+        m_dontStartIdleTaskYet = false;
+        return;
+    }
+
+    m_thread->postIdleTask(FROM_HERE, new WorkerThreadIdleTask(this));
+}
+
+void WorkerThread::idleTask(double deadlineSeconds)
 {
     ASSERT(m_workerGlobalScope.get());
-    int64_t delay = kLongIdleHandlerDelayMs;
+    bool gcFinished = false;
+    if (deadlineSeconds > Platform::current()->monotonicallyIncreasingTime())
+        gcFinished = isolate()->IdleNotificationDeadline(deadlineSeconds);
 
-    // Do a script engine idle notification if the next event is distant enough.
-    const double kMinIdleTimespan = 0.3;
-    const double nextFireTime = PlatformThreadData::current().threadTimers().nextFireTime();
-    if (nextFireTime == 0.0 || nextFireTime > currentTime() + kMinIdleTimespan) {
-        bool hasMoreWork = !isolate()->IdleNotificationDeadline(Platform::current()->monotonicallyIncreasingTime() + 1.0);
-        if (hasMoreWork)
-            delay = kShortIdleHandlerDelayMs;
-    }
-
-    postDelayedTask(FROM_HERE, createSameThreadTask(&WorkerThread::idleHandler, this), delay);
+    if (gcFinished)
+        m_thread->postIdleTaskAfterWakeup(FROM_HERE, new WorkerThreadWakeupIdleTask(this));
+    else
+        m_thread->postIdleTask(FROM_HERE, new WorkerThreadIdleTask(this));
 }
 
 void WorkerThread::postTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
 {
     m_thread->postTask(location, WorkerThreadTask::create(*this, task, true).leakPtr());
 }
 
 void WorkerThread::postDelayedTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task, long long delayMs)
 {
     m_thread->postDelayedTask(location, WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
@@ skipping 73 matching lines @@
     InspectorInstrumentation::didLeaveNestedRunLoop(m_workerGlobalScope.get());
 }
 
 void WorkerThread::setWorkerInspectorController(WorkerInspectorController* workerInspectorController)
 {
     MutexLocker locker(m_workerInspectorControllerMutex);
     m_workerInspectorController = workerInspectorController;
 }
 
 } // namespace blink